Wed Oct 5 20:02:03 2016 UTC ()
switch mips64 to pie/gcc53/binutils226/gdb710
switch ppc64 to binutils226/gdb710 (gcc/pie pending to toc issue)


(christos)
diff -r1.965 -r1.966 src/share/mk/bsd.own.mk
cvs diff -r1.965 -r1.966 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/10/04 04:58:11 1.965
+++ src/share/mk/bsd.own.mk 2016/10/05 20:02:03 1.966
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.965 2016/10/04 04:58:11 mrg Exp $ 1# $NetBSD: bsd.own.mk,v 1.966 2016/10/05 20:02:03 christos Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -57,27 +57,26 @@ MKGCC?= no @@ -57,27 +57,26 @@ MKGCC?= no
57.endif 57.endif
58 58
59# 59#
60# GCC Using platforms. 60# GCC Using platforms.
61# 61#
62.if ${MKGCC:Uyes} != "no" 62.if ${MKGCC:Uyes} != "no"
63 63
64# 64#
65# What GCC is used? 65# What GCC is used?
66# 66#
67.if ${MACHINE_CPU} == "aarch64" 67.if ${MACHINE_CPU} == "aarch64"
68HAVE_GCC?= 0 68HAVE_GCC?= 0
69.elif \ 69.elif \
70 ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb" || \ 
71 ${MACHINE} == "or1k" || \ 70 ${MACHINE} == "or1k" || \
72 ${MACHINE} == "riscv" 71 ${MACHINE} == "riscv"
73HAVE_GCC?= 48 72HAVE_GCC?= 48
74.else 73.else
75HAVE_GCC?= 53 74HAVE_GCC?= 53
76.endif 75.endif
77 76
78# 77#
79# Platforms that can't run a modern GCC natively 78# Platforms that can't run a modern GCC natively
80.if ${MACHINE_ARCH} == "m68000" 79.if ${MACHINE_ARCH} == "m68000"
81MKGCCCMDS?= no 80MKGCCCMDS?= no
82.endif 81.endif
83 82
@@ -127,50 +126,38 @@ HAVE_LIBGCC_EH?= yes @@ -127,50 +126,38 @@ HAVE_LIBGCC_EH?= yes
127 ${MACHINE} == "ia64" || \ 126 ${MACHINE} == "ia64" || \
128 ${MACHINE_CPU} == "mips" 127 ${MACHINE_CPU} == "mips"
129HAVE_SSP?= no 128HAVE_SSP?= no
130.else 129.else
131HAVE_SSP?= yes 130HAVE_SSP?= yes
132.if !defined(NOFORT) && ${USE_FORT:Uno} != "no" 131.if !defined(NOFORT) && ${USE_FORT:Uno} != "no"
133USE_SSP?= yes 132USE_SSP?= yes
134.endif 133.endif
135.endif 134.endif
136 135
137# 136#
138# What GDB is used? 137# What GDB is used?
139# 138#
140.if ${MACHINE_ARCH} == "mips64el" || \ 
141 ${MACHINE_ARCH} == "mips64eb" || \ 
142 ${MACHINE_ARCH} == "powerpc64" 
143HAVE_GDB?= 79 
144.else 
145HAVE_GDB?= 710 139HAVE_GDB?= 710
146.endif 
147 140
148.if ${HAVE_GDB} == 79 141.if ${HAVE_GDB} == 79
149EXTERNAL_GDB_SUBDIR= gdb.old 142EXTERNAL_GDB_SUBDIR= gdb.old
150.else 143.else
151EXTERNAL_GDB_SUBDIR= gdb 144EXTERNAL_GDB_SUBDIR= gdb
152.endif 145.endif
153 146
154# 147#
155# What binutils is used? 148# What binutils is used?
156# 149#
157.if ${MACHINE_ARCH} == "mips64el" || \ 
158 ${MACHINE_ARCH} == "mips64eb" || \ 
159 ${MACHINE_ARCH} == "powerpc64" 
160HAVE_BINUTILS?= 223 
161.else 
162HAVE_BINUTILS?= 226 150HAVE_BINUTILS?= 226
163.endif 
164 151
165.if ${HAVE_BINUTILS} == 223 152.if ${HAVE_BINUTILS} == 223
166EXTERNAL_BINUTILS_SUBDIR= binutils.old 153EXTERNAL_BINUTILS_SUBDIR= binutils.old
167.elif ${HAVE_BINUTILS} == 226 154.elif ${HAVE_BINUTILS} == 226
168EXTERNAL_BINUTILS_SUBDIR= binutils 155EXTERNAL_BINUTILS_SUBDIR= binutils
169.else 156.else
170EXTERNAL_BINUTILS_SUBDIR= /does/not/exist 157EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
171.endif 158.endif
172 159
173.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*) 160.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
174.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR) 161.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
175PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx 162PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
176.else 163.else
@@ -1038,29 +1025,29 @@ MKZFS?= yes @@ -1038,29 +1025,29 @@ MKZFS?= yes
1038# 1025#
1039 1026
1040.if ${MACHINE_ARCH} == "i386" || \ 1027.if ${MACHINE_ARCH} == "i386" || \
1041 ${MACHINE_ARCH} == "x86_64" || \ 1028 ${MACHINE_ARCH} == "x86_64" || \
1042 !empty(MACHINE_ARCH:Mearm*) 1029 !empty(MACHINE_ARCH:Mearm*)
1043MKDTRACE?= yes 1030MKDTRACE?= yes
1044MKCTF?= yes 1031MKCTF?= yes
1045.endif 1032.endif
1046# 1033#
1047# PIE is enabled on amd64 by default 1034# PIE is enabled on amd64 by default
1048# 1035#
1049.if ${MACHINE_ARCH} == "i386" || \ 1036.if ${MACHINE_ARCH} == "i386" || \
1050 ${MACHINE_ARCH} == "x86_64" || \ 1037 ${MACHINE_ARCH} == "x86_64" || \
1051 ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \ 
1052 ${MACHINE_CPU} == "arm" || \ 1038 ${MACHINE_CPU} == "arm" || \
1053 ${MACHINE_CPU} == "m68k" || \ 1039 ${MACHINE_CPU} == "m68k" || \
 1040 ${MACHINE_CPU} == "mips" || \
1054 ${MACHINE_CPU} == "sh3" || \ 1041 ${MACHINE_CPU} == "sh3" || \
1055 ${MACHINE} == "sparc64" 1042 ${MACHINE} == "sparc64"
1056MKPIE?= yes 1043MKPIE?= yes
1057.else 1044.else
1058MKPIE?= no 1045MKPIE?= no
1059.endif 1046.endif
1060 1047
1061# 1048#
1062# RELRO is enabled on i386 and amd64 by default 1049# RELRO is enabled on i386 and amd64 by default
1063# 1050#
1064.if ${MACHINE_ARCH} == "i386" || \ 1051.if ${MACHINE_ARCH} == "i386" || \
1065 ${MACHINE_ARCH} == "x86_64" 1052 ${MACHINE_ARCH} == "x86_64"
1066MKRELRO?= partial 1053MKRELRO?= partial