Module Name: src
Committed By: matt
Date: Fri Feb 28 14:19:25 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Use the new FEAT_LDREX to replace ARMV6/ARMV7
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 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.137 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.138
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.137 Tue Feb 18 06:18:13 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Fri Feb 28 14:19:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.137 2014/02/18 06:18:13 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.138 2014/02/28 14:19:25 matt Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -220,7 +220,7 @@ 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) && empty(ARMV7)) \
+.if (${MACHINE_CPU} == "arm" && "${FEAT_LDREX}" != "yes") \
|| ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "hppa" \
|| ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "sh3" \
|| ${MACHINE_ARCH} == "vax" || ${MACHINE_ARCH} == "m68000"
