_NLIST_DO_ELF is no longer needed: it's the only option

ok deraadt@

14 files changed, 15 insertions, 40 deletions

diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h
index cb2750bfd83..bce4e79c9e5 100644
--- a/sys/arch/alpha/include/exec.h
+++ b/sys/arch/alpha/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.15 2015/05/29 19:12:26 miod Exp $	*/
+/*	$OpenBSD: exec.h,v 1.16 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #define ELF_TARG_DATA		ELFDATA2LSB
 #define ELF_TARG_MACH		EM_ALPHA_EXP
 
-#define _NLIST_DO_ELF
 #define _KERN_DO_ELF64
 
 /* Processor specific dynamic tag values.  */
diff --git a/sys/arch/amd64/include/exec.h b/sys/arch/amd64/include/exec.h
index 6d16439cbbd..6f1164535eb 100644
--- a/sys/arch/amd64/include/exec.h
+++ b/sys/arch/amd64/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.4 2012/09/11 15:44:17 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.6 2015/08/29 01:58:39 guenther Exp $	*/
 /*
  * Written by Artur Grabowski <art@openbsd.org> Public Domain
  */
@@ -14,7 +14,6 @@
 #define ELF_TARG_DATA		ELFDATA2LSB
 #define ELF_TARG_MACH		EM_AMD64
 
-#define _NLIST_DO_ELF
 #define _KERN_DO_ELF64
 
 #endif
diff --git a/sys/arch/arm/include/exec.h b/sys/arch/arm/include/exec.h
index 2f5545300f5..54cf7882650 100644
--- a/sys/arch/arm/include/exec.h
+++ b/sys/arch/arm/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.3 2012/09/11 15:44:17 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.4 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
 
 /*
@@ -39,8 +39,6 @@
 #define ELF_TARG_DATA		ELFDATA2LSB
 #define ELF_TARG_MACH		EM_ARM 
 
-#define _NLIST_DO_ELF
-
 #define _KERN_DO_ELF
 
 #endif  /* _ARM_EXEC_H_ */
diff --git a/sys/arch/hppa/include/exec.h b/sys/arch/hppa/include/exec.h
index 279b1c1c447..ca2999b2bd4 100644
--- a/sys/arch/hppa/include/exec.h
+++ b/sys/arch/hppa/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.12 2013/02/09 19:20:39 miod Exp $	*/
+/*	$OpenBSD: exec.h,v 1.13 2015/08/29 01:58:39 guenther Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -35,7 +35,6 @@
 #define ELF_TARG_DATA           ELFDATA2MSB
 #define ELF_TARG_MACH           EM_PARISC   
 
-#define _NLIST_DO_ELF
 #define	_KERN_DO_ELF
 
 /*
diff --git a/sys/arch/hppa64/include/exec.h b/sys/arch/hppa64/include/exec.h
index 0daa428782f..b5a30075aa4 100644
--- a/sys/arch/hppa64/include/exec.h
+++ b/sys/arch/hppa64/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.5 2013/02/09 19:20:39 miod Exp $	*/
+/*	$OpenBSD: exec.h,v 1.6 2015/08/29 01:58:39 guenther Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -35,7 +35,6 @@
 #define ELF_TARG_DATA           ELFDATA2MSB
 #define ELF_TARG_MACH           EM_PARISC   
 
-#define _NLIST_DO_ELF
 #define	_KERN_DO_ELF64
 
 /*
diff --git a/sys/arch/i386/include/exec.h b/sys/arch/i386/include/exec.h
index 07fdb961476..47b9e589446 100644
--- a/sys/arch/i386/include/exec.h
+++ b/sys/arch/i386/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.12 2013/10/17 08:02:16 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.13 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #define ELF_TARG_MACH		EM_386 /* XXX - EM_486 is currently unused
                                           by all OSs/compilers/linkers */
 
-#define _NLIST_DO_ELF
 #define _KERN_DO_ELF
 
 #endif  /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/m88k/include/exec.h b/sys/arch/m88k/include/exec.h
index ad5b58e8ec5..94da6aa03ae 100644
--- a/sys/arch/m88k/include/exec.h
+++ b/sys/arch/m88k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.5 2013/10/17 08:02:16 deraadt Exp $ */
+/*	$OpenBSD: exec.h,v 1.6 2015/08/29 01:58:39 guenther Exp $ */
 #ifndef _M88K_EXEC_H_
 #define _M88K_EXEC_H_
 
@@ -10,7 +10,6 @@
 #define ELF_TARG_DATA		ELFDATA2MSB
 #define ELF_TARG_MACH		EM_88K
 
-#define _NLIST_DO_ELF
 #define _KERN_DO_ELF
 
 /* Processor specific dynamic tag values.  */
diff --git a/sys/arch/mips64/include/exec.h b/sys/arch/mips64/include/exec.h
index 108df1b7aa0..8afad2b9f99 100644
--- a/sys/arch/mips64/include/exec.h
+++ b/sys/arch/mips64/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.6 2013/02/09 19:25:13 miod Exp $	*/
+/*	$OpenBSD: exec.h,v 1.7 2015/08/29 01:58:39 guenther Exp $	*/
 
 /*
  * Copyright (c) 1996-2004 Per Fogelstrom, Opsycon AB
@@ -41,8 +41,6 @@
 #endif
 #define ELF_TARG_MACH		EM_MIPS
 
-#define _NLIST_DO_ELF
-
 #define _KERN_DO_ELF64
 
 /* Information taken from MIPS ABI supplement */
