[src/trunk]: src/sys/rump Move constant cpp macros from Makefile.rump into op...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/36506244056f
branches:  trunk
changeset: 340074:36506244056f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Aug 21 12:39:07 2015 +0000

description:
Move constant cpp macros from Makefile.rump into opt_rumpkernel.h
(makes cc invocation lines a bit shorter)

diffstat:

 sys/rump/Makefile.rump                |  14 +++++++-------
 sys/rump/include/opt/opt_rumpkernel.h |  14 ++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r 64bd57a75597 -r 36506244056f sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Fri Aug 21 12:26:54 2015 +0000
+++ b/sys/rump/Makefile.rump    Fri Aug 21 12:39:07 2015 +0000
@@ -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: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 @@
 
 # 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 @@
 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
diff -r 64bd57a75597 -r 36506244056f sys/rump/include/opt/opt_rumpkernel.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/opt_rumpkernel.h     Fri Aug 21 12:39:07 2015 +0000
@@ -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