Module Name: src
Committed By: matt
Date: Thu Dec 6 17:20:26 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern [matt-nb6-plus]: Makefile.rumpkern
Log Message:
Only add atomic_cas_generic.c to SRCS if there isn't already some
atomic_cas_* already in SRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.1 -r1.115.2.1.2.1 \
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.115.2.1 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.115.2.1.2.1
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.115.2.1 Tue Jun 26 14:49:09 2012
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Dec 6 17:20:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.115.2.1 2012/06/26 14:49:09 riz Exp $
+# $NetBSD: Makefile.rumpkern,v 1.115.2.1.2.1 2012/12/06 17:20:26 matt Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -194,10 +194,12 @@ KERNMISCCPPFLAGS+= -D_RUMPKERNEL
.if ${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "hppa" \
|| ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "sh3" \
|| ${MACHINE_CPU} == "vax" || ${MACHINE_ARCH} == "m68000"
+.if ${SRCS:Matomic_cas_*} == ""
CPPFLAGS+= -I${RUMPTOP}/../../common/lib/libc/atomic
SRCS+= atomic_cas_generic.c
#SRCS+= rump_atomic_cas_up.c
.endif
+.endif
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
