Module Name: src
Committed By: pooka
Date: Tue May 11 21:08:07 UTC 2010
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Limit visibility of _RUMPKERNEL to prevent abuse.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.82 -r1.83 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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.56 src/sys/rump/Makefile.rump:1.57
--- src/sys/rump/Makefile.rump:1.56 Mon Apr 26 23:01:53 2010
+++ src/sys/rump/Makefile.rump Tue May 11 21:08:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.56 2010/04/26 23:01:53 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.57 2010/05/11 21:08:07 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -10,13 +10,13 @@
# use rump ABI instead of the NetBSD kernel ABI.
.ifndef RUMPKMOD
CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
+CPPFLAGS+= -D_RUMPKERNEL
.else
CPPFLAGS+= -D_RUMP_NATIVE_ABI
.endif
CFLAGS+= -ffreestanding -fno-strict-aliasing
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
-CPPFLAGS+= -D_RUMPKERNEL
CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
CPPFLAGS+= -DMAXUSERS=32
CPPFLAGS+= -DDIAGNOSTIC
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.82 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.83
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.82 Fri Apr 30 20:54:17 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue May 11 21:08:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.82 2010/04/30 20:54:17 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.83 2010/05/11 21:08:07 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -68,6 +68,13 @@
# sys/dev
SRCS+= clock_subr.c
+# Non-kernel ABI gets this for the whole rump build, as opposed to
+# kernel ABI where we need to specifically set it here to get
+# some things like the atomic ops implementation right.
+.ifdef RUMPKMOD
+CPPFLAGS+= -D_RUMPKERNEL
+.endif
+
# Flip the comment to the other line if you want to use malloc(3)
# directly instead of the kernel allocators backed by malloc(3)/mmap(2).
# Libc malloc is a few percent faster, but doesn't emulate all kernel
