Fill out the ELF header files to make them more or less complete.

Fix a macro name that was misspelled both in brandelf.c and
imgact_elf.h.

8 files changed, 571 insertions, 165 deletions

diff --git a/include/Makefile b/include/Makefile
index d2cbdf1..1c12b11 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.54 1997/05/10 12:50:03 davidn Exp $
+#	$Id: Makefile,v 1.55 1997/05/12 09:50:19 peter Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -11,7 +11,7 @@ depend lint tags:
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= rpcsvc
 FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
-	err.h fnmatch.h fstab.h fts.h glob.h grp.h strhash.h histedit.h \
+	elf.h err.h fnmatch.h fstab.h fts.h glob.h grp.h strhash.h histedit.h \
 	kvm.h limits.h link.h locale.h malloc.h memory.h mpool.h \
 	ndbm.h netdb.h nl_types.h nlist.h paths.h pthread.h pthread_np.h pwd.h \
 	ranlib.h regex.h regexp.h resolv.h rune.h runetype.h setjmp.h sgtty.h \
diff --git a/include/elf-hints.h b/include/elf-hints.h
new file mode 100644
index 0000000..0e45bbf
--- /dev/null
+++ b/include/elf-hints.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 1997 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $Id$
+ */
+
+#ifndef	_ELF_H_
+#define	_ELF_H_
+
+#include <sys/types.h>
+#include <machine/elf.h>
+
+#endif /* !_ELF_H_ */
diff --git a/include/elf.h b/include/elf.h
new file mode 100644
index 0000000..0e45bbf
--- /dev/null
+++ b/include/elf.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 1997 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $Id$
+ */
+
+#ifndef	_ELF_H_
+#define	_ELF_H_
+
+#include <sys/types.h>
+#include <machine/elf.h>
+
+#endif /* !_ELF_H_ */
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
new file mode 100644
index 0000000..dd56d9f
--- /dev/null
+++ b/sys/amd64/include/elf.h
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 1996-1997 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $Id$
+ */
+
+#ifndef _MACHINE_ELF_H_
+#define _MACHINE_ELF_H_ 1
+
+/*
+ * ELF definitions for the i386 architecture.
+ */
+
+#include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
+
+/*
+ * Auxiliary vector entries for passing information to the interpreter.
+ *
+ * The i386 supplement to the SVR4 ABI specification names this "auxv_t",
+ * but POSIX lays claim to all symbols ending with "_t".
+ */
+
+typedef struct {	/* Auxiliary vector entry on initial stack */
+	int	a_type;			/* Entry type. */
+	union {
+		long	a_val;		/* Integer value. */
+		void	*a_ptr;		/* Address. */
+		void	(*a_fcn)(void);	/* Function pointer (not used). */
+	} a_un;
+} Elf32_Auxinfo;
+
+/* Values for a_type. */
+#define AT_NULL		0	/* Terminates the vector. */
+#define AT_IGNORE	1	/* Ignored entry. */
+#define AT_EXECFD	2	/* File descriptor of program to load. */
+#define AT_PHDR		3	/* Program header of program already loaded. */
+#define AT_PHENT	4	/* Size of each program header entry. */
+#define AT_PHNUM	5	/* Number of program header entries. */
+#define AT_PAGESZ	6	/* Page size in bytes. */
+#define AT_BASE		7	/* Interpreter's base address. */
+#define AT_FLAGS	8	/* Flags (unused for i386). */
+#define AT_ENTRY	9	/* Where interpreter should transfer control. */
+
+/*
+ * The following non-standard values are used for passing information
+ * from John Polstra's testbed program to the dynamic linker.  These
+ * are expected to go away soon.
+ *
+ * Unfortunately, these overlap the Linux non-standard values, so they
+ * must not be used in the same context.
+ */
+#define AT_BRK		10	/* Starting point for sbrk and brk. */
+#define AT_DEBUG	11	/* Debugging level. */
+
+/*
+ * The following non-standard values are used in Linux ELF binaries.
+ */
+#define AT_NOTELF	10	/* Program is not ELF ?? */
+#define AT_UID		11	/* Real uid. */
+#define AT_EUID		12	/* Effective uid. */
+#define AT_GID		13	/* Real gid. */
+#define AT_EGID		14	/* Effective gid. */
+
+#define AT_COUNT	15	/* Count of defined aux entry types. */
+
+/*
+ * Relocation types.
+ */
+
+#define R_386_NONE	0	/* No relocation. */
+#define R_386_32	1	/* Add symbol value. */
+#define R_386_PC32	2	/* Add PC-relative symbol value. */
+#define R_386_GOT32	3	/* Add PC-relative GOT offset. */
+#define R_386_PLT32	4	/* Add PC-relative PLT offset. */
+#define R_386_COPY	5	/* Copy data from shared object. */
+#define R_386_GLOB_DAT	6	/* Set GOT entry to data address. */
+#define R_386_JMP_SLOT	7	/* Set GOT entry to code address. */
+#define R_386_RELATIVE	8	/* Add load address of shared object. */
+#define R_386_GOTOFF	9	/* Add GOT-relative symbol address. */
+#define R_386_GOTPC	10	/* Add PC-relative GOT table address. */
+
+#define R_386_COUNT	11	/* Count of defined relocation types. */
+
+#endif /* !_MACHINE_ELF_H_ */
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
new file mode 100644
index 0000000..dd56d9f
--- /dev/null
+++ b/sys/i386/include/elf.h
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 1996-1997 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $Id$
+ */
+
+#ifndef _MACHINE_ELF_H_
+#define _MACHINE_ELF_H_ 1
+
+/*
+ * ELF definitions for the i386 architecture.
+ */
+
+#include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
+
+/*
+ * Auxiliary vector entries for passing information to the interpreter.
+ *
+ * The i386 supplement to the SVR4 ABI specification names this "auxv_t",
+ * but POSIX lays claim to all symbols ending with "_t".
+ */
+
+typedef struct {	/* Auxiliary vector entry on initial stack */
+	int	a_type;			/* Entry type. */
+	union {
+		long	a_val;		/* Integer value. */
+		void	*a_ptr;		/* Address. */
+		void	(*a_fcn)(void);	/* Function pointer (not used). */
+	} a_un;
+} Elf32_Auxinfo;
+
+/* Values for a_type. */
+#define AT_NULL		0	/* Terminates the vector. */
+#define AT_IGNORE	1	/* Ignored entry. */
+#define AT_EXECFD	2	/* File descriptor of program to load. */
+#define AT_PHDR		3	/* Program header of program already loaded. */
+#define AT_PHENT	4	/* Size of each program header entry. */
+#define AT_PHNUM	5	/* Number of program header entries. */
+#define AT_PAGESZ	6	/* Page size in bytes. */
+#define AT_BASE		7	/* Interpreter's base address. */
+#define AT_FLAGS	8	/* Flags (unused for i386). */
+#define AT_ENTRY	9	/* Where interpreter should transfer control. */
+
+/*
+ * The following non-standard values are used for passing information
+ * from John Polstra's testbed program to the dynamic linker.  These
+ * are expected to go away soon.
+ *
+ * Unfortunately, these overlap the Linux non-standard values, so they
+ * must not be used in the same context.
+ */
+#define AT_BRK		10	/* Starting point for sbrk and brk. */
+#define AT_DEBUG	11	/* Debugging level. */
+
+/*
+ * The following non-standard values are used in Linux ELF binaries.
+ */
+#define AT_NOTELF	10	/* Program is not ELF ?? */
+#define AT_UID		11	/* Real uid. */
+#define AT_EUID		12	/* Effective uid. */
+#define AT_GID		13	/* Real gid. */
+#define AT_EGID		14	/* Effective gid. */
+
+#define AT_COUNT	15	/* Count of defined aux entry types. */
+
+/*
+ * Relocation types.
+ */
+
+#define R_386_NONE	0	/* No relocation. */
+#define R_386_32	1	/* Add symbol value. */
+#define R_386_PC32	2	/* Add PC-relative symbol value. */
+#define R_386_GOT32	3	/* Add PC-relative GOT offset. */
+#define R_386_PLT32	4	/* Add PC-relative PLT offset. */
+#define R_386_COPY	5	/* Copy data from shared object. */
+#define R_386_GLOB_DAT	6	/* Set GOT entry to data address. */
+#define R_386_JMP_SLOT	7	/* Set GOT entry to code address. */
+#define R_386_RELATIVE	8	/* Add load address of shared object. */
+#define R_386_GOTOFF	9	/* Add GOT-relative symbol address. */
+#define R_386_GOTPC	10	/* Add PC-relative GOT table address. */
+
+#define R_386_COUNT	11	/* Count of defined relocation types. */
+
+#endif /* !_MACHINE_ELF_H_ */
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
new file mode 100644
index 0000000..7a6aed5
--- /dev/null
+++ b/sys/sys/elf32.h
@@ -0,0 +1,268 @@
+/*-
+ * Copyright (c) 1996-1997 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $Id$
+ */
+
+#ifndef _SYS_ELF32_H_
+#define _SYS_ELF32_H_ 1
+
+/*
+ * ELF definitions common to all 32-bit architectures.
+ */
+
+typedef u_int32_t	Elf32_Addr;
+typedef u_int16_t	Elf32_Half;
+typedef u_int32_t	Elf32_Off;
+typedef int32_t		Elf32_Sword;
+typedef u_int32_t	Elf32_Word;
+
+/*
+ * ELF header.
+ */
+
+#define EI_NIDENT	16		/* Size of e_ident array. */
+
+typedef struct {
+	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
+	Elf32_Half	e_type;		/* File type. */
+	Elf32_Half	e_machine;	/* Machine architecture. */
+	Elf32_Word	e_version;	/* ELF format version. */
+	Elf32_Addr	e_entry;	/* Entry point. */
+	Elf32_Off	e_phoff;	/* Program header file offset. */
+	Elf32_Off	e_shoff;	/* Section header file offset. */
+	Elf32_Word	e_flags;	/* Architecture-specific flags. */
+	Elf32_Half	e_ehsize;	/* Size of ELF header in bytes. */
+	Elf32_Half	e_phentsize;	/* Size of program header entry. */
+	Elf32_Half	e_phnum;	/* Number of program header entries. */
+	Elf32_Half	e_shentsize;	/* Size of section header entry. */
+	Elf32_Half	e_shnum;	/* Number of section header entries. */
+	Elf32_Half	e_shstrndx;	/* Section name strings section. */
+} Elf32_Ehdr;
+
+/* Indexes into the e_ident array. */
+#define EI_MAG0		0	/* Magic number, byte 0. */
+#define EI_MAG1		1	/* Magic number, byte 1. */
+#define EI_MAG2		2	/* Magic number, byte 2. */
+#define EI_MAG3		3	/* Magic number, byte 3. */
+#define EI_CLASS	4	/* Class of machine. */
+#define EI_DATA		5	/* Data format. */
+#define EI_VERSION	6	/* ELF format version. */
+#define EI_PAD		7	/* Start of padding (per SVR4 ABI). */
+#define EI_BRAND	8	/* Start of architecture identification. */
+
+/* Values for the magic number bytes. */
+#define ELFMAG0		0x7f
+#define ELFMAG1		'E'
+#define ELFMAG2		'L'
+#define ELFMAG3		'F'
+
+/* Values for e_ident[EI_VERSION] and e_version. */
+#define EV_NONE		0
+#define EV_CURRENT	1
+
+/* Values for e_ident[EI_CLASS]. */
+#define ELFCLASSNONE	0	/* Unknown class. */
+#define ELFCLASS32	1	/* 32-bit architecture. */
+#define ELFCLASS64	2	/* 64-bit architecture. */
+
+/* Values for e_ident[EI_DATA]. */
+#define ELFDATANONE	0	/* Unknown data format. */
+#define ELFDATA2LSB	1	/* 2's complement little-endian. */
+#define ELFDATA2MSB	2	/* 2's complement big-endian. */
+
+/* Values for e_type. */
+#define ET_NONE		0	/* Unknown type. */
+#define ET_REL		1	/* Relocatable. */
+#define ET_EXEC		2	/* Executable. */
+#define ET_DYN		3	/* Shared object. */
+#define ET_CORE		4	/* Core file. */
+
+/* Values for e_machine. */
+#define EM_NONE		0	/* Unknown machine. */
+#define EM_M32		1	/* AT&T WE32100. */
+#define EM_SPARC	2	/* Sun SPARC. */
+#define EM_386		3	/* Intel i386. */
+#define EM_68K		4	/* Motorola 68000. */
+#define EM_88K		5	/* Motorola 88000. */
+#define EM_486		6	/* Intel i486. */
+#define EM_860		7	/* Intel i860. */
+
+/*
+ * Section header.
+ */
+
+typedef struct {
+	Elf32_Word	sh_name;	/* Section name (index into the
+					   section header string table). */
+	Elf32_Word	sh_type;	/* Section type. */
+	Elf32_Word	sh_flags;	/* Section flags. */
+	Elf32_Addr	sh_addr;	/* Address in memory image. */
+	Elf32_Off	sh_offset;	/* Offset in file. */
+	Elf32_Word	sh_size;	/* Size in bytes. */
+	Elf32_Word	sh_link;	/* Index of a related section. */
+	Elf32_Word	sh_info;	/* Depends on section type. */
+	Elf32_Word	sh_addralign;	/* Alignment in bytes. */
+	Elf32_Word	sh_entsize;	/* Size of each entry in section. */
+} Elf32_Shdr;
+
+/* Special section indexes. */
+#define SHN_UNDEF	     0		/* Undefined, missing, irrelevant. */
+#define SHN_LORESERVE	0xff00		/* First of reserved range. */
+#define SHN_LOPROC	0xff00		/* First processor-specific. */
+#define SHN_HIPROC	0xff1f		/* Last processor-specific. */
+#define SHN_ABS		0xfff1		/* Absolute values. */
+#define SHN_COMMON	0xfff2		/* Common data. */
+#define SHN_HIRESERVE	0xffff		/* Last of reserved range. */
+
+/*
+ * Program header.
+ */
+
+typedef struct {
+	Elf32_Word	p_type;		/* Entry type. */
+	Elf32_Off	p_offset;	/* File offset of contents. */
+	Elf32_Addr	p_vaddr;	/* Virtual address in memory image. */
+	Elf32_Addr	p_paddr;	/* Physical address (not used). */
+	Elf32_Word	p_filesz;	/* Size of contents in file. */
+	Elf32_Word	p_memsz;	/* Size of contents in memory. */
+	Elf32_Word	p_flags;	/* Access permission flags. */
+	Elf32_Word	p_align;	/* Alignment in memory and file. */
+} Elf32_Phdr;
+
+/* Values for p_type. */
+#define PT_NULL		0	/* Unused entry. */
+#define PT_LOAD		1	/* Loadable segment. */
+#define PT_DYNAMIC	2	/* Dynamic linking information segment. */
+#define PT_INTERP	3	/* Pathname of interpreter. */
+#define PT_NOTE		4	/* Auxiliary information. */
+#define PT_SHLIB	5	/* Reserved (not used). */
+#define PT_PHDR		6	/* Location of program header itself. */
+
+#define PT_COUNT	7	/* Number of defined p_type values. */
+
+/* Values for p_flags. */
+#define PF_X		0x1	/* Executable. */
+#define PF_W		0x2	/* Writable. */
+#define PF_R		0x4	/* Readable. */
+
+/*
+ * Dynamic structure.  The ".dynamic" section contains an array of them.
+ */
+
+typedef struct {
+	Elf32_Sword	d_tag;		/* Entry type. */
+	union {
+		Elf32_Word	d_val;	/* Integer value. */
+		Elf32_Addr	d_ptr;	/* Address value. */
+	} d_un;
+} Elf32_Dyn;
+
+/* Values for d_tag. */
+#define DT_NULL		0	/* Terminating entry. */
+#define DT_NEEDED	1	/* String table offset of a needed shared
+				   library. */
+#define DT_PLTRELSZ	2	/* Total size in bytes of PLT relocations. */
+#define DT_PLTGOT	3	/* Processor-dependent address. */
+#define DT_HASH		4	/* Address of symbol hash table. */
+#define DT_STRTAB	5	/* Address of string table. */
+#define DT_SYMTAB	6	/* Address of symbol table. */
+#define DT_RELA		7	/* Address of Elf32_Rela relocations. */
+#define DT_RELASZ	8	/* Total size of Elf32_Rela relocations. */
+#define DT_RELAENT	9	/* Size of each Elf32_Rela relocation entry. */
+#define DT_STRSZ	10	/* Size of string table. */
+#define DT_SYMENT	11	/* Size of each symbol table entry. */
+#define DT_INIT		12	/* Address of initialization function. */
+#define DT_FINI		13	/* Address of finalization function. */
+#define DT_SONAME	14	/* String table offset of shared object
+				   name. */
+#define DT_RPATH	15	/* String table offset of library path. */
+#define DT_SYMBOLIC	16	/* Indicates "symbolic" linking. */
+#define DT_REL		17	/* Address of Elf32_Rel relocations. */
+#define DT_RELSZ	18	/* Total size of Elf32_Rel relocations. */
+#define DT_RELENT	19	/* Size of each Elf32_Rel relocation. */
+#define DT_PLTREL	20	/* Type of relocation used for PLT. */
+#define DT_DEBUG	21	/* Reserved (not used). */
+#define DT_TEXTREL	22	/* Indicates there may be relocations in
+				   non-writable segments. */
+#define DT_JMPREL	23	/* Address of PLT relocations. */
+
+#define DT_COUNT	24	/* Number of defined d_tag values. */
+
+/*
+ * Relocation entries.
+ */
+
+/* Relocations that don't need an addend field. */
+typedef struct {
+	Elf32_Addr	r_offset;	/* Location to be relocated. */
+	Elf32_Word	r_info;		/* Relocation type and symbol index. */
+} Elf32_Rel;
+
+/* Relocations that need an addend field. */
+typedef struct {
+	Elf32_Addr	r_offset;	/* Location to be relocated. */
+	Elf32_Word	r_info;		/* Relocation type and symbol index. */
+	Elf32_Sword	r_addend;	/* Addend. */
+} Elf32_Rela;
+
+/* Macros for accessing the fields of r_info. */
+#define ELF32_R_SYM(info)	((info) >> 8)
+#define ELF32_R_TYPE(info)	((unsigned char)(info))
+
+/* Macro for constructing r_info from field values. */
+#define ELF32_R_INFO(sym, type)	(((sym) << 8) + (unsigned char)(type))
+
+/*
+ * Symbol table entries.
+ */
+
+typedef struct {
+	Elf32_Word	st_name;	/* String table index of name. */
+	Elf32_Addr	st_value;	/* Symbol value. */
+	Elf32_Word	st_size;	/* Size of associated object. */
+	unsigned char	st_info;	/* Type and binding information. */
+	unsigned char	st_other;	/* Reserved (not used). */
+	Elf32_Half	st_shndx;	/* Section index of symbol. */
+} Elf32_Sym;
+
+/* Macros for accessing the fields of st_info. */
+#define ELF32_ST_BIND(info)		((info) >> 4)
+#define ELF32_ST_TYPE(info)		((info) & 0xf)
+
+/* Macro for constructing st_info from field values. */
+#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
+
+/* Symbol types. */
+#define STT_NOTYPE	0	/* Unspecified type. */
+#define STT_OBJECT	1	/* Data object. */
+#define STT_FUNC	2	/* Function. */
+#define STT_SECTION	3	/* Section. */
+#define STT_FILE	4	/* Source file. */
+
+/* Special symbol table indexes. */
+#define STN_UNDEF	0	/* Undefined symbol index. */
+
+#endif /* !_SYS_ELF32_H_ */
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index acc0387..0224bbc 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,166 +25,20 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: imgact_elf.h,v 1.4 1997/02/22 09:45:19 peter Exp $
  */
 
