Tue May 5 20:47:39 2020 UTC ()
switch hppa to new binutils (2.34)


(skrll)
diff -r1.1187 -r1.1188 src/share/mk/bsd.own.mk
cvs diff -r1.1187 -r1.1188 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2020/04/27 03:15:12 1.1187
+++ src/share/mk/bsd.own.mk 2020/05/05 20:47:38 1.1188
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1187 2020/04/27 03:15:12 mrg Exp $ 1# $NetBSD: bsd.own.mk,v 1.1188 2020/05/05 20:47:38 skrll 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#
@@ -154,27 +154,28 @@ HAVE_GDB?= 830 @@ -154,27 +154,28 @@ HAVE_GDB?= 830
154.if ${HAVE_GDB} == 830 154.if ${HAVE_GDB} == 830
155EXTERNAL_GDB_SUBDIR= gdb 155EXTERNAL_GDB_SUBDIR= gdb
156.elif ${HAVE_GDB} == 801 156.elif ${HAVE_GDB} == 801
157EXTERNAL_GDB_SUBDIR= gdb.old 157EXTERNAL_GDB_SUBDIR= gdb.old
158.else 158.else
159EXTERNAL_GDB_SUBDIR= /does/not/exist 159EXTERNAL_GDB_SUBDIR= /does/not/exist
160.endif 160.endif
161 161
162# 162#
163# What binutils is used? 163# What binutils is used?
164# 164#
165.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \ 165.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
166 ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \ 166 ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
167 ${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" 167 ${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
 168 ${MACHINE_ARCH} == "hppa"
168HAVE_BINUTILS?= 234 169HAVE_BINUTILS?= 234
169.else 170.else
170HAVE_BINUTILS?= 231 171HAVE_BINUTILS?= 231
171.endif 172.endif
172 173
173.if ${HAVE_BINUTILS} == 234 174.if ${HAVE_BINUTILS} == 234
174EXTERNAL_BINUTILS_SUBDIR= binutils 175EXTERNAL_BINUTILS_SUBDIR= binutils
175.elif ${HAVE_BINUTILS} == 231 176.elif ${HAVE_BINUTILS} == 231
176EXTERNAL_BINUTILS_SUBDIR= binutils.old 177EXTERNAL_BINUTILS_SUBDIR= binutils.old
177.else 178.else
178EXTERNAL_BINUTILS_SUBDIR= /does/not/exist 179EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
179.endif 180.endif
180 181