Module Name: src
Committed By: matt
Date: Thu Aug 22 15:53:05 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Teach this about ARMV7
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.129 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.130
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.129 Thu Jul 18 22:15:45 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Aug 22 15:53:05 2013
@@ -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 @@ KERNMISCCPPFLAGS+= -D_RUMPKERNEL
# 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
