Module Name: src
Committed By: matt
Date: Wed Dec 18 18:38:21 UTC 2013
Modified Files:
src/share/mk [matt-nb5-mips64]: bsd.own.mk
Log Message:
Allow armv7/armv7eb as valid MACHINE_ARCH for arm
To generate a diff of this commit:
cvs rdiff -u -r1.542.2.9.4.7 -r1.542.2.9.4.8 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.542.2.9.4.7 src/share/mk/bsd.own.mk:1.542.2.9.4.8
--- src/share/mk/bsd.own.mk:1.542.2.9.4.7 Fri May 20 16:35:10 2011
+++ src/share/mk/bsd.own.mk Wed Dec 18 18:38:21 2013
@@ -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/}
+MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:C/arm.*/arm/}
#
# Subdirectory used below ${RELEASEDIR} when building a release
@@ -557,8 +557,7 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
# an "elf" tag for historically a.out platforms.
#
.if ${OBJECT_FMT} == "ELF" && \
- (${MACHINE_GNU_ARCH} == "arm" || \
- ${MACHINE_GNU_ARCH} == "armeb" || \
+ (${MACHINE_CPU} == "arm" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_CPU} == "m68k" || \
${MACHINE_GNU_ARCH} == "sh" || \
