[src/trunk]: src/sys/rump/librump/rumpkern Teach this about ARMV7

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

details:   https://anonhg.NetBSD.org/src/rev/636f47b9bfbf
branches:  trunk
changeset: 789566:636f47b9bfbf
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 22 15:53:05 2013 +0000

description:
Teach this about ARMV7

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 92f39fe106ff -r 636f47b9bfbf sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Aug 22 10:04:28 2013 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Aug 22 15:53:05 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.129 2013/07/18 22:15:45 matt Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.130 2013/08/22 15:53:05 matt Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -202,10 +202,10 @@
 # compare-and-swap.  This is because the kernel version is using
 # instructions or routines unavailable to us in userspace.
 #
-.if (${MACHINE_CPU} == "arm" && empty(ARMV6)) || ${MACHINE_CPU} == "hppa" \
+.if (${MACHINE_CPU} == "arm" && empty(ARMV6) && empty(ARMV7)) \
+    || ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "hppa" \
     || ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "sh3" \
-    || ${MACHINE_CPU} == "vax" || ${MACHINE_ARCH} == "m68000" \
-    || ${MACHINE_ARCH} == "coldfire"
+    || ${MACHINE_ARCH} == "vax" || ${MACHINE_ARCH} == "m68000"
 CPPFLAGS+=     -I${RUMPTOP}/../../common/lib/libc/atomic
 SRCS+=         atomic_cas_generic.c
 #SRCS+=                rump_atomic_cas_up.c