Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch vax and ia64 to binutils 2.34. reverse the list and leave

Browse Source 
the remaining m68k (untested), riscv (riscv64 ld is missing emulations
for 32 bit targets), and sh3 (untested).
This commit is contained in:
mrg 2020-09-13 20:59:18 +00:00
parent 0602308099
commit 881ec4a82d
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.1211 2020/09/13 02:37:32 kamil Exp $
# $NetBSD: bsd.own.mk,v 1.1212 2020/09/13 20:59:18 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@ -91,6 +91,36 @@ EXTERNAL_GCC_SUBDIR?= /does/not/exist
MKGCCCMDS?= no
.endif
#
# What binutils is used?
#
.if ${MACHINE_CPU} == "sh3" || ${MACHINE_CPU} == "riscv" || \
${MACHINE_CPU} == "m68k"
HAVE_BINUTILS?= 231
.endif
HAVE_BINUTILS?= 234
.if ${HAVE_BINUTILS} == 234
EXTERNAL_BINUTILS_SUBDIR= binutils
.elif ${HAVE_BINUTILS} == 231
EXTERNAL_BINUTILS_SUBDIR= binutils.old
.else
EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
.endif
#
# What GDB is used?
#
HAVE_GDB?= 830
.if ${HAVE_GDB} == 830
EXTERNAL_GDB_SUBDIR= gdb
.elif ${HAVE_GDB} == 801
EXTERNAL_GDB_SUBDIR= gdb.old
.else
EXTERNAL_GDB_SUBDIR= /does/not/exist
.endif
#
# What OpenSSL is used?
#
@ -171,41 +201,6 @@ USE_SSP?= yes
.endif
.endif
#
# What GDB is used?
#
HAVE_GDB?= 830
.if ${HAVE_GDB} == 830
EXTERNAL_GDB_SUBDIR= gdb
.elif ${HAVE_GDB} == 801
EXTERNAL_GDB_SUBDIR= gdb.old
.else
EXTERNAL_GDB_SUBDIR= /does/not/exist
.endif
#
# What binutils is used?
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE} == "sun2" || ${MACHINE} == "alpha" || \
${MACHINE_CPU} == "mips" || ${MACHINE} == "sparc"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
.endif
.if ${HAVE_BINUTILS} == 234
EXTERNAL_BINUTILS_SUBDIR= binutils
.elif ${HAVE_BINUTILS} == 231
EXTERNAL_BINUTILS_SUBDIR= binutils.old
.else
EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
.endif
#
# What version of jemalloc we use (100 is the one
# built-in to libc from 2005 (pre version 3).