Module Name: src
Committed By: christos
Date: Mon Oct 26 17:35:39 UTC 2020
Modified Files:
src/sys/kern: kern_core.c kern_sig.c
Log Message:
Depend directly on EXEC_ELF{32,64} to determine which versions of the coredump
code are available.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/kern_core.c
cvs rdiff -u -r1.392 -r1.393 src/sys/kern/kern_sig.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/kern/kern_core.c
diff -u src/sys/kern/kern_core.c:1.32 src/sys/kern/kern_core.c:1.33
--- src/sys/kern/kern_core.c:1.32 Tue Oct 20 09:47:30 2020
+++ src/sys/kern/kern_core.c Mon Oct 26 13:35:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_core.c,v 1.32 2020/10/20 13:47:30 christos Exp $ */
+/* $NetBSD: kern_core.c,v 1.33 2020/10/26 17:35:39 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,9 +37,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.32 2020/10/20 13:47:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.33 2020/10/26 17:35:39 christos Exp $");
#ifdef _KERNEL_OPT
+#include "opt_execfmt.h"
#include "opt_compat_netbsd32.h"
#endif
@@ -88,10 +89,10 @@ coredump_modcmd(modcmd_t cmd, void *arg)
MODULE_HOOK_SET(coredump_write_hook, coredump_write);
MODULE_HOOK_SET(coredump_offset_hook, coredump_offset);
MODULE_HOOK_SET(coredump_netbsd_hook, real_coredump_netbsd);
-#if !defined(_LP64) || defined(COMPAT_NETBSD32)
+#ifdef EXEC_ELF32
MODULE_HOOK_SET(coredump_elf32_hook, real_coredump_elf32);
#endif
-#ifdef _LP64
+#ifdef EXEC_ELF64
MODULE_HOOK_SET(coredump_elf64_hook, real_coredump_elf64);
#endif
MODULE_HOOK_SET(uvm_coredump_walkmap_hook,
@@ -102,10 +103,10 @@ coredump_modcmd(modcmd_t cmd, void *arg)
case MODULE_CMD_FINI:
MODULE_HOOK_UNSET(uvm_coredump_count_segs_hook);
MODULE_HOOK_UNSET(uvm_coredump_walkmap_hook);
-#ifdef _LP64
+#ifdef EXEC_ELF64
MODULE_HOOK_UNSET(coredump_elf64_hook);
#endif
-#if !defined(_LP64) || defined(COMPAT_NETBSD32)
+#ifdef EXEC_ELF32
MODULE_HOOK_UNSET(coredump_elf32_hook);
#endif
MODULE_HOOK_UNSET(coredump_netbsd_hook);
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.392 src/sys/kern/kern_sig.c:1.393
--- src/sys/kern/kern_sig.c:1.392 Tue Oct 20 09:16:26 2020
+++ src/sys/kern/kern_sig.c Mon Oct 26 13:35:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.392 2020/10/20 13:16:26 christos Exp $ */
+/* $NetBSD: kern_sig.c,v 1.393 2020/10/26 17:35:39 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -70,8 +70,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.392 2020/10/20 13:16:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.393 2020/10/26 17:35:39 christos Exp $");
+#include "opt_execfmt.h"
#include "opt_ptrace.h"
#include "opt_dtrace.h"
#include "opt_compat_sunos.h"
@@ -2356,7 +2357,7 @@ coredump_netbsd(struct lwp *l, struct co
return retval;
}
-#if !defined(_LP64) || defined(COMPAT_NETBSD32)
+#ifdef EXEC_ELF32
int
coredump_elf32(struct lwp *l, struct coredump_iostate *iocookie)
{
@@ -2367,7 +2368,7 @@ coredump_elf32(struct lwp *l, struct cor
}
#endif
-#ifdef _LP64
+#ifdef EXEC_ELF64
int
coredump_elf64(struct lwp *l, struct coredump_iostate *iocookie)
{
