[src/trunk]: src/share/mk Add support for MACHINE_ARCH earmhf and earmhfeb

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

details:   https://anonhg.NetBSD.org/src/rev/09c0e5ecab15
branches:  trunk
changeset: 784598:09c0e5ecab15
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Feb 03 05:36:36 2013 +0000

description:
Add support for MACHINE_ARCH earmhf and earmhfeb

diffstat:

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

diffs (48 lines):

diff -r 464b2f1e07fc -r 09c0e5ecab15 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Feb 03 05:35:25 2013 +0000
+++ b/share/mk/bsd.own.mk       Sun Feb 03 05:36:36 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.721 2013/01/27 02:31:44 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.722 2013/02/03 05:36:36 matt Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -14,7 +14,7 @@
 #
 # CPU model, derived from MACHINE_ARCH
 #
-MACHINE_CPU=   ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:S/earm/arm/:S/earmeb/arm/:S/powerpc64/powerpc/}
+MACHINE_CPU=   ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/}
 
 #
 # Subdirectory used below ${RELEASEDIR} when building a release
@@ -684,6 +684,8 @@
 GNU_ARCH.coldfire=m68k
 GNU_ARCH.earm=arm
 GNU_ARCH.earmeb=armeb
+GNU_ARCH.earmhf=arm
+GNU_ARCH.earmhfeb=armeb
 GNU_ARCH.i386=i486
 GCC_CONFIG_ARCH.i386=i486
 GCC_CONFIG_TUNE.i386=nocona
@@ -698,8 +700,8 @@
 # In order to identify NetBSD to GNU packages, we sometimes need
 # an "elf" tag for historically a.out platforms.
 #
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-eabi
+.if (${MACHINE_ARCH:Mearm*} != "")
+MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-${MACHINE_ARCH:C/eb//:S/earm/eabi/}
 .elif (${MACHINE_GNU_ARCH} == "arm" || \
      ${MACHINE_GNU_ARCH} == "armeb" || \
      ${MACHINE_ARCH} == "i386" || \
@@ -810,7 +812,8 @@
 # emips is always softfloat.
 #
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \
-    ${MACHINE_CPU} == "arm" || ${MACHINE} == "emips"
+    (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \
+    ${MACHINE} == "emips"
 MKSOFTFLOAT?=  yes
 .endif