diff --git a/sys/arch/powerpc/include/exec.h b/sys/arch/powerpc/include/exec.h
index d79e18f7313..3ff1c88857e 100644
--- a/sys/arch/powerpc/include/exec.h
+++ b/sys/arch/powerpc/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.13 2015/08/23 15:28:41 kettenis Exp $ */
+/*	$OpenBSD: exec.h,v 1.14 2015/08/29 01:58:39 guenther Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB.
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.h,v 1.13 2015/08/23 15:28:41 kettenis Exp $
+ *	$Id: exec.h,v 1.14 2015/08/29 01:58:39 guenther Exp $
  */
 
 #ifndef _POWERPC_EXEC_H_
@@ -38,8 +38,6 @@
 #define ELF_TARG_DATA           ELFDATA2MSB
 #define ELF_TARG_MACH           EM_PPC
 
-#define _NLIST_DO_ELF
-
 #define _KERN_DO_ELF
 
 /* Processor sepcific dynamic tag values.  */
diff --git a/sys/arch/sh/include/exec.h b/sys/arch/sh/include/exec.h
index f4bc66f3923..a189a8f8aef 100644
--- a/sys/arch/sh/include/exec.h
+++ b/sys/arch/sh/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.3 2012/09/11 15:44:18 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.4 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: elf_machdep.h,v 1.8 2002/04/28 17:10:34 uch Exp $	*/
 
 #define __LDPGSZ	4096
@@ -13,7 +13,6 @@
 #define	ELF_TARG_MACH		EM_SH
 
 #define	_KERN_DO_ELF
-#define	_NLIST_DO_ELF
 
 /*
  * SuperH ELF header flags.
diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h
index 6aa92960940..32502012fc6 100644
--- a/sys/arch/sparc/include/exec.h
+++ b/sys/arch/sparc/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.17 2013/10/17 08:02:17 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.18 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */
 
 /*
@@ -94,7 +94,6 @@
 #define	ELF_TARG_DATA	ELFDATA2MSB
 #define	ELF_TARG_MACH	EM_SPARC
 
-#define	_NLIST_DO_ELF
 #define _KERN_DO_ELF
 
 #endif  /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/sparc64/include/exec.h b/sys/arch/sparc64/include/exec.h
index 2c87a2a23b7..23b49c5777c 100644
--- a/sys/arch/sparc64/include/exec.h
+++ b/sys/arch/sparc64/include/exec.h
@@ -1,8 +1,7 @@
-/*	$OpenBSD: exec.h,v 1.9 2013/06/02 16:40:20 guenther Exp $	*/
+/*	$OpenBSD: exec.h,v 1.10 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: elf_machdep.h,v 1.7 2001/02/11 00:18:49 eeh Exp $	*/
 
 #define _KERN_DO_ELF64
-#define _NLIST_DO_ELF
 
 #define ARCH_ELFSIZE		64	/* MD native binary size */
 #define ELF_TARG_CLASS		ELFCLASS64
diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h
index f5e3a1068b4..1accbebd005 100644
--- a/sys/arch/vax/include/exec.h
+++ b/sys/arch/vax/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.11 2014/03/18 19:23:42 guenther Exp $	*/
+/*	$OpenBSD: exec.h,v 1.12 2015/08/29 01:58:39 guenther Exp $	*/
 /*	$NetBSD: exec.h,v 1.4 1995/09/23 14:57:40 ragge Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
 
 #define __LDPGSZ	4096
 
-#define _NLIST_DO_ELF
 #define _KERN_DO_ELF
 
 #define ARCH_ELFSIZE		32
diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c
index 365664e550e..ee519f1a00a 100644
--- a/sys/dev/ksyms.c
+++ b/sys/dev/ksyms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ksyms.c,v 1.29 2015/08/12 06:19:25 mlarkin Exp $	*/
+/*	$OpenBSD: ksyms.c,v 1.30 2015/08/29 01:58:39 guenther Exp $	*/
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
@@ -32,10 +32,7 @@
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
-
-#ifdef _NLIST_DO_ELF
 #include <sys/exec_elf.h>
-#endif
 
 extern char *esym;				/* end of symbol table */
 #if defined(__sparc64__) || defined(__mips__) || defined(__amd64__) || \
@@ -56,7 +53,6 @@ void	ksymsattach(int);
  * We assume __LDPGSZ is a multiple of PAGE_SIZE (it is)
  */
 
-/*ARGSUSED*/
 void
 ksymsattach(int num)
 {
@@ -74,7 +70,6 @@ ksymsattach(int num)
 	}
 #endif
 
-#ifdef _NLIST_DO_ELF
 	do {
 #if defined(__sparc64__) || defined(__mips__) || defined(__amd64__) || \
     defined(__i386__)
@@ -114,10 +109,8 @@ ksymsattach(int num)
 
 		return;
 	} while (0);
-#endif
 }
 
-/*ARGSUSED*/
 int
 ksymsopen(dev_t dev, int flag, int mode, struct proc *p)
 {
@@ -137,7 +130,6 @@ ksymsopen(dev_t dev, int flag, int mode, struct proc *p)
 	return (0);
 }
 
-/*ARGSUSED*/
 int
 ksymsclose(dev_t dev, int flag, int mode, struct proc *p)
 {
@@ -145,7 +137,6 @@ ksymsclose(dev_t dev, int flag, int mode, struct proc *p)
 	return (0);
 }
 
-/*ARGSUSED*/
 int
 ksymsread(dev_t dev, struct uio *uio, int flags)
 {