Wed Dec 18 18:38:21 2013 UTC ()
Allow armv7/armv7eb as valid MACHINE_ARCH for arm


(matt)
diff -r1.542.2.9.4.7 -r1.542.2.9.4.8 src/share/mk/bsd.own.mk
cvs diff -r1.542.2.9.4.7 -r1.542.2.9.4.8 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2011/05/20 16:35:10 1.542.2.9.4.7
+++ src/share/mk/bsd.own.mk 2013/12/18 18:38:21 1.542.2.9.4.8
@@ -4,27 +4,27 @@ @@ -4,27 +4,27 @@
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
15# CPU model, derived from MACHINE_ARCH 15# CPU model, derived from MACHINE_ARCH
16# 16#
17MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 17MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:C/arm.*/arm/}
18 18
19# 19#
20# Subdirectory used below ${RELEASEDIR} when building a release 20# Subdirectory used below ${RELEASEDIR} when building a release
21# 21#
22RELEASEMACHINEDIR?= ${MACHINE} 22RELEASEMACHINEDIR?= ${MACHINE}
23 23
24# 24#
25# Subdirectory or path component used for the following paths: 25# Subdirectory or path component used for the following paths:
26# distrib/${RELEASEMACHINE} 26# distrib/${RELEASEMACHINE}
27# distrib/notes/${RELEASEMACHINE} 27# distrib/notes/${RELEASEMACHINE}
28# etc/etc.${RELEASEMACHINE} 28# etc/etc.${RELEASEMACHINE}
29# Used when building a release. 29# Used when building a release.
30# 30#
@@ -547,28 +547,27 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve @@ -547,28 +547,27 @@ SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
547# 547#
548GNU_ARCH.coldfire=m68k 548GNU_ARCH.coldfire=m68k
549GNU_ARCH.m68000=m68010 549GNU_ARCH.m68000=m68010
550GNU_ARCH.sh3eb=sh 550GNU_ARCH.sh3eb=sh
551GNU_ARCH.sh3el=shle 551GNU_ARCH.sh3el=shle
552GNU_ARCH.mips64eb=mips64 552GNU_ARCH.mips64eb=mips64
553MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}} 553MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}
554 554
555# 555#
556# In order to identify NetBSD to GNU packages, we sometimes need 556# In order to identify NetBSD to GNU packages, we sometimes need
557# an "elf" tag for historically a.out platforms. 557# an "elf" tag for historically a.out platforms.
558# 558#
559.if ${OBJECT_FMT} == "ELF" && \ 559.if ${OBJECT_FMT} == "ELF" && \
560 (${MACHINE_GNU_ARCH} == "arm" || \ 560 (${MACHINE_CPU} == "arm" || \
561 ${MACHINE_GNU_ARCH} == "armeb" || \ 
562 ${MACHINE_ARCH} == "i386" || \ 561 ${MACHINE_ARCH} == "i386" || \
563 ${MACHINE_CPU} == "m68k" || \ 562 ${MACHINE_CPU} == "m68k" || \
564 ${MACHINE_GNU_ARCH} == "sh" || \ 563 ${MACHINE_GNU_ARCH} == "sh" || \
565 ${MACHINE_GNU_ARCH} == "shle" || \ 564 ${MACHINE_GNU_ARCH} == "shle" || \
566 ${MACHINE_ARCH} == "sparc" || \ 565 ${MACHINE_ARCH} == "sparc" || \
567 ${MACHINE_ARCH} == "vax") 566 ${MACHINE_ARCH} == "vax")
568MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf 567MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf
569.else 568.else
570MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd 569MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd
571.endif 570.endif
572 571
573TARGETS+= all clean cleandir depend dependall includes \ 572TARGETS+= all clean cleandir depend dependall includes \
574 install lint obj regress tags html 573 install lint obj regress tags html