-#ifndef _IMGACT_ELF_H_
-#define _IMGACT_ELF_H_
+#ifndef _SYS_IMGACT_ELF_H_
+#define _SYS_IMGACT_ELF_H_
 
-typedef u_int32_t Elf32_Addr;
-typedef u_int32_t Elf32_Off;
-typedef int32_t   Elf32_Sword;
-typedef u_int32_t Elf32_Word;
-typedef u_int16_t Elf32_Half;
- 
-extern int elf_trace;
-
-#define EI_NINDENT	16
-typedef struct {
-        unsigned char   e_ident[EI_NINDENT];    /* file id */
-        Elf32_Half      e_type;                 /* type */
-        Elf32_Half      e_machine;              /* machine type */
-        Elf32_Word      e_version;              /* version number */
-        Elf32_Addr      e_entry;                /* entry point */
-        Elf32_Off       e_phoff;                /* program hdr offset */
-        Elf32_Off       e_shoff;                /* section hdr offset */
-        Elf32_Word      e_flags;                /* flags */
-        Elf32_Half      e_ehsize;               /* sizeof ehdr */
-        Elf32_Half      e_phentsize;            /* program header entry size */
-        Elf32_Half      e_phnum;                /* number of program headers */
-        Elf32_Half      e_shentsize;            /* section header entry size */
-        Elf32_Half      e_shnum;                /* number of section headers */
-        Elf32_Half      e_shstrndx;             /* string table index */
-} Elf32_Ehdr;
-
-/*
- * Values for e_indent entry in struct Elf32_Ehdr.
- */
-#define EI_MAG0		0
-#define EI_MAG1		1
-#define EI_MAG2		2
-#define EI_MAG3		3
-#define EI_CLASS	4
-#define EI_DATA		5
-#define EI_VERSION	6
-#define EI_SPARE	8
-#define EI_BRAND	8
-
-
-#define ELFMAG0		'\177'
-#define ELFMAG1		'E'
-#define ELFMAG2		'L'
-#define ELFMAG3		'F'
-#define ELFCLASSNONE	0	/* invalid class */
-#define ELFCLASS32	1	/* 32bit object class */
-#define ELFCLASS64	2	/* 64bit object class */
-#define ELFDATANONE	0	/* invalid data encoding */
-#define ELFDATA2LSB	1	/* little endian */
-#define ELFDATA2MSB	2	/* big endian */
-
-/*
- * Values for e_version entry in struct Elf32_Ehdr.
- */
-#define EV_NONE		0	/* invalid version */
-#define EV_CURRENT	1	/* current version */
-
-/*
- * Values for e_type entry in struct Elf32_Ehdr.
- */
-#define ET_NONE   	0
-#define ET_REL    	1
-#define ET_EXEC   	2
-#define ET_DYN    	3
-#define ET_CORE   	4
-#define ET_LOPROC 	5
-#define ET_HIPROC 	6
-
-/*
- * Values for e_machine entry in struct Elf32_Ehdr.
- */
-#define EM_NONE  	0
-#define EM_M32   	1
-#define EM_SPARC 	2
-#define EM_386   	3
-#define EM_68K   	4
-#define EM_88K   	5
-#define EM_486   	6
-#define EM_860   	7
-
-
-typedef struct {
-        Elf32_Word      p_type;         /* entry type */
-        Elf32_Off       p_offset;       /* offset */
-        Elf32_Addr      p_vaddr;        /* virtual address */
-        Elf32_Addr      p_paddr;        /* physical address */
-        Elf32_Word      p_filesz;       /* file size */
-        Elf32_Word      p_memsz;        /* memory size */
-        Elf32_Word      p_flags;        /* flags */
-        Elf32_Word      p_align;        /* memory & file alignment */
-} Elf32_Phdr;
+#include <machine/elf.h>
 
