[src/trunk]: src/sys/rump/librump/rumpkern Fix previous in emul.c -- only num...

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

details:   https://anonhg.NetBSD.org/src/rev/49362e4ad026
branches:  trunk
changeset: 755641:49362e4ad026
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Jun 13 15:17:02 2010 +0000

description:
Fix previous in emul.c -- only numbers are operands for cpp comparisons.
Apparently non-numbers logically produce arch-dependent behaviour.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |  6 +++++-
 sys/rump/librump/rumpkern/emul.c            |  6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r e529da7217eb -r 49362e4ad026 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jun 13 13:43:02 2010 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jun 13 15:17:02 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.89 2010/06/10 21:40:42 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.90 2010/06/13 15:17:02 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -117,6 +117,10 @@
 SRCS+= kobj_stubs.c rumpcpu_generic.c
 .endif
 
+.if ${MACHINE} == "sun3"
+CPPFLAGS+=     -Dsun3
+.endif
+
 # include libkern source files
 KERNDIR=${RUMPTOP}/../lib/libkern
 .ifdef RUMPKMOD
diff -r e529da7217eb -r 49362e4ad026 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Sun Jun 13 13:43:02 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Sun Jun 13 15:17:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.140 2010/06/13 11:35:41 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.141 2010/06/13 15:17:02 pooka Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.140 2010/06/13 11:35:41 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.141 2010/06/13 15:17:02 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -104,7 +104,7 @@
 #endif
 
 /* sun3 is sun3 with broken kernel modules */
-#if _MACHINE == sun3
+#ifdef sun3
 char KERNBASE[1]; /* this is completely random ... */
 #endif