Module Name: src
Committed By: pooka
Date: Sun Jun 13 15:17:02 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c
Log Message:
Fix previous in emul.c -- only numbers are operands for cpp comparisons.
Apparently non-numbers logically produce arch-dependent behaviour.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.140 -r1.141 src/sys/rump/librump/rumpkern/emul.c
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/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.89 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.90
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.89 Thu Jun 10 21:40:42 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Jun 13 15:17:02 2010
@@ -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
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.140 src/sys/rump/librump/rumpkern/emul.c:1.141
--- src/sys/rump/librump/rumpkern/emul.c:1.140 Sun Jun 13 11:35:41 2010
+++ src/sys/rump/librump/rumpkern/emul.c Sun Jun 13 15:17:02 2010
@@ -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