-/*
- * Values for p_type entry in struct Elf32_Phdr.
- */
-#define PT_NULL    	0
-#define PT_LOAD    	1
-#define PT_DYNAMIC 	2
-#define PT_INTERP  	3
-#define PT_NOTE    	4
-#define PT_SHLIB   	5
-#define PT_PHDR    	6
-#define PT_LOPROC  	0x70000000
-#define PT_HIPROC  	0x7fffffff
-
-/*
- * Values for p_flags entry in struct Elf32_Phdr.
- */
-#define PF_X		0x1
-#define PF_W		0x2
-#define PF_R		0x4
-#define PF_MASKPROC	0xf0000000
+#ifdef KERNEL
 
-/*
- * Auxiliary vector entry on initial stack.
- */
-typedef struct {
-	Elf32_Sword	a_type;
-	Elf32_Word	a_val;
-} Elf32_Auxinfo;
+extern int elf_trace;
 
 #define AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);}
 
-/* 
- * Values for a_type in struct Elf32_Auxinfo.
- */
-#define AT_NULL		0	/* Terminates the vector */
-#define AT_IGNORE	1	/* Ignored */
-#define AT_EXECFD	2	/* File descriptor of program to load */
-#define AT_PHDR		3	/* Program header of program already loaded */
-#define AT_PHENT	4	/* Size of each program header entry */
-#define AT_PHNUM	5	/* Number of program header entries */
-#define AT_PAGESZ	6	/* Page size in bytes */
-#define AT_BASE		7	/* Interpreter's base address */
-#define AT_FLAGS	8	/* Flags (unused for i386) */
-#define AT_ENTRY	9	/* Where interpreter should transfer control */
-
-/*
- * The following non-standard values are used for passing information
- * to the (FreeBSD ELF) dynamic linker. Will probably go away soon....
- */
-#define AT_BRK		10	/* Starting point for sbrk and brk */
-#define AT_DEBUG	11	/* Debugging level */
-#define AT_COUNT	15
-
-/*
- * The following non-standard values are used in Linux ELF binaries.
- */
-#define AT_NOTELF	10	/* Program is not ELF ?? */
-#define AT_UID		11	/* Real uid */
-#define AT_EUID		12	/* Effective uid */
-#define AT_GID		13	/* Real gid */
-#define AT_EGID		14	/* Effective gid */
-
 /*
  * Structure used to pass infomation from the loader to the
  * stack fixup routine.
@@ -213,4 +67,6 @@ typedef struct {
 int elf_insert_brand_entry __P((Elf32_Brandinfo *entry));
 int elf_remove_brand_entry __P((Elf32_Brandinfo *entry));
 
-#endif /* _IMGACT_ELF_H_ */
+#endif /* KERNEL */
+
+#endif /* !_SYS_IMGACT_ELF_H_ */
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c7a7030..e671794 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -25,15 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: brandelf.c,v 1.4 1997/02/22 19:54:15 peter Exp $
+ *  $Id: brandelf.c,v 1.5 1997/03/29 04:28:17 imp Exp $
  */
 
