[src/trunk]: src/sys/rump/librump/rumpkern Take into account armv6 hacks from...

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

details:   https://anonhg.NetBSD.org/src/rev/3195be28a29f
branches:  trunk
changeset: 783589:3195be28a29f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Dec 30 23:52:12 2012 +0000

description:
Take into account armv6 hacks from common/lib/libc/arch/arm/atomic to
allow this to build with -march=armv6k

diffstat:

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

diffs (18 lines):

diff -r 1bc45cebdb57 -r 3195be28a29f sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Dec 30 22:52:35 2012 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Dec 30 23:52:12 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.120 2012/11/04 11:12:31 apb Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.121 2012/12/30 23:52:12 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -195,7 +195,7 @@
 # compare-and-swap.  This is because the kernel version is using
 # instructions or routines unavailable to us in userspace.
 #
-.if ${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "hppa" \
+.if (${MACHINE_CPU} == "arm" && empty(ARMV6)) || ${MACHINE_CPU} == "hppa" \
     || ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "sh3" \
     || ${MACHINE_CPU} == "vax" || ${MACHINE_ARCH} == "m68000"
 CPPFLAGS+=     -I${RUMPTOP}/../../common/lib/libc/atomic