From 2260871018eb4e63f3e9557e1a42ee2d8ee07048 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Fri, 28 Feb 2014 14:19:25 +0000
Subject: [PATCH] Use the new FEAT_LDREX to replace ARMV6/ARMV7

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

diff --git a/sys/rump/librump/rumpkern/Makefile.rumpkern b/sys/rump/librump/rumpkern/Makefile.rumpkern
index 099b1229222e..1c80b7303272 100644
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern
@@ -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"