[src/trunk]: src/share/mk If MACHINE_ARCH == arm, set USE_NEW_TOOLCHAIN=yes a...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fdf4f999d16c
branches:  trunk
changeset: 517543:fdf4f999d16c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Nov 14 19:46:38 2001 +0000

description:
If MACHINE_ARCH == arm, set USE_NEW_TOOLCHAIN=yes and OBJECT_FMT=ELF.
It is infeasible for some ARM ports to use anything but ELF/new-toolchain,
and this allows for the ARM ports that aren't ready for ELF to stay at
MACHINE_ARCH == arm32 until they're ready.  The rest of the ARM ports
have a userbase such that if a flag day happens with the compiler (there
are a couple of ABI issues still being discussed), that it won't matter
so much.

Discussed with Ben Harris, Matt Thomas, and Chris Gilbert.

diffstat:

 share/mk/bsd.own.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r d87573ca1a59 -r fdf4f999d16c share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Wed Nov 14 19:27:40 2001 +0000
+++ b/share/mk/bsd.own.mk       Wed Nov 14 19:46:38 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.215 2001/11/13 17:37:03 tv Exp $
+#      $NetBSD: bsd.own.mk,v 1.216 2001/11/14 19:46:38 thorpej Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -15,11 +15,11 @@
 .if defined(USE_NEW_TOOLCHAIN) && ${USE_NEW_TOOLCHAIN} == "no"
 .undef USE_NEW_TOOLCHAIN       # unset
 .else
-.if ${MACHINE_ARCH} == "i386" || \
+.if ${MACHINE_ARCH} == "arm" || \
+    ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "sparc64" || \
-    ${MACHINE} == "arm26"
+    ${MACHINE_ARCH} == "sparc64"
 USE_NEW_TOOLCHAIN=yes  # set
 .endif
 .endif
@@ -222,6 +222,7 @@
 # SHLIB_TYPE:          "ELF" or "a.out" or "" to force static libraries.
 #
 .if ${MACHINE_ARCH} == "alpha" || \
+    ${MACHINE_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
@@ -235,7 +236,6 @@
     ${MACHINE} == "hp300" || \
     ${MACHINE} == "news68k" || \
     ${MACHINE} == "cesfic" || \
-    ${MACHINE} == "arm26" || \
     ${MACHINE} == "atari"
 OBJECT_FMT?=ELF
 .else