[src/trunk]: src/common/lib/libc/arch/arm/atomic Only use MACHINE_ARCH if !_S...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86b5c1625c4a
branches:  trunk
changeset: 789105:86b5c1625c4a
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Aug 06 20:49:15 2013 +0000

description:
Only use MACHINE_ARCH if !_STANDALONE and CPPFLAGS/CFLAGS/CPUFLAGS don't
contain -mcpu or -march

diffstat:

 common/lib/libc/arch/arm/atomic/Makefile.inc |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 3e2e80818f02 -r 86b5c1625c4a common/lib/libc/arch/arm/atomic/Makefile.inc
--- a/common/lib/libc/arch/arm/atomic/Makefile.inc      Tue Aug 06 20:37:22 2013 +0000
+++ b/common/lib/libc/arch/arm/atomic/Makefile.inc      Tue Aug 06 20:49:15 2013 +0000
@@ -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=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")