Module Name: src
Committed By: matt
Date: Sun Feb 3 05:36:36 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add support for MACHINE_ARCH earmhf and earmhfeb
To generate a diff of this commit:
cvs rdiff -u -r1.721 -r1.722 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.721 src/share/mk/bsd.own.mk:1.722
--- src/share/mk/bsd.own.mk:1.721 Sun Jan 27 02:31:44 2013
+++ src/share/mk/bsd.own.mk Sun Feb 3 05:36:36 2013
@@ -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 @@ MAKECONF?= /etc/mk.conf
#
# 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 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
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 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
# 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 @@ MKCOMPATMODULES:= no
# 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
