Use <elf.h> instead of <elf_abi.h>

ok jasper@, jca@, deraadt@

20 files changed, 40 insertions, 40 deletions

diff --git a/games/hangman/ksyms.c b/games/hangman/ksyms.c
index 18ce231fd22..bb6866ffb55 100644
--- a/games/hangman/ksyms.c
+++ b/games/hangman/ksyms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ksyms.c,v 1.10 2016/01/08 13:40:05 tb Exp $	*/
+/*	$OpenBSD: ksyms.c,v 1.11 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -18,7 +18,7 @@
 
 #include <ctype.h>
 #include <curses.h>
-#include <elf_abi.h>
+#include <elf.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index f4dae6eb32c..78db9926728 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.68 2016/12/25 20:30:41 krw Exp $ */
+/*	$OpenBSD: nlist.c,v 1.69 2017/10/27 16:47:08 mpi Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <a.out.h>		/* pulls in nlist.h */
-#include <elf_abi.h>
+#include <elf.h>
 
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 
diff --git a/libexec/ld.so/aarch64/archdep.h b/libexec/ld.so/aarch64/archdep.h
index 8610a62571d..0bf77612dd4 100644
--- a/libexec/ld.so/aarch64/archdep.h
+++ b/libexec/ld.so/aarch64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.4 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.5 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_AARCH64	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h
index 36720e0d4d6..d6ba7224980 100644
--- a/libexec/ld.so/alpha/archdep.h
+++ b/libexec/ld.so/alpha/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.20 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.21 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_ALPHA_EXP	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/amd64/archdep.h b/libexec/ld.so/amd64/archdep.h
index 0b1f8e3fd05..97e13fea065 100644
--- a/libexec/ld.so/amd64/archdep.h
+++ b/libexec/ld.so/amd64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.11 2017/01/21 01:15:00 guenther Exp $	*/
+/*	$OpenBSD: archdep.h,v 1.12 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_AMD64	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/arm/archdep.h b/libexec/ld.so/arm/archdep.h
index 7ccdd1dc068..6a87c902cfd 100644
--- a/libexec/ld.so/arm/archdep.h
+++ b/libexec/ld.so/arm/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.12 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.13 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_ARM	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/hppa/archdep.h b/libexec/ld.so/hppa/archdep.h
index ad2cd198d55..f6dc5df3117 100644
--- a/libexec/ld.so/hppa/archdep.h
+++ b/libexec/ld.so/hppa/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.15 2017/01/24 07:48:37 guenther Exp $	*/
+/*	$OpenBSD: archdep.h,v 1.16 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -35,7 +35,7 @@
 
 #define	MACHID	EM_PARISC		/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/i386/archdep.h b/libexec/ld.so/i386/archdep.h
index 6ca4e73c3d2..0d1892eccfa 100644
--- a/libexec/ld.so/i386/archdep.h
+++ b/libexec/ld.so/i386/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.19 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.20 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_386		/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/ldd/ldd.c b/libexec/ld.so/ldd/ldd.c
index 5ebbe62cce3..a7a874e07cf 100644
--- a/libexec/ld.so/ldd/ldd.c
+++ b/libexec/ld.so/ldd/ldd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldd.c,v 1.21 2017/07/02 19:06:12 tobias Exp $	*/
+/*	$OpenBSD: ldd.c,v 1.22 2017/10/27 16:47:08 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
  * All rights reserved.
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <elf_abi.h>
+#include <elf.h>
 #include <err.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/libexec/ld.so/m88k/archdep.h b/libexec/ld.so/m88k/archdep.h
index af22305dae2..b15cb7dd096 100644
--- a/libexec/ld.so/m88k/archdep.h
+++ b/libexec/ld.so/m88k/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.5 2017/01/24 07:48:37 guenther Exp $	*/
+/*	$OpenBSD: archdep.h,v 1.6 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID			EM_88K	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/mips64/archdep.h b/libexec/ld.so/mips64/archdep.h
index 49a9430cb81..47dcbe13efc 100644
--- a/libexec/ld.so/mips64/archdep.h
+++ b/libexec/ld.so/mips64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.13 2017/08/13 14:57:19 visa Exp $ */
+/*	$OpenBSD: archdep.h,v 1.14 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998-2002 Opsycon AB, Sweden.
@@ -29,7 +29,7 @@
 #ifndef _MIPS_ARCHDEP_H_
 #define _MIPS_ARCHDEP_H_
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/powerpc/archdep.h b/libexec/ld.so/powerpc/archdep.h
index a75f5be3e44..75678ef2c1a 100644
--- a/libexec/ld.so/powerpc/archdep.h
+++ b/libexec/ld.so/powerpc/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.21 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.22 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_PPC	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/sh/archdep.h b/libexec/ld.so/sh/archdep.h
index 79a7c600895..c4edb23fb7a 100644
--- a/libexec/ld.so/sh/archdep.h
+++ b/libexec/ld.so/sh/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.10 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.11 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_SH	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h
index 15ea156ab65..e4c6309f69a 100644
--- a/libexec/ld.so/sparc64/archdep.h
+++ b/libexec/ld.so/sparc64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.25 2017/01/24 07:48:37 guenther Exp $ */
+/*	$OpenBSD: archdep.h,v 1.26 2017/10/27 16:47:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -33,7 +33,7 @@
 
 #define	MACHID	EM_SPARCV9	/* ELF e_machine ID value checked */
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <machine/reloc.h>
 #include "syscall.h"
 #include "util.h"
