Module Name: src
Committed By: pgoyette
Date: Fri Jan 25 09:36:09 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_mod.c
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Log Message:
Move the netbsd32_machine32_hook into the main kernel with most of
the other hooks.
Although this hook might better belong in compat/netbsd32/ code,
there are some machines without a netbsd32 module (for example, i386
and sgimips) which still have consumers/users of this hook. :(
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.18 -r1.115.2.19 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.14 -r1.15.2.15 \
src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.110.14.7 -r1.110.14.8 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.94.12.7 -r1.94.12.8 \
src/sys/compat/linux/common/linux_exec_elf32.c
cvs rdiff -u -r1.116.2.18 -r1.116.2.19 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.13.16.18 -r1.13.16.19 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/sys/sys/compat_stub.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/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.18 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.19
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.18 Thu Jan 24 04:08:09 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Fri Jan 25 09:36:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.18 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.19 2019/01/25 09:36:08 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.18 2019/01/24 04:08:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.19 2019/01/25 09:36:08 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -62,6 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
#include <sys/ras.h>
#include <sys/ptrace.h>
#include <sys/kauth.h>
+#include <sys/compat_stub.h>
#include <x86/fpu.h>
#include <x86/dbregs.h>
@@ -969,8 +970,6 @@ netbsd32_vm_default_addr(struct proc *p,
return VM_DEFAULT_ADDRESS32_BOTTOMUP(base, sz);
}
-extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
-
static const char *
netbsd32_machine32(void)
{
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.14 src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.15
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.14 Thu Jan 24 04:08:09 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Fri Jan 25 09:36:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.15.2.14 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.15.2.15 2019/01/25 09:36:08 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.14 2019/01/24 04:08:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.15 2019/01/25 09:36:08 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
#include <sys/signalvar.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
+#include <sys/compat_stub.h>
#include <compat/netbsd32/netbsd32.h>
#include <compat/netbsd32/netbsd32_exec.h>
@@ -308,7 +309,6 @@ cpu_coredump32(struct lwp *l, struct cor
#endif
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
void
netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.7 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.8
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.7 Thu Jan 24 04:08:09 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Fri Jan 25 09:36:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.110.14.7 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.110.14.8 2019/01/25 09:36:08 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.7 2019/01/24 04:08:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.8 2019/01/25 09:36:08 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
#include <sys/ucontext.h>
#include <sys/ioctl.h>
#include <sys/kmem.h>
+#include <sys/compat_stub.h>
#include <dev/sun/event_var.h>
@@ -1023,8 +1024,6 @@ netbsd32_machine32(void)
return machine32;
}
-extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
-
void
netbsd32_machdep_md_init(void)
{
Index: src/sys/compat/linux/common/linux_exec_elf32.c
diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.7 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.8
--- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.7 Thu Jan 24 05:06:43 2019
+++ src/sys/compat/linux/common/linux_exec_elf32.c Fri Jan 25 09:36:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_elf32.c,v 1.94.12.7 2019/01/24 05:06:43 pgoyette Exp $ */
+/* $NetBSD: linux_exec_elf32.c,v 1.94.12.8 2019/01/25 09:36:09 pgoyette Exp $ */
/*-
* Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.7 2019/01/24 05:06:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.8 2019/01/25 09:36:09 pgoyette Exp $");
#ifndef ELFSIZE
/* XXX should die */
@@ -74,10 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_e
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_syscall.h>
-#if (ELFSIZE == 32)
- MODULE_HOOK(netbsd32_machine32_hook, const char *, (void));
-#endif
-
#define LINUX_GO_RT0_SIGNATURE
#ifdef DEBUG_LINUX
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.18 src/sys/compat/netbsd32/netbsd32.h:1.116.2.19
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.18 Thu Jan 24 04:08:09 2019
+++ src/sys/compat/netbsd32/netbsd32.h Fri Jan 25 09:36:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.18 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.19 2019/01/25 09:36:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1177,8 +1177,6 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_
MODULE_HOOK(netbsd32_sendsig_hook, void,
(const ksiginfo_t *, const sigset_t *));
-MODULE_HOOK(netbsd32_machine32_hook, const char *, (void));
-
extern struct sysent netbsd32_sysent[];
extern const uint32_t netbsd32_sysent_nomodbits[];
#ifdef SYSCALL_DEBUG
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.18 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.19
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.18 Thu Jan 24 04:08:09 2019
+++ src/sys/compat/netbsd32/netbsd32_mod.c Fri Jan 25 09:36:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.18 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.19 2019/01/25 09:36:09 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.18 2019/01/24 04:08:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.19 2019/01/25 09:36:09 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
struct compat32_80_modctl_hook_t compat32_80_modctl_hook;
-struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
-
# define DEPS1 "ksem,coredump,compat_util"
Index: src/sys/kern/compat_stub.c
diff -u src/sys/kern/compat_stub.c:1.1.2.41 src/sys/kern/compat_stub.c:1.1.2.42
--- src/sys/kern/compat_stub.c:1.1.2.41 Thu Jan 24 04:08:09 2019
+++ src/sys/kern/compat_stub.c Fri Jan 25 09:36:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.c,v 1.1.2.41 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: compat_stub.c,v 1.1.2.42 2019/01/25 09:36:09 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -247,3 +247,13 @@ struct compat_70_unp_hook_t compat_70_un
* Hook for sysvipc50_sysctl
*/
struct sysvipc50_sysctl_hook_t sysvipc50_sysctl_hook;
+
+/*
+ * Hook for 32-bit machine name
+ *
+ * This probably would be better placed in compat/netbsd32/netbsd32_mod.c
+ * but the consumer code in linux32_exec_elf32.c is sometimes included in
+ * the main kernel, and not in a compat_netbsd32 module. (In particular,
+ * this is true for i386 and sgimips.)
+ */
+struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.54 src/sys/sys/compat_stub.h:1.1.2.55
--- src/sys/sys/compat_stub.h:1.1.2.54 Thu Jan 24 04:08:09 2019
+++ src/sys/sys/compat_stub.h Fri Jan 25 09:36:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.54 2019/01/24 04:08:09 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.55 2019/01/25 09:36:09 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -308,4 +308,13 @@ MODULE_HOOK(compat_70_unp_hook, struct m
#include <sys/sysctl.h>
MODULE_HOOK(sysvipc50_sysctl_hook, int, (SYSCTLFN_PROTO));
+/*
+ * Hook for 32-bit machine name
+ *
+ * This probably would be better placed in compat/netbsd32/netbsd32_mod.c
+ * but the consumer code in linux32_exec_elf32.c is sometimes included in
+ * the main kernel, and not in a compat_netbsd32 module. (In particular,
+ * this is true for i386 and sgimips.)
+ */
+MODULE_HOOK(netbsd32_machine32_hook, const char *, (void));
#endif /* _SYS_COMPAT_STUB_H */
