From a2b72aafa20e96e581d50c6e0ea269a77912b47a Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Sun, 13 Jun 2010 15:17:02 +0000
Subject: [PATCH] Fix previous in emul.c -- only numbers are operands for cpp
 comparisons. Apparently non-numbers logically produce arch-dependent
 behaviour.

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

diff --git a/sys/rump/librump/rumpkern/Makefile.rumpkern b/sys/rump/librump/rumpkern/Makefile.rumpkern
index 795effe35e99..127136ebbd7d 100644
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern
@@ -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 @@ ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 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 --git a/sys/rump/librump/rumpkern/emul.c b/sys/rump/librump/rumpkern/emul.c
index c615c19a7633..c0044cf84cb5 100644
--- a/sys/rump/librump/rumpkern/emul.c
+++ b/sys/rump/librump/rumpkern/emul.c
@@ -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 @@ int pgshift = 12;
 #endif
 
 /* sun3 is sun3 with broken kernel modules */
-#if _MACHINE == sun3
+#ifdef sun3
 char KERNBASE[1]; /* this is completely random ... */
 #endif