I'd like to get rid of <elf_abi.h> which is not portable at all. <elf.h> is at least present on Solaris, FreeBSD and OSX.
ok? Index: games/hangman/ksyms.c =================================================================== RCS file: /cvs/src/games/hangman/ksyms.c,v retrieving revision 1.10 diff -u -p -r1.10 ksyms.c --- games/hangman/ksyms.c 8 Jan 2016 13:40:05 -0000 1.10 +++ games/hangman/ksyms.c 27 Oct 2017 08:49:41 -0000 @@ -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> Index: lib/libc/gen/nlist.c =================================================================== RCS file: /cvs/src/lib/libc/gen/nlist.c,v retrieving revision 1.68 diff -u -p -r1.68 nlist.c --- lib/libc/gen/nlist.c 25 Dec 2016 20:30:41 -0000 1.68 +++ lib/libc/gen/nlist.c 27 Oct 2017 08:49:41 -0000 @@ -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)) Index: libexec/ld.so/alpha/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/alpha/archdep.h,v retrieving revision 1.20 diff -u -p -r1.20 archdep.h --- libexec/ld.so/alpha/archdep.h 24 Jan 2017 07:48:37 -0000 1.20 +++ libexec/ld.so/alpha/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/amd64/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/amd64/archdep.h,v retrieving revision 1.11 diff -u -p -r1.11 archdep.h --- libexec/ld.so/amd64/archdep.h 21 Jan 2017 01:15:00 -0000 1.11 +++ libexec/ld.so/amd64/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/arm/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/arm/archdep.h,v retrieving revision 1.12 diff -u -p -r1.12 archdep.h --- libexec/ld.so/arm/archdep.h 24 Jan 2017 07:48:37 -0000 1.12 +++ libexec/ld.so/arm/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/hppa/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/hppa/archdep.h,v retrieving revision 1.15 diff -u -p -r1.15 archdep.h --- libexec/ld.so/hppa/archdep.h 24 Jan 2017 07:48:37 -0000 1.15 +++ libexec/ld.so/hppa/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/i386/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/i386/archdep.h,v retrieving revision 1.19 diff -u -p -r1.19 archdep.h --- libexec/ld.so/i386/archdep.h 24 Jan 2017 07:48:37 -0000 1.19 +++ libexec/ld.so/i386/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/ldd/ldd.c =================================================================== RCS file: /cvs/src/libexec/ld.so/ldd/ldd.c,v retrieving revision 1.21 diff -u -p -r1.21 ldd.c --- libexec/ld.so/ldd/ldd.c 2 Jul 2017 19:06:12 -0000 1.21 +++ libexec/ld.so/ldd/ldd.c 27 Oct 2017 08:49:41 -0000 @@ -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> Index: libexec/ld.so/m88k/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/m88k/archdep.h,v retrieving revision 1.5 diff -u -p -r1.5 archdep.h --- libexec/ld.so/m88k/archdep.h 24 Jan 2017 07:48:37 -0000 1.5 +++ libexec/ld.so/m88k/archdep.h 27 Oct 2017 08:49:41 -0000 @@ -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" Index: libexec/ld.so/mips64/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/mips64/archdep.h,v retrieving revision 1.13 diff -u -p -r1.13 archdep.h --- libexec/ld.so/mips64/archdep.h 13 Aug 2017 14:57:19 -0000 1.13 +++ libexec/ld.so/mips64/archdep.h 27 Oct 2017 08:49:42 -0000 @@ -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" Index: libexec/ld.so/powerpc/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/powerpc/archdep.h,v retrieving revision 1.21 diff -u -p -r1.21 archdep.h --- libexec/ld.so/powerpc/archdep.h 24 Jan 2017 07:48:37 -0000 1.21 +++ libexec/ld.so/powerpc/archdep.h 27 Oct 2017 08:49:42 -0000 @@ -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" Index: libexec/ld.so/sh/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/sh/archdep.h,v retrieving revision 1.10 diff -u -p -r1.10 archdep.h --- libexec/ld.so/sh/archdep.h 24 Jan 2017 07:48:37 -0000 1.10 +++ libexec/ld.so/sh/archdep.h 27 Oct 2017 08:49:42 -0000 @@ -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" Index: libexec/ld.so/aarch64/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/aarch64/archdep.h,v retrieving revision 1.4 diff -u -p -r1.4 archdep.h --- libexec/ld.so/aarch64/archdep.h 24 Jan 2017 07:48:37 -0000 1.4 +++ libexec/ld.so/aarch64/archdep.h 27 Oct 2017 08:49:42 -0000 @@ -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" Index: libexec/ld.so/sparc64/archdep.h =================================================================== RCS file: /cvs/src/libexec/ld.so/sparc64/archdep.h,v retrieving revision 1.25 diff -u -p -r1.25 archdep.h --- libexec/ld.so/sparc64/archdep.h 24 Jan 2017 07:48:37 -0000 1.25 +++ libexec/ld.so/sparc64/archdep.h 27 Oct 2017 08:49:42 -0000 @@ -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" Index: usr.bin/nm/nm.c =================================================================== RCS file: /cvs/src/usr.bin/nm/nm.c,v retrieving revision 1.52 diff -u -p -r1.52 nm.c --- usr.bin/nm/nm.c 12 Sep 2017 08:32:44 -0000 1.52 +++ usr.bin/nm/nm.c 27 Oct 2017 08:49:42 -0000 @@ -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> Index: usr.bin/nm/elf.c =================================================================== RCS file: /cvs/src/usr.bin/nm/elf.c,v retrieving revision 1.34 diff -u -p -r1.34 elf.c --- usr.bin/nm/elf.c 9 Dec 2015 19:28:34 -0000 1.34 +++ usr.bin/nm/elf.c 27 Oct 2017 08:49:43 -0000 @@ -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> Index: usr.bin/rdist/isexec.c =================================================================== RCS file: /cvs/src/usr.bin/rdist/isexec.c,v retrieving revision 1.10 diff -u -p -r1.10 isexec.c --- usr.bin/rdist/isexec.c 20 Jan 2015 09:00:16 -0000 1.10 +++ usr.bin/rdist/isexec.c 27 Oct 2017 08:49:43 -0000 @@ -30,7 +30,7 @@ */ #include <sys/types.h> -#include <elf_abi.h> +#include <elf.h> #include <fcntl.h> #include <unistd.h> Index: usr.sbin/installboot/i386_installboot.c =================================================================== RCS file: /cvs/src/usr.sbin/installboot/i386_installboot.c,v retrieving revision 1.30 diff -u -p -r1.30 i386_installboot.c --- usr.sbin/installboot/i386_installboot.c 4 Jun 2017 13:57:29 -0000 1.30 +++ usr.sbin/installboot/i386_installboot.c 27 Oct 2017 08:49:43 -0000 @@ -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> Index: usr.sbin/installboot/i386_nlist.c =================================================================== RCS file: /cvs/src/usr.sbin/installboot/i386_nlist.c,v retrieving revision 1.5 diff -u -p -r1.5 i386_nlist.c --- usr.sbin/installboot/i386_nlist.c 19 Oct 2015 19:22:32 -0000 1.5 +++ usr.sbin/installboot/i386_nlist.c 27 Oct 2017 08:49:43 -0000 @@ -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> Index: usr.sbin/kvm_mkdb/nlist.c =================================================================== RCS file: /cvs/src/usr.sbin/kvm_mkdb/nlist.c,v retrieving revision 1.50 diff -u -p -r1.50 nlist.c --- usr.sbin/kvm_mkdb/nlist.c 10 Sep 2016 05:48:18 -0000 1.50 +++ usr.sbin/kvm_mkdb/nlist.c 27 Oct 2017 08:49:43 -0000 @@ -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
