Module Name: src
Committed By: pooka
Date: Fri Aug 21 12:39:07 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
Added Files:
src/sys/rump/include/opt: opt_rumpkernel.h
Log Message:
Move constant cpp macros from Makefile.rump into opt_rumpkernel.h
(makes cc invocation lines a bit shorter)
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/rump/Makefile.rump
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/opt_rumpkernel.h
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.113 src/sys/rump/Makefile.rump:1.114
--- src/sys/rump/Makefile.rump:1.113 Wed Jun 3 14:40:11 2015
+++ src/sys/rump/Makefile.rump Fri Aug 21 12:39:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.113 2015/06/03 14:40:11 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.114 2015/08/21 12:39:07 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -40,14 +40,13 @@ RUMP_NBCOMPAT=
RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g}
CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_&/g}
-CPPFLAGS+= -DMAXUSERS=32
-
CPPFLAGS+= -nostdinc
CFLAGS+= -ffreestanding -fno-strict-aliasing
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
-CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
-CPPFLAGS+= -DDEBUGPRINT
+
+CPPFLAGS+= -imacros ${RUMPTOP}/include/opt/opt_rumpkernel.h
+
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
@@ -118,7 +117,7 @@ CPPFLAGS+= -DKTRACE
# make sure __NetBSD__ gets defined (for builds on non-NetBSD)
# also, give those builds a way to undef the local compiler's macros
-CPPFLAGS+= -D__NetBSD__ ${RUMPKERN_UNDEF}
+CPPFLAGS+= ${RUMPKERN_UNDEF}
RUMPKERNEL= This is NetBSD and I am the rump. Good evening.
@@ -127,8 +126,9 @@ RUMPKERNEL= This is NetBSD and I am the
CPPFLAGS+= -DPPC_OEA
.endif
-# If this file changes, we need a full rebuild
+# If any of these files change, we need a full rebuild
DPSRCS+= ${RUMPTOP}/Makefile.rump
+DPSRCS+= ${RUMPTOP}/include/opt/opt_rumpkernel.h
#
# Support for component-specific hypercalls
Added files:
Index: src/sys/rump/include/opt/opt_rumpkernel.h
diff -u /dev/null src/sys/rump/include/opt/opt_rumpkernel.h:1.1
--- /dev/null Fri Aug 21 12:39:07 2015
+++ src/sys/rump/include/opt/opt_rumpkernel.h Fri Aug 21 12:39:07 2015
@@ -0,0 +1,14 @@
+/* $NetBSD: opt_rumpkernel.h,v 1.1 2015/08/21 12:39:07 pooka Exp $ */
+
+#ifndef __NetBSD__
+#define __NetBSD__
+#endif
+
+#define _KERNEL 1
+#define _MODULE 1
+
+#define MODULAR 1
+#define MULTIPROCESSOR 1
+#define MAXUSERS 32
+
+#define DEBUGPRINT