-#include <stdlib.h>
+#include <elf.h>
+#include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <sys/imgact_elf.h>
 
 int usage(void);
 
@@ -65,8 +65,8 @@ main(int argc, char **argv)
 	}
 	while (argc) {
 		int fd;
-		char buffer[EI_NINDENT];
-		char string[(EI_NINDENT-EI_SPARE)+1];
+		char buffer[EI_NIDENT];
+		char string[(EI_NIDENT-EI_BRAND)+1];
 
 		if ((fd = open(argv[0], O_RDWR, 0)) < 0) {
 			fprintf(stderr, "No such file %s.\n", argv[0]);
@@ -74,7 +74,7 @@ main(int argc, char **argv)
 			goto fail;
 			
 		}
-		if (read(fd, buffer, EI_NINDENT) < EI_NINDENT) {
+		if (read(fd, buffer, EI_NIDENT) < EI_NIDENT) {
 			fprintf(stderr, "File '%s' too short.\n", argv[0]);
 			retval = 1;
 			goto fail;
@@ -88,7 +88,7 @@ main(int argc, char **argv)
 		}		
 		if (!change) {
 			bzero(string, sizeof(string));
-			strncpy(string, &buffer[EI_SPARE], EI_NINDENT-EI_SPARE);
+			strncpy(string, &buffer[EI_BRAND], EI_NIDENT-EI_BRAND);
 			if (strlen(string)) {
 				fprintf(stdout, "File '%s' is of brand '%s'.\n",
 					argv[0], string);
@@ -98,9 +98,9 @@ main(int argc, char **argv)
 					argv[0]);
 		}
 		else {
-			strncpy(&buffer[EI_SPARE], type, EI_NINDENT-EI_SPARE);
+			strncpy(&buffer[EI_BRAND], type, EI_NIDENT-EI_BRAND);
 			lseek(fd, 0, SEEK_SET);
-			if (write(fd, buffer, EI_NINDENT) != EI_NINDENT) {
+			if (write(fd, buffer, EI_NIDENT) != EI_NIDENT) {
 				fprintf(stderr, "Error writing %s\n", argv[0]);
 			retval = 1;
 				goto fail;