Module Name: src
Committed By: matt
Date: Tue Aug 6 20:49:15 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Log Message:
Only use MACHINE_ARCH if !_STANDALONE and CPPFLAGS/CFLAGS/CPUFLAGS don't
contain -mcpu or -march
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/arch/arm/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.11 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.12
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.11 Tue Aug 6 20:37:22 2013
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Tue Aug 6 20:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2013/08/06 20:37:22 matt Exp $
+# $NetBSD: Makefile.inc,v 1.12 2013/08/06 20:49:15 matt Exp $
ARMV6= ${CPUFLAGS:M-march=armv7*} ${CPUFLAGS:M-mcpu=cortex*}
ARMV6+= ${CPUFLAGS:M-march=armv6*} ${CPUFLAGS:M-mcpu=arm11*}
@@ -6,7 +6,12 @@ ARMV6+= ${CFLAGS:M-march=armv7*:} ${CFLA
ARMV6+= ${CFLAGS:M-march=armv6*:} ${CFLAGS:M-mcpu=arm11*}
ARMV6+= ${CPPFLAGS:M-march=armv7*:} ${CPPFLAGS:M-mcpu=cortex*}
ARMV6+= ${CPPFLAGS:M-march=armv6*:} ${CPPFLAGS:M-mcpu=arm11*}
+.if empty(CPPFLAGS:M-D_STANDALONE) \
+ && empty(CFLAGS:M-march=*) && empty(CFLAGS:M-mcpu=*) \
+ && empty(CPPFLAGS:M-march=*) && empty(CPPFLAGS:M-mcpu=*) \
+ && empty(CPUFLAGS:M-march=*) && empty(CPUFLAGS:M-mcpu=*)
ARMV6+= ${MACHINE_ARCH:Mearmv[67]*}
+.endif
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \
|| ${LIB} == "rump")