diff --git a/usr.bin/nm/elf.c b/usr.bin/nm/elf.c
index 2c7676b1b13..5f2d14b27f3 100644
--- a/usr.bin/nm/elf.c
+++ b/usr.bin/nm/elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elf.c,v 1.34 2015/12/09 19:28:34 mmcc Exp $	*/
+/*	$OpenBSD: elf.c,v 1.35 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -29,7 +29,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include <a.out.h>
-#include <elf_abi.h>
+#include <elf.h>
 #include <errno.h>
 #include <err.h>
 #include <stdint.h>
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index f9ad9399b86..86bf940ab8e 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nm.c,v 1.52 2017/09/12 08:32:44 mpi Exp $	*/
+/*	$OpenBSD: nm.c,v 1.53 2017/10/27 16:47:08 mpi Exp $	*/
 /*	$NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <a.out.h>
-#include <elf_abi.h>
+#include <elf.h>
 #include <ar.h>
 #include <ranlib.h>
 #include <unistd.h>
diff --git a/usr.bin/rdist/isexec.c b/usr.bin/rdist/isexec.c
index e6d125a61f2..098b64e0659 100644
--- a/usr.bin/rdist/isexec.c
+++ b/usr.bin/rdist/isexec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isexec.c,v 1.10 2015/01/20 09:00:16 guenther Exp $	*/
+/*	$OpenBSD: isexec.c,v 1.11 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/types.h>
-#include <elf_abi.h>
+#include <elf.h>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/usr.sbin/installboot/i386_installboot.c b/usr.sbin/installboot/i386_installboot.c
index 10acf8bef32..2f55a410001 100644
--- a/usr.sbin/installboot/i386_installboot.c
+++ b/usr.sbin/installboot/i386_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_installboot.c,v 1.30 2017/06/04 13:57:29 naddy Exp $	*/
+/*	$OpenBSD: i386_installboot.c,v 1.31 2017/10/27 16:47:08 mpi Exp $	*/
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -54,7 +54,7 @@
 #include <machine/cpu.h>
 #include <machine/biosvar.h>
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/installboot/i386_nlist.c b/usr.sbin/installboot/i386_nlist.c
index f508d74d94e..d4daf443204 100644
--- a/usr.sbin/installboot/i386_nlist.c
+++ b/usr.sbin/installboot/i386_nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_nlist.c,v 1.5 2015/10/19 19:22:32 krw Exp $	*/
+/*	$OpenBSD: i386_nlist.c,v 1.6 2017/10/27 16:47:08 mpi Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include <elf_abi.h>
+#include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <nlist.h>
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index 18f895a97b0..4c59441cf63 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.50 2016/09/10 05:48:18 jsg Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.51 2017/10/27 16:47:08 mpi Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #include <sys/file.h>
 #include <sys/sysctl.h>
 
-#include <elf_abi.h>
+#include <elf.h>
 
 typedef struct nlist NLIST;
 #define	_strx	n_un.n_strx