[src/trunk]: src/sys/sys Since _RUMPKERNEL is really userland code it needs A...

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

details:   https://anonhg.NetBSD.org/src/rev/68a636dcdbdb
branches:  trunk
changeset: 827642:68a636dcdbdb
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 06 17:56:25 2017 +0000

description:
Since _RUMPKERNEL is really userland code it needs ARCH_ELFSIZE,
not KERN_ELFSIZE, make it so!

diffstat:

 sys/sys/exec_elf.h |  13 ++++++-------
 sys/sys/kobj.h     |   4 ++--
 sys/sys/ksyms.h    |   4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r 7afee7c2c51f -r 68a636dcdbdb sys/sys/exec_elf.h
--- a/sys/sys/exec_elf.h        Mon Nov 06 17:32:53 2017 +0000
+++ b/sys/sys/exec_elf.h        Mon Nov 06 17:56:25 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.h,v 1.157 2017/11/06 03:50:33 christos Exp $  */
+/*     $NetBSD: exec_elf.h,v 1.158 2017/11/06 17:56:25 christos Exp $  */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -1051,12 +1051,11 @@
 
 
 #if !defined(ELFSIZE)
-#if defined(_KERNEL) && defined(KERN_ELFSIZE)
-#define ELFSIZE KERN_ELFSIZE
-#endif
-#if !defined(_KERNEL) && defined(ARCH_ELFSIZE)
-#define ELFSIZE ARCH_ELFSIZE
-#endif
+# if defined(_RUMPKERNEL) || !defined(_KERNEL)
+#  define ELFSIZE ARCH_ELFSIZE
+# else
+#  define ELFSIZE KERN_ELFSIZE
+# endif
 #endif
 
 #if defined(ELFSIZE)
diff -r 7afee7c2c51f -r 68a636dcdbdb sys/sys/kobj.h
--- a/sys/sys/kobj.h    Mon Nov 06 17:32:53 2017 +0000
+++ b/sys/sys/kobj.h    Mon Nov 06 17:56:25 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobj.h,v 1.19 2017/11/06 03:50:13 christos Exp $       */
+/*     $NetBSD: kobj.h,v 1.20 2017/11/06 17:56:25 christos Exp $       */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #ifndef _SYS_KOBJ_H_
 #define        _SYS_KOBJ_H_
 
-#ifndef ELFSIZE
+#if !defined(ELFSIZE) && !defined(_RUMPKERNEL)
 #define ELFSIZE KERN_ELFSIZE
 #endif
 
diff -r 7afee7c2c51f -r 68a636dcdbdb sys/sys/ksyms.h
--- a/sys/sys/ksyms.h   Mon Nov 06 17:32:53 2017 +0000
+++ b/sys/sys/ksyms.h   Mon Nov 06 17:56:25 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ksyms.h,v 1.36 2017/11/06 03:50:13 christos Exp $      */
+/*     $NetBSD: ksyms.h,v 1.37 2017/11/06 17:56:25 christos Exp $      */
 
 /*
  * Copyright (c) 2001, 2003 Anders Magnusson (ragge%ludd.luth.se@localhost).
@@ -30,7 +30,7 @@
 #ifndef _SYS_KSYMS_H_
 #define _SYS_KSYMS_H_
 
-#ifndef ELFSIZE
+#if !defined(ELFSIZE) && !defined(_RUMPKERNEL)
 #define ELFSIZE KERN_ELFSIZE
 #endif
 #include <sys/exec_elf.h>