Module Name: src
Committed By: christos
Date: Mon Nov 6 17:56:25 UTC 2017
Modified Files:
src/sys/sys: exec_elf.h kobj.h ksyms.h
Log Message:
Since _RUMPKERNEL is really userland code it needs ARCH_ELFSIZE,
not KERN_ELFSIZE, make it so!
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/sys/exec_elf.h
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/kobj.h
cvs rdiff -u -r1.36 -r1.37 src/sys/sys/ksyms.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/exec_elf.h
diff -u src/sys/sys/exec_elf.h:1.157 src/sys/sys/exec_elf.h:1.158
--- src/sys/sys/exec_elf.h:1.157 Sun Nov 5 22:50:33 2017
+++ src/sys/sys/exec_elf.h Mon Nov 6 12:56:25 2017
@@ -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 @@ struct netbsd_elfcore_procinfo {
#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)
Index: src/sys/sys/kobj.h
diff -u src/sys/sys/kobj.h:1.19 src/sys/sys/kobj.h:1.20
--- src/sys/sys/kobj.h:1.19 Sun Nov 5 22:50:13 2017
+++ src/sys/sys/kobj.h Mon Nov 6 12:56:25 2017
@@ -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
Index: src/sys/sys/ksyms.h
diff -u src/sys/sys/ksyms.h:1.36 src/sys/sys/ksyms.h:1.37
--- src/sys/sys/ksyms.h:1.36 Sun Nov 5 22:50:13 2017
+++ src/sys/sys/ksyms.h Mon Nov 6 12:56:25 2017
@@ -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 (ra...@ludd.luth.se).
@@ -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>
