Module Name: src
Committed By: matt
Date: Sun Aug 5 04:11:35 UTC 2012
Modified Files:
src/share/mk: bsd.endian.mk bsd.own.mk
Log Message:
Add the new MACHINE_ARCH of earm and earmeb (arm EABI(AAPCS-LINUX)).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/mk/bsd.endian.mk
cvs rdiff -u -r1.701 -r1.702 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.endian.mk
diff -u src/share/mk/bsd.endian.mk:1.15 src/share/mk/bsd.endian.mk:1.16
--- src/share/mk/bsd.endian.mk:1.15 Wed Jan 9 11:26:14 2008
+++ src/share/mk/bsd.endian.mk Sun Aug 5 04:11:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.endian.mk,v 1.15 2008/01/09 11:26:14 simonb Exp $
+# $NetBSD: bsd.endian.mk,v 1.16 2012/08/05 04:11:35 matt Exp $
.if !defined(_BSD_ENDIAN_MK_)
_BSD_ENDIAN_MK_=1
@@ -7,6 +7,7 @@ _BSD_ENDIAN_MK_=1
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "arm" || \
+ ${MACHINE_ARCH} == "earm" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "ia64" || \
${MACHINE_ARCH} == "vax" || \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.701 src/share/mk/bsd.own.mk:1.702
--- src/share/mk/bsd.own.mk:1.701 Thu Jul 19 15:16:31 2012
+++ src/share/mk/bsd.own.mk Sun Aug 5 04:11:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.701 2012/07/19 15:16:31 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.702 2012/08/05 04:11:35 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/powerpc64/powerpc/}
+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/}
#
# Subdirectory used below ${RELEASEDIR} when building a release
@@ -654,6 +654,8 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
# GNU sources and packages sometimes see architecture names differently.
#
GNU_ARCH.coldfire=m68k
+GNU_ARCH.earm=arm
+GNU_ARCH.earmeb=armeb
GNU_ARCH.i386=i486
GCC_CONFIG_ARCH.i386=i486
GCC_CONFIG_TUNE.i386=nocona
@@ -668,7 +670,9 @@ 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_GNU_ARCH} == "arm" || \
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-eabi
+.elif (${MACHINE_GNU_ARCH} == "arm" || \
${MACHINE_GNU_ARCH} == "armeb" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_CPU} == "m68k" || \
