Module Name: src
Committed By: pooka
Date: Sun Dec 30 23:52:12 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Take into account armv6 hacks from common/lib/libc/arch/arm/atomic to
allow this to build with -march=armv6k
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 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.120 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.121
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.120 Sun Nov 4 11:12:31 2012
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Dec 30 23:52:12 2012
@@ -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 @@ 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" || ${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
