Mon Dec 24 21:51:57 2018 UTC ()
Switch x86 to binutils 2.31.1


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

--- src/share/mk/bsd.own.mk 2018/12/03 19:15:35 1.1085
+++ src/share/mk/bsd.own.mk 2018/12/24 21:51:57 1.1086
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1085 2018/12/03 19:15:35 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1086 2018/12/24 21:51:57 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#
@@ -139,27 +139,31 @@ USE_SSP?= yes @@ -139,27 +139,31 @@ USE_SSP?= yes
139HAVE_GDB?= 801 139HAVE_GDB?= 801
140 140
141.if ${HAVE_GDB} == 801 141.if ${HAVE_GDB} == 801
142EXTERNAL_GDB_SUBDIR= gdb 142EXTERNAL_GDB_SUBDIR= gdb
143.elif ${HAVE_GDB} == 712 143.elif ${HAVE_GDB} == 712
144EXTERNAL_GDB_SUBDIR= gdb.old 144EXTERNAL_GDB_SUBDIR= gdb.old
145.else 145.else
146EXTERNAL_GDB_SUBDIR= /does/not/exist 146EXTERNAL_GDB_SUBDIR= /does/not/exist
147.endif 147.endif
148 148
149# 149#
150# What binutils is used? 150# What binutils is used?
151# 151#
 152.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 153HAVE_BINUTILS?= 231
 154.else
152HAVE_BINUTILS?= 227 155HAVE_BINUTILS?= 227
 156.endif
153 157
154.if ${HAVE_BINUTILS} == 231 158.if ${HAVE_BINUTILS} == 231
155EXTERNAL_BINUTILS_SUBDIR= binutils 159EXTERNAL_BINUTILS_SUBDIR= binutils
156.elif ${HAVE_BINUTILS} == 227 160.elif ${HAVE_BINUTILS} == 227
157EXTERNAL_BINUTILS_SUBDIR= binutils.old 161EXTERNAL_BINUTILS_SUBDIR= binutils.old
158.else 162.else
159EXTERNAL_BINUTILS_SUBDIR= /does/not/exist 163EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
160.endif 164.endif
161 165
162.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*) 166.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
163.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR) 167.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
164PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx 168PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
165.else 169.else