summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2017-02-08 05:09:27 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2017-02-08 05:09:27 +0000
commitdce59fe6e1e128ed03c16e493686ecd655007b83 (patch)
tree1a0af8032f920fef5e6b02bd94aa273279586f40 /sys/conf
parenteebfc47f73667f8b137ff4b393a24084a2a944fc (diff)
In exec_elf.c: expand ELFNAME(), ELFNAME2(), and ELFNAMEEND() except
leaving out the size, so that ELFNAME2(exec,makecmds) becomes exec_elf_makecmds instead of exec_elf{32,64}_makecmds and then delete the ELFNAME2() and ELFNAMEEND() macros. Move the prototypes for functions local to exec_elf.c to there from exec_elf.h. Simplify the SMALL_KERNEL conditionals around the ELF coredump code. Change exec_conf.c to use the size-generic names and macros Remove exec_elf{32,64}.c and just build exec_elf.c; delete the _KERN_DO_ELF and _KERN_DO_ELF64 #defines. ok jca@, encouragement from deraadt@ and tom@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 923ce595ec5..988da36b099 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.638 2017/01/22 20:08:10 reyk Exp $
+# $OpenBSD: files,v 1.639 2017/02/08 05:09:25 guenther Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -644,8 +644,7 @@ file isofs/udf/udf_vfsops.c udf
file isofs/udf/udf_vnops.c udf
file kern/clock_subr.c
file kern/exec_conf.c
-file kern/exec_elf32.c
-file kern/exec_elf64.c
+file kern/exec_elf.c
file kern/exec_script.c
file kern/exec_subr.c
file kern/init_main.c