[src/trunk]: src/sys/rump Define rump_nativeabi_p() under arch, where one wou...

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

details:   https://anonhg.NetBSD.org/src/rev/b600b6cb1549
branches:  trunk
changeset: 807798:b600b6cb1549
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Apr 22 18:12:39 2015 +0000

description:
Define rump_nativeabi_p() under arch, where one would logically expect
it to be defined.

diffstat:

 sys/rump/Makefile.rump                                    |   3 +-
 sys/rump/librump/rumpkern/arch/generic/Makefile.inc       |   3 +-
 sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c |  38 +++++++++++++++
 sys/rump/librump/rumpkern/arch/x86/Makefile.inc           |   3 +-
 sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c         |  38 +++++++++++++++
 sys/rump/librump/rumpkern/rump.c                          |  15 +-----
 6 files changed, 83 insertions(+), 17 deletions(-)

diffs (160 lines):

diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Wed Apr 22 17:58:19 2015 +0000
+++ b/sys/rump/Makefile.rump    Wed Apr 22 18:12:39 2015 +0000
@@ -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 @@
 # 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}
diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/librump/rumpkern/arch/generic/Makefile.inc
--- a/sys/rump/librump/rumpkern/arch/generic/Makefile.inc       Wed Apr 22 17:58:19 2015 +0000
+++ b/sys/rump/librump/rumpkern/arch/generic/Makefile.inc       Wed Apr 22 18:12:39 2015 +0000
@@ -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
diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c Wed Apr 22 18:12:39 2015 +0000
@@ -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;
+}
diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/librump/rumpkern/arch/x86/Makefile.inc
--- a/sys/rump/librump/rumpkern/arch/x86/Makefile.inc   Wed Apr 22 17:58:19 2015 +0000
+++ b/sys/rump/librump/rumpkern/arch/x86/Makefile.inc   Wed Apr 22 18:12:39 2015 +0000
@@ -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
diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c Wed Apr 22 18:12:39 2015 +0000
@@ -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;
+}
diff -r ef3e7d8140b5 -r b600b6cb1549 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Wed Apr 22 17:58:19 2015 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Wed Apr 22 18:12:39 2015 +0000
@@ -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 @@
 /* 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).