Module Name: src
Committed By: pooka
Date: Wed Apr 22 18:12:40 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpkern: rump.c
src/sys/rump/librump/rumpkern/arch/generic: Makefile.inc
src/sys/rump/librump/rumpkern/arch/x86: Makefile.inc
Added Files:
src/sys/rump/librump/rumpkern/arch/generic: rump_generic_abi.c
src/sys/rump/librump/rumpkern/arch/x86: rump_x86_abi.c
Log Message:
Define rump_nativeabi_p() under arch, where one would logically expect
it to be defined.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.318 -r1.319 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.105 src/sys/rump/Makefile.rump:1.106
--- src/sys/rump/Makefile.rump:1.105 Wed Apr 22 17:58:19 2015
+++ src/sys/rump/Makefile.rump Wed Apr 22 18:12:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.105 2015/04/22 17:58:19 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.106 2015/04/22 18:12:39 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -13,7 +13,6 @@ NOLINT= # kernel code
# compile-time options may override this at a later date.
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
_RUMP_NATIVEABI= yes
-CPPFLAGS+= -D_RUMP_NATIVE_ABI
.else
_RUMP_NATIVEABI= no
CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.318 src/sys/rump/librump/rumpkern/rump.c:1.319
--- src/sys/rump/librump/rumpkern/rump.c:1.318 Fri Apr 17 13:02:54 2015
+++ src/sys/rump/librump/rumpkern/rump.c Wed Apr 22 18:12:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.318 2015/04/17 13:02:54 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.319 2015/04/22 18:12:39 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.318 2015/04/17 13:02:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.319 2015/04/22 18:12:39 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -686,17 +686,6 @@ rump_getversion(void)
/* compat */
__strong_alias(rump_pub_getversion,rump_getversion);
-int
-rump_nativeabi_p(void)
-{
-
-#ifdef _RUMP_NATIVE_ABI
- return 1;
-#else
- return 0;
-#endif
-}
-
/*
* Note: may be called unscheduled. Not fully safe since no locking
* of allevents (currently that's not even available).
Index: src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc:1.1 src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc:1.2
--- src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc:1.1 Wed Feb 12 22:28:43 2014
+++ src/sys/rump/librump/rumpkern/arch/generic/Makefile.inc Wed Apr 22 18:12:39 2015
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/02/12 22:28:43 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/04/22 18:12:39 pooka Exp $
#
SRCS+= rump_generic_cpu.c rump_generic_kobj.c rump_generic_pmap.c
+SRCS+= rump_generic_abi.c
Index: src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc:1.1 src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc:1.2
--- src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc:1.1 Wed Feb 12 22:28:43 2014
+++ src/sys/rump/librump/rumpkern/arch/x86/Makefile.inc Wed Apr 22 18:12:39 2015
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/02/12 22:28:43 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/04/22 18:12:39 pooka Exp $
#
.PATH: ${RUMPTOP}/librump/rumpkern/arch/x86
SRCS+= rump_x86_cpu.c rump_x86_spl.c rump_x86_cpu_counter.c
SRCS+= rump_x86_spinlock.c rump_x86_pmap.c
+SRCS+= rump_x86_abi.c
Added files:
Index: src/sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c
diff -u /dev/null src/sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c:1.1
--- /dev/null Wed Apr 22 18:12:40 2015
+++ src/sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c Wed Apr 22 18:12:39 2015
@@ -0,0 +1,38 @@
+/* $NetBSD: rump_generic_abi.c,v 1.1 2015/04/22 18:12:39 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2015 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rump_generic_abi.c,v 1.1 2015/04/22 18:12:39 pooka Exp $");
+
+#include "rump_private.h"
+
+int
+rump_nativeabi_p(void)
+{
+
+ return 0;
+}
Index: src/sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c
diff -u /dev/null src/sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c:1.1
--- /dev/null Wed Apr 22 18:12:40 2015
+++ src/sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c Wed Apr 22 18:12:39 2015
@@ -0,0 +1,38 @@
+/* $NetBSD: rump_x86_abi.c,v 1.1 2015/04/22 18:12:39 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2015 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rump_x86_abi.c,v 1.1 2015/04/22 18:12:39 pooka Exp $");
+
+#include "rump_private.h"
+
+int
+rump_nativeabi_p(void)
+{
+
+ return 1;
+}
