Adjust the system endian and a.out headers to be more MI and cross-building

friendly.  Use the systems headers rather than local versions.

Reviewed by:	ru

9 files changed, 165 insertions, 353 deletions

diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 912be22..32cf99d 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -3,6 +3,5 @@
 PROG=	btxld
 MAN=	btxld.8
 SRCS=	btxld.c elfh.c
-CFLAGS+=-I${.CURDIR}/../kgzip
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index 9216031..6fd7f45 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -30,9 +30,11 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
+#include <sys/endian.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <a.out.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -44,8 +46,6 @@ static const char rcsid[] =
 
 #include "btx.h"
 #include "elfh.h"
-#include "endian.h"
-#include "i386_a.out.h"
 
 #define BTX_PATH		"/sys/boot/i386/btx"
 
@@ -261,9 +261,9 @@ btxld(const char *iname)
 	    break;
 	case I_BTX:
 	    btxle = btx;
-	    btxle.btx_pgctl = HTOLE16(btxle.btx_pgctl);
-	    btxle.btx_textsz = HTOLE16(btxle.btx_textsz);
-	    btxle.btx_entry = HTOLE32(btxle.btx_entry);
+	    btxle.btx_pgctl = htole16(btxle.btx_pgctl);
+	    btxle.btx_textsz = htole16(btxle.btx_textsz);
+	    btxle.btx_entry = htole32(btxle.btx_entry);
 	    writex(fdo, &btxle, sizeof(btxle));
 	    copy(fdi[i], fdo, btx.btx_textsz - sizeof(btx),
 		 sizeof(btx));
@@ -305,9 +305,9 @@ getbtx(int fd, struct btx_hdr * btx)
 	btx->btx_magic[1] != BTX_MAG1 ||
 	btx->btx_magic[2] != BTX_MAG2)
 	errx(1, "%s: Not a BTX kernel", fname);
-    btx->btx_pgctl = LE16TOH(btx->btx_pgctl);
-    btx->btx_textsz = LE16TOH(btx->btx_textsz);
-    btx->btx_entry = LE32TOH(btx->btx_entry);
+    btx->btx_pgctl = le16toh(btx->btx_pgctl);
+    btx->btx_textsz = le16toh(btx->btx_textsz);
+    btx->btx_entry = le32toh(btx->btx_entry);
 }
 
 /*
@@ -317,7 +317,7 @@ static void
 gethdr(int fd, struct hdr *hdr)
 {
     struct stat sb;
-    const struct i386_exec *ex;
+    const struct exec *ex;
     const Elf32_Ehdr *ee;
     const Elf32_Phdr *ep;
     void *p;
@@ -336,20 +336,20 @@ gethdr(int fd, struct hdr *hdr)
 	switch (fmt) {
 	case F_AOUT:
 	    ex = p;
-	    if (hdr->size >= sizeof(struct i386_exec) && !I386_N_BADMAG(*ex)) {
+	    if (hdr->size >= sizeof(struct exec) && !N_BADMAG(*ex)) {
 		hdr->fmt = fmt;
-		x = I386_N_GETMAGIC(*ex);
+		x = N_GETMAGIC(*ex);
 		if (x == OMAGIC || x == NMAGIC) {
 		    if (x == NMAGIC)
 			Warn(fname, "Treating %s NMAGIC as OMAGIC",
 			     fmtlist[fmt]);
 		    hdr->flags |= IMPURE;
 		}
-		hdr->text = LE32TOH(ex->a_text);
-		hdr->data = LE32TOH(ex->a_data);
-		hdr->bss = LE32TOH(ex->a_bss);
-		hdr->entry = LE32TOH(ex->a_entry);
-		if (LE32TOH(ex->a_entry) >= BTX_PGSIZE)
+		hdr->text = le32toh(ex->a_text);
+		hdr->data = le32toh(ex->a_data);
+		hdr->bss = le32toh(ex->a_bss);
+		hdr->entry = le32toh(ex->a_entry);
+		if (le32toh(ex->a_entry) >= BTX_PGSIZE)
 		    hdr->org = BTX_PGSIZE;
 	    }
 	    break;
@@ -357,21 +357,21 @@ gethdr(int fd, struct hdr *hdr)
 	    ee = p;
 	    if (hdr->size >= sizeof(Elf32_Ehdr) && IS_ELF(*ee)) {
 		hdr->fmt = fmt;
-		for (n = i = 0; i < LE16TOH(ee->e_phnum); i++) {
-		    ep = (void *)((uint8_t *)p + LE32TOH(ee->e_phoff) +
-				  LE16TOH(ee->e_phentsize) * i);
-		    if (LE32TOH(ep->p_type) == PT_LOAD)
+		for (n = i = 0; i < le16toh(ee->e_phnum); i++) {
+		    ep = (void *)((uint8_t *)p + le32toh(ee->e_phoff) +
+				  le16toh(ee->e_phentsize) * i);
+		    if (le32toh(ep->p_type) == PT_LOAD)
 			switch (n++) {
 			case 0:
-			    hdr->text = LE32TOH(ep->p_filesz);
-			    hdr->org = LE32TOH(ep->p_paddr);
-			    if (LE32TOH(ep->p_flags) & PF_W)
+			    hdr->text = le32toh(ep->p_filesz);
+			    hdr->org = le32toh(ep->p_paddr);
+			    if (le32toh(ep->p_flags) & PF_W)
 				hdr->flags |= IMPURE;
 			    break;
 			case 1:
-			    hdr->data = LE32TOH(ep->p_filesz);
-			    hdr->bss = LE32TOH(ep->p_memsz) -
-				LE32TOH(ep->p_filesz);
+			    hdr->data = le32toh(ep->p_filesz);
+			    hdr->bss = le32toh(ep->p_memsz) -
+				le32toh(ep->p_filesz);
 			    break;
 			case 2:
 			    Warn(fname,
@@ -379,7 +379,7 @@ gethdr(int fd, struct hdr *hdr)
 				 fmtlist[fmt]);
 			}
 		}
-		hdr->entry = LE32TOH(ee->e_entry);
+		hdr->entry = le32toh(ee->e_entry);
 	    }
 	}
     if (munmap(p, hdr->size))
@@ -392,33 +392,33 @@ gethdr(int fd, struct hdr *hdr)
 static void
 puthdr(int fd, struct hdr *hdr)
 {
-    struct i386_exec ex;
+    struct exec ex;
     struct elfh eh;
 
     switch (hdr->fmt) {
     case F_AOUT:
 	memset(&ex, 0, sizeof(ex));
-	I386_N_SETMAGIC(ex, ZMAGIC, MID_ZERO, 0);
-	hdr->text = I386_N_ALIGN(ex, hdr->text);
-	ex.a_text = HTOLE32(hdr->text);
-	hdr->data = I386_N_ALIGN(ex, hdr->data);
-	ex.a_data = HTOLE32(hdr->data);
-	ex.a_entry = HTOLE32(hdr->entry);
+	N_SETMAGIC(ex, ZMAGIC, MID_ZERO, 0);
+	hdr->text = N_ALIGN(ex, hdr->text);
+	ex.a_text = htole32(hdr->text);
+	hdr->data = N_ALIGN(ex, hdr->data);
+	ex.a_data = htole32(hdr->data);
+	ex.a_entry = htole32(hdr->entry);
 	writex(fd, &ex, sizeof(ex));
-	hdr->size = I386_N_ALIGN(ex, sizeof(ex));
+	hdr->size = N_ALIGN(ex, sizeof(ex));
 	seekx(fd, hdr->size);
 	break;
     case F_ELF:
 	eh = elfhdr;
-	eh.e.e_entry = HTOLE32(hdr->entry);
-	eh.p[0].p_vaddr = eh.p[0].p_paddr = HTOLE32(hdr->org);
-	eh.p[0].p_filesz = eh.p[0].p_memsz = HTOLE32(hdr->text);
-	eh.p[1].p_offset = HTOLE32(LE32TOH(eh.p[0].p_offset) +
-	    LE32TOH(eh.p[0].p_filesz));
+	eh.e.e_entry = htole32(hdr->entry);
+	eh.p[0].p_vaddr = eh.p[0].p_paddr = htole32(hdr->org);
+	eh.p[0].p_filesz = eh.p[0].p_memsz = htole32(hdr->text);
+	eh.p[1].p_offset = htole32(le32toh(eh.p[0].p_offset) +
+	    le32toh(eh.p[0].p_filesz));
 	eh.p[1].p_vaddr = eh.p[1].p_paddr =
-	    HTOLE32(align(LE32TOH(eh.p[0].p_paddr) + LE32TOH(eh.p[0].p_memsz),
+	    htole32(align(le32toh(eh.p[0].p_paddr) + le32toh(eh.p[0].p_memsz),
 	    4));
-	eh.p[1].p_filesz = eh.p[1].p_memsz = HTOLE32(hdr->data);
+	eh.p[1].p_filesz = eh.p[1].p_memsz = htole32(hdr->data);
 	eh.sh[2].sh_addr = eh.p[0].p_vaddr;
 	eh.sh[2].sh_offset = eh.p[0].p_offset;
 	eh.sh[2].sh_size = eh.p[0].p_filesz;
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 75b7e33..2790d5a 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.c
@@ -27,10 +27,10 @@
  */
 
 #include <sys/types.h>
+#include <sys/endian.h>
 
 #include <stddef.h>
 #include "elfh.h"
-#include "endian.h"
 
 #define SET_ME	0xeeeeeeee    /* filled in by btxld */
 
@@ -44,80 +44,80 @@ const struct elfh elfhdr = {
 	    ELFCLASS32, ELFDATA2LSB, EV_CURRENT, 0,
 	    'F', 'r', 'e', 'e', 'B', 'S', 'D', 0
 	},
-	HTOLE16(ET_EXEC),			    /* e_type */
-	HTOLE16(EM_386),			    /* e_machine */
-	HTOLE32(EV_CURRENT),			    /* e_version */
-	HTOLE32(SET_ME),			    /* e_entry */
-	HTOLE32(offsetof(struct elfh, p)),	    /* e_phoff */
-	HTOLE32(offsetof(struct elfh, sh)),	    /* e_shoff */
+	htole16(ET_EXEC),			    /* e_type */
+	htole16(EM_386),			    /* e_machine */
+	htole32(EV_CURRENT),			    /* e_version */
+	htole32(SET_ME),			    /* e_entry */
+	htole32(offsetof(struct elfh, p)),	    /* e_phoff */
+	htole32(offsetof(struct elfh, sh)),	    /* e_shoff */
 	0,					    /* e_flags */
-	HTOLE16(sizeof(elfhdr.e)),		    /* e_ehsize */
-	HTOLE16(sizeof(elfhdr.p[0])),		    /* e_phentsize */
-	HTOLE16(sizeof(elfhdr.p) / sizeof(elfhdr.p[0])), /* e_phnum */
-	HTOLE16(sizeof(elfhdr.sh[0])),		    /* e_shentsize */
-	HTOLE16(sizeof(elfhdr.sh) / sizeof(elfhdr.sh[0])), /* e_shnum */
-	HTOLE16(1)				    /* e_shstrndx */
+	htole16(sizeof(elfhdr.e)),		    /* e_ehsize */
+	htole16(sizeof(elfhdr.p[0])),		    /* e_phentsize */
+	htole16(sizeof(elfhdr.p) / sizeof(elfhdr.p[0])), /* e_phnum */
+	htole16(sizeof(elfhdr.sh[0])),		    /* e_shentsize */
+	htole16(sizeof(elfhdr.sh) / sizeof(elfhdr.sh[0])), /* e_shnum */
+	htole16(1)				    /* e_shstrndx */
     },
     {
 	{
-	    HTOLE32(PT_LOAD),			    /* p_type */
-	    HTOLE32(sizeof(elfhdr)),		    /* p_offset */
-	    HTOLE32(SET_ME),			    /* p_vaddr */
-	    HTOLE32(SET_ME),			    /* p_paddr */
-	    HTOLE32(SET_ME),			    /* p_filesz */
-	    HTOLE32(SET_ME),			    /* p_memsz */
-	    HTOLE32(PF_R | PF_X),		    /* p_flags */
-	    HTOLE32(0x1000)			    /* p_align */
+	    htole32(PT_LOAD),			    /* p_type */
+	    htole32(sizeof(elfhdr)),		    /* p_offset */
+	    htole32(SET_ME),			    /* p_vaddr */
+	    htole32(SET_ME),			    /* p_paddr */
+	    htole32(SET_ME),			    /* p_filesz */
+	    htole32(SET_ME),			    /* p_memsz */
+	    htole32(PF_R | PF_X),		    /* p_flags */
+	    htole32(0x1000)			    /* p_align */
 	},
 	{
-	    HTOLE32(PT_LOAD),			    /* p_type */
-	    HTOLE32(SET_ME),			    /* p_offset */
-	    HTOLE32(SET_ME),			    /* p_vaddr */
-	    HTOLE32(SET_ME),			    /* p_paddr */
-	    HTOLE32(SET_ME),			    /* p_filesz */
-	    HTOLE32(SET_ME),			    /* p_memsz */
-	    HTOLE32(PF_R | PF_W),		    /* p_flags */
-	    HTOLE32(0x1000)			    /* p_align */
+	    htole32(PT_LOAD),			    /* p_type */
+	    htole32(SET_ME),			    /* p_offset */
+	    htole32(SET_ME),			    /* p_vaddr */
+	    htole32(SET_ME),			    /* p_paddr */
+	    htole32(SET_ME),			    /* p_filesz */
+	    htole32(SET_ME),			    /* p_memsz */
+	    htole32(PF_R | PF_W),		    /* p_flags */
+	    htole32(0x1000)			    /* p_align */
 	}
     },
     {
 	{
-	    0, HTOLE32(SHT_NULL), 0, 0, 0, 0, HTOLE32(SHN_UNDEF), 0, 0, 0
+	    0, htole32(SHT_NULL), 0, 0, 0, 0, htole32(SHN_UNDEF), 0, 0, 0
 	},
 	{
-	    HTOLE32(1),				    /* sh_name */
-	    HTOLE32(SHT_STRTAB), 		    /* sh_type */
+	    htole32(1),				    /* sh_name */
+	    htole32(SHT_STRTAB), 		    /* sh_type */
 	    0,					    /* sh_flags */
 	    0,					    /* sh_addr */
-	    HTOLE32(offsetof(struct elfh, shstrtab)), /* sh_offset */
-	    HTOLE32(sizeof(elfhdr.shstrtab)),	    /* sh_size */
-	    HTOLE32(SHN_UNDEF),			    /* sh_link */
+	    htole32(offsetof(struct elfh, shstrtab)), /* sh_offset */
+	    htole32(sizeof(elfhdr.shstrtab)),	    /* sh_size */
+	    htole32(SHN_UNDEF),			    /* sh_link */
 	    0,					    /* sh_info */
-	    HTOLE32(1),				    /* sh_addralign */
+	    htole32(1),				    /* sh_addralign */
 	    0					    /* sh_entsize */
 	},
 	{
-	    HTOLE32(0xb),			    /* sh_name */
-	    HTOLE32(SHT_PROGBITS),		    /* sh_type */
-	    HTOLE32(SHF_EXECINSTR | SHF_ALLOC),	    /* sh_flags */
-	    HTOLE32(SET_ME),			    /* sh_addr */
-	    HTOLE32(SET_ME),			    /* sh_offset */
-	    HTOLE32(SET_ME),			    /* sh_size */
-	    HTOLE32(SHN_UNDEF),			    /* sh_link */
+	    htole32(0xb),			    /* sh_name */
+	    htole32(SHT_PROGBITS),		    /* sh_type */
+	    htole32(SHF_EXECINSTR | SHF_ALLOC),	    /* sh_flags */
+	    htole32(SET_ME),			    /* sh_addr */
+	    htole32(SET_ME),			    /* sh_offset */
+	    htole32(SET_ME),			    /* sh_size */
+	    htole32(SHN_UNDEF),			    /* sh_link */
 	    0,					    /* sh_info */
-	    HTOLE32(4),				    /* sh_addralign */
+	    htole32(4),				    /* sh_addralign */
 	    0					    /* sh_entsize */
 	},
 	{
-	    HTOLE32(0x11),			    /* sh_name */
-	    HTOLE32(SHT_PROGBITS),		    /* sh_type */
-	    HTOLE32(SHF_ALLOC | SHF_WRITE),	    /* sh_flags */
-	    HTOLE32(SET_ME),			    /* sh_addr */
-	    HTOLE32(SET_ME),			    /* sh_offset */
-	    HTOLE32(SET_ME),			    /* sh_size */
-	    HTOLE32(SHN_UNDEF),			    /* sh_link */
+	    htole32(0x11),			    /* sh_name */
+	    htole32(SHT_PROGBITS),		    /* sh_type */
+	    htole32(SHF_ALLOC | SHF_WRITE),	    /* sh_flags */
+	    htole32(SET_ME),			    /* sh_addr */
+	    htole32(SET_ME),			    /* sh_offset */
+	    htole32(SET_ME),			    /* sh_size */
+	    htole32(SHN_UNDEF),			    /* sh_link */
 	    0,					    /* sh_info */
-	    HTOLE32(4),				    /* sh_addralign */
+	    htole32(4),				    /* sh_addralign */
 	    0					    /* sh_entsize */
 	}
     },
diff --git a/usr.sbin/crunch/crunchide/exec_aout.c b/usr.sbin/crunch/crunchide/exec_aout.c
index 6aa1b8b..a608c23 100644
--- a/usr.sbin/crunch/crunchide/exec_aout.c
+++ b/usr.sbin/crunch/crunchide/exec_aout.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <a.out.h>
 #include <sys/types.h>
+#include <sys/endian.h>
 #include <sys/stat.h> 
 #include <sys/errno.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index 50bb0b7..12b1d5f 100644
--- a/usr.sbin/kgzip/elfhdr.c
+++ b/usr.sbin/kgzip/elfhdr.c
@@ -26,9 +26,9 @@
  * $FreeBSD$
  */
 
+#include <sys/endian.h>
 #include <stddef.h>
 #include "elfhdr.h"
-#include "endian.h"
 
 #define KGZ_FIX_NSIZE	0	/* Run-time fixup */
 
@@ -43,80 +43,80 @@ const struct kgz_elfhdr elfhdr = {
 	    ELFCLASS32, ELFDATA2LSB, EV_CURRENT, 0,
 	    'F', 'r', 'e', 'e', 'B', 'S', 'D', 0
 	},
-	HTOLE16(ET_EXEC),				/* e_type */
-	HTOLE16(EM_386),				/* e_machine */
-	HTOLE32(EV_CURRENT),				/* e_version */
+	htole16(ET_EXEC),				/* e_type */
+	htole16(EM_386),				/* e_machine */
+	htole32(EV_CURRENT),				/* e_version */
 	0,						/* e_entry */
 	0,						/* e_phoff */
-	HTOLE32(offsetof(struct kgz_elfhdr, sh)),	/* e_shoff */
+	htole32(offsetof(struct kgz_elfhdr, sh)),	/* e_shoff */
 	0,						/* e_flags */
-	HTOLE16(sizeof(Elf32_Ehdr)),			/* e_ehsize */
+	htole16(sizeof(Elf32_Ehdr)),			/* e_ehsize */
 	0,						/* e_phentsize */
 	0,						/* e_phnum */
-	HTOLE16(sizeof(Elf32_Shdr)),			/* e_shentsize */
-	HTOLE16(KGZ_SHNUM),				/* e_shnum */
-	HTOLE16(KGZ_SH_SHSTRTAB)			/* e_shstrndx */
+	htole16(sizeof(Elf32_Shdr)),			/* e_shentsize */
+	htole16(KGZ_SHNUM),				/* e_shnum */
+	htole16(KGZ_SH_SHSTRTAB)			/* e_shstrndx */
     },
     /* Section header */
     {
 	{
 	    0,						/* sh_name */
-	    HTOLE32(SHT_NULL),				/* sh_type */
+	    htole32(SHT_NULL),				/* sh_type */
 	    0,						/* sh_flags */
 	    0,						/* sh_addr */
 	    0,						/* sh_offset */
 	    0,						/* sh_size */
-	    HTOLE32(SHN_UNDEF),				/* sh_link */
+	    htole32(SHN_UNDEF),				/* sh_link */
 	    0,						/* sh_info */
 	    0,						/* sh_addralign */
 	    0						/* sh_entsize */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_shstrtab, symtab)), /* sh_name */
-	    HTOLE32(SHT_SYMTAB),			/* sh_type */
+	    htole32(offsetof(struct kgz_shstrtab, symtab)), /* sh_name */
+	    htole32(SHT_SYMTAB),			/* sh_type */
 	    0,						/* sh_flags */
 	    0,						/* sh_addr */
-	    HTOLE32(offsetof(struct kgz_elfhdr, st)),	/* sh_offset */
-	    HTOLE32(sizeof(Elf32_Sym) * KGZ_STNUM),	/* sh_size */
-	    HTOLE32(KGZ_SH_STRTAB),			/* sh_link */
-	    HTOLE32(1),					/* sh_info */
-	    HTOLE32(4),					/* sh_addralign */
-	    HTOLE32(sizeof(Elf32_Sym))			/* sh_entsize */
+	    htole32(offsetof(struct kgz_elfhdr, st)),	/* sh_offset */
+	    htole32(sizeof(Elf32_Sym) * KGZ_STNUM),	/* sh_size */
+	    htole32(KGZ_SH_STRTAB),			/* sh_link */
+	    htole32(1),					/* sh_info */
+	    htole32(4),					/* sh_addralign */
+	    htole32(sizeof(Elf32_Sym))			/* sh_entsize */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_shstrtab, shstrtab)), /* sh_name */
-	    HTOLE32(SHT_STRTAB),			/* sh_type */
+	    htole32(offsetof(struct kgz_shstrtab, shstrtab)), /* sh_name */
+	    htole32(SHT_STRTAB),			/* sh_type */
 	    0,						/* sh_flags */
 	    0,						/* sh_addr */
-	    HTOLE32(offsetof(struct kgz_elfhdr, shstrtab)), /* sh_offset */
-	    HTOLE32(sizeof(struct kgz_shstrtab)),	/* sh_size */
-	    HTOLE32(SHN_UNDEF),				/* sh_link */
+	    htole32(offsetof(struct kgz_elfhdr, shstrtab)), /* sh_offset */
+	    htole32(sizeof(struct kgz_shstrtab)),	/* sh_size */
+	    htole32(SHN_UNDEF),				/* sh_link */
 	    0,						/* sh_info */
-	    HTOLE32(1),					/* sh_addralign */
+	    htole32(1),					/* sh_addralign */
 	    0						/* sh_entsize */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_shstrtab, strtab)), /* sh_name */
-	    HTOLE32(SHT_STRTAB),			/* sh_type */
+	    htole32(offsetof(struct kgz_shstrtab, strtab)), /* sh_name */
+	    htole32(SHT_STRTAB),			/* sh_type */
 	    0,						/* sh_flags */
 	    0,						/* sh_addr */
-	    HTOLE32(offsetof(struct kgz_elfhdr, strtab)), /* sh_offset */
-	    HTOLE32(sizeof(struct kgz_strtab)),		/* sh_size */
-	    HTOLE32(SHN_UNDEF),				/* sh_link */
+	    htole32(offsetof(struct kgz_elfhdr, strtab)), /* sh_offset */
+	    htole32(sizeof(struct kgz_strtab)),		/* sh_size */
+	    htole32(SHN_UNDEF),				/* sh_link */
 	    0,						/* sh_info */
-	    HTOLE32(1),					/* sh_addralign */
+	    htole32(1),					/* sh_addralign */
 	    0						/* sh_entsize */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_shstrtab, data)), /* sh_name */
-	    HTOLE32(SHT_PROGBITS),			/* sh_type */
-	    HTOLE32(SHF_ALLOC | SHF_WRITE),		/* sh_flags */
+	    htole32(offsetof(struct kgz_shstrtab, data)), /* sh_name */
+	    htole32(SHT_PROGBITS),			/* sh_type */
+	    htole32(SHF_ALLOC | SHF_WRITE),		/* sh_flags */
 	    0,						/* sh_addr */
-	    HTOLE32(sizeof(struct kgz_elfhdr)),		/* sh_offset */
-	    HTOLE32(sizeof(struct kgz_hdr) + KGZ_FIX_NSIZE), /* sh_size */
-	    HTOLE32(SHN_UNDEF),				/* sh_link */
+	    htole32(sizeof(struct kgz_elfhdr)),		/* sh_offset */
+	    htole32(sizeof(struct kgz_hdr) + KGZ_FIX_NSIZE), /* sh_size */
+	    htole32(SHN_UNDEF),				/* sh_link */
 	    0,						/* sh_info */
-	    HTOLE32(4),					/* sh_addralign */
+	    htole32(4),					/* sh_addralign */
 	    0						/* sh_entsize */
 	}
     },
@@ -128,23 +128,23 @@ const struct kgz_elfhdr elfhdr = {
 	    0,						/* st_size */
 	    0,						/* st_info */
 	    0,						/* st_other */
-	    HTOLE16(SHN_UNDEF)				/* st_shndx */
+	    htole16(SHN_UNDEF)				/* st_shndx */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_strtab, kgz)),	/* st_name */
+	    htole32(offsetof(struct kgz_strtab, kgz)),	/* st_name */
 	    0,						/* st_value */
-	    HTOLE32(sizeof(struct kgz_hdr)),		/* st_size */
+	    htole32(sizeof(struct kgz_hdr)),		/* st_size */
 	    ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT),	/* st_info */
 	    0,						/* st_other */
-	    HTOLE16(KGZ_SH_DATA)			/* st_shndx */
+	    htole16(KGZ_SH_DATA)			/* st_shndx */
 	},
 	{
-	    HTOLE32(offsetof(struct kgz_strtab, kgz_ndata)), /* st_name */
-	    HTOLE32(sizeof(struct kgz_hdr)),		/* st_value */
-	    HTOLE32(KGZ_FIX_NSIZE),			/* st_size */
+	    htole32(offsetof(struct kgz_strtab, kgz_ndata)), /* st_name */
+	    htole32(sizeof(struct kgz_hdr)),		/* st_value */
+	    htole32(KGZ_FIX_NSIZE),			/* st_size */
 	    ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT),	/* st_info */
 	    0,						/* st_other */
-	    HTOLE16(KGZ_SH_DATA)			/* st_shndx */
+	    htole16(KGZ_SH_DATA)			/* st_shndx */
 	}
     },
     /* Section header string table */
diff --git a/usr.sbin/kgzip/endian.h b/usr.sbin/kgzip/endian.h
deleted file mode 100644
index 78c9b16..0000000
--- a/usr.sbin/kgzip/endian.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#define	bswap16(x) (uint16_t) \
-	((x >> 8) | (x << 8))
-
-#define	bswap32(x) (uint32_t) \
-	((x >> 24) | ((x >> 8) & 0xff00) | ((x << 8) & 0xff0000) | (x << 24))
-
-#define	bswap64(x) (uint64_t) \
-	((x >> 56) | ((x >> 40) & 0xff00) | ((x >> 24) & 0xff0000) | \
-	((x >> 8) & 0xff000000) | ((x << 8) & ((uint64_t)0xff << 32)) | \
-	((x << 24) & ((uint64_t)0xff << 40)) | \
-	((x << 40) & ((uint64_t)0xff << 48)) | ((x << 56)))
-
-/*
- * Host to big endian, host to little endian, big endian to host, and little
- * endian to host byte order functions as detailed in byteorder(9).
- */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define	HTOBE16(x)	bswap16((uint16_t)(x))
-#define	HTOBE32(x)	bswap32((uint32_t)(x))
-#define	HTOBE64(x)	bswap64((uint64_t)(x))
-#define	HTOLE16(x)	((uint16_t)(x))
-#define	HTOLE32(x)	((uint32_t)(x))
-#define	HTOLE64(x)	((uint64_t)(x))
-
-#define	BE16TOH(x)	bswap16((uint16_t)(x))
-#define	BE32TOH(x)	bswap32((uint32_t)(x))
-#define	BE64TOH(x)	bswap64((uint64_t)(x))
-#define	LE16TOH(x)	((uint16_t)(x))
-#define	LE32TOH(x)	((uint32_t)(x))
-#define	LE64TOH(x)	((uint64_t)(x))
-#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
-#define	HTOBE16(x)	((uint16_t)(x))
-#define	HTOBE32(x)	((uint32_t)(x))
-#define	HTOBE64(x)	((uint64_t)(x))
-#define	HTOLE16(x)	bswap16((uint16_t)(x))
-#define	HTOLE32(x)	bswap32((uint32_t)(x))
-#define	HTOLE64(x)	bswap64((uint64_t)(x))
-
-#define	BE16TOH(x)	((uint16_t)(x))
-#define	BE32TOH(x)	((uint32_t)(x))
-#define	BE64TOH(x)	((uint64_t)(x))
-#define	LE16TOH(x)	bswap16((uint16_t)(x))
-#define	LE32TOH(x)	bswap32((uint32_t)(x))
-#define	LE64TOH(x)	bswap64((uint64_t)(x))
-#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
diff --git a/usr.sbin/kgzip/i386_a.out.h b/usr.sbin/kgzip/i386_a.out.h
deleted file mode 100644
index 72d930d..0000000
--- a/usr.sbin/kgzip/i386_a.out.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * from: FreeBSD: src/sys/sys/imgact_aout.h,v 1.18 2002/09/05 07:54:03 bde Exp $
- * $FreeBSD$
- */
-
-#ifndef	_I386_AOUT_H_
-#define	_I386_AOUT_H_
-
-#include <sys/types.h>
-#include "endian.h"
-
-#define	__I386_LDPGSZ	4096
-
-#define I386_N_GETMAGIC(ex) \
-	( LE32TOH((ex).a_midmag) & 0xffff )
-#define I386_N_SETMAGIC(ex,mag,mid,flag) \
-	( (ex).a_midmag = HTOLE32((((flag) & 0x3f) <<26) | \
-	(((mid) & 0x03ff) << 16) | \
-	((mag) & 0xffff)) )
-
-#define I386_N_ALIGN(ex,x) \
-	(I386_N_GETMAGIC(ex) == ZMAGIC || I386_N_GETMAGIC(ex) == QMAGIC ? \
-	 ((x) + __I386_LDPGSZ - 1) & ~(uint32_t)(__I386_LDPGSZ - 1) : (x))
-
-/* Valid magic number check. */
-#define	I386_N_BADMAG(ex) \
-	(I386_N_GETMAGIC(ex) != OMAGIC && I386_N_GETMAGIC(ex) != NMAGIC && \
-	 I386_N_GETMAGIC(ex) != ZMAGIC && I386_N_GETMAGIC(ex) != QMAGIC)
-
-
-/* Address of the bottom of the text segment. */
-/*
- * This can not be done right.  Abuse a_entry in some cases to handle kernels.
- */
-#define I386_N_TXTADDR(ex) \
-	((I386_N_GETMAGIC(ex) == OMAGIC || I386_N_GETMAGIC(ex) == NMAGIC || \
-	I386_N_GETMAGIC(ex) == ZMAGIC) ? \
-	(LE32TOH((ex).a_entry) < LE32TOH((ex).a_text) ? 0 : \
-	LE32TOH((ex).a_entry) & ~__I386_LDPGSZ) : __I386_LDPGSZ)
-
-/* Address of the bottom of the data segment. */
-#define I386_N_DATADDR(ex) \
-	I386_N_ALIGN(ex, I386_N_TXTADDR(ex) + LE32TOH((ex).a_text))
-
-/* Text segment offset. */
-#define	I386_N_TXTOFF(ex) \
-	(I386_N_GETMAGIC(ex) == ZMAGIC ? __I386_LDPGSZ : \
-	(I386_N_GETMAGIC(ex) == QMAGIC ? 0 : sizeof(struct exec)))
-
-/* Data segment offset. */
-#define	I386_N_DATOFF(ex) \
-	I386_N_ALIGN(ex, I386_N_TXTOFF(ex) + LE32TOH((ex).a_text))
-
-/* Relocation table offset. */
-#define I386_N_RELOFF(ex) \
-	I386_N_ALIGN(ex, I386_N_DATOFF(ex) + LE32TOH((ex).a_data))
-
-/* Symbol table offset. */
-#define I386_N_SYMOFF(ex) \
-	(I386_N_RELOFF(ex) + LE32TOH((ex).a_trsize) + LE32TOH((ex).a_drsize))
-
-/* String table offset. */
-#define	I386_N_STROFF(ex) 	(I386_N_SYMOFF(ex) + LE32TOH((ex).a_syms))
-
-/*
- * Header prepended to each a.out file.
- * only manipulate the a_midmag field via the
- * N_SETMAGIC/N_GET{MAGIC,MID,FLAG} macros in a.out.h
- */
-
-struct i386_exec {
-     uint32_t	a_midmag;	/* flags<<26 | mid<<16 | magic */
-     uint32_t	a_text;		/* text segment size */
-     uint32_t	a_data;		/* initialized data size */
-     uint32_t	a_bss;		/* uninitialized data size */
-     uint32_t	a_syms;		/* symbol table size */
-     uint32_t	a_entry;	/* entry point */
-     uint32_t	a_trsize;	/* text relocation size */
-     uint32_t	a_drsize;	/* data relocation size */
-};
-#define a_magic a_midmag /* XXX Hack to work with current kern_execve.c */
-
-/* a_magic */
-#define	OMAGIC		0407	/* old impure format */
-#define	NMAGIC		0410	/* read-only text */
-#define	ZMAGIC		0413	/* demand load format */
-#define QMAGIC          0314    /* "compact" demand load format */
-
-/* a_mid */
-#define	MID_ZERO	0	/* unknown - implementation dependent */
-#define	MID_SUN010	1	/* sun 68010/68020 binary */
-#define	MID_SUN020	2	/* sun 68020-only binary */
-#define MID_I386	134	/* i386 BSD binary */
-#define MID_SPARC	138	/* sparc */
-#define	MID_HP200	200	/* hp200 (68010) BSD binary */
-#define	MID_HP300	300	/* hp300 (68020+68881) BSD binary */
-#define	MID_HPUX	0x20C	/* hp200/300 HP-UX binary */
-#define	MID_HPUX800     0x20B   /* hp800 HP-UX binary */
-
-/*
- * a_flags
- */
-#define EX_PIC		0x10	/* contains position independent code */
-#define EX_DYNAMIC	0x20	/* contains run-time link-edit info */
-#define EX_DPMASK	0x30	/* mask for the above */
-
-#endif /* !_I386_AOUT_H_ */
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index e873b11..0ea4f0e 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -26,6 +26,9 @@
  * $FreeBSD$
  */
 
+#define	_KERNEL
+#include <sys/param.h>
+#undef _KERNEL
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -36,11 +39,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "i386_a.out.h"
+#include <a.out.h>
 
 #include "aouthdr.h"
 #include "elfhdr.h"
-#include "endian.h"
 #include "kgzip.h"
 
 static void mk_data(const struct iodesc *i, const struct iodesc *,
@@ -48,7 +50,7 @@ static void mk_data(const struct iodesc *i, const struct iodesc *,
 static int ld_elf(const struct iodesc *, const struct iodesc *,
 		  struct kgz_hdr *, const Elf32_Ehdr *);
 static int ld_aout(const struct iodesc *, const struct iodesc *,
-		   struct kgz_hdr *, const struct i386_exec *);
+		   struct kgz_hdr *, const struct exec *);
 
 /*
  * Compress executable and output it in relocatable object format.
@@ -88,18 +90,18 @@ kgzcmp(struct kgz_hdr *kh, const char *f1, const char *f2)
 	xwrite(&ido, &ahdr0, sizeof(ahdr0));
     } else {
 	struct kgz_elfhdr ehdr = elfhdr;
-	ehdr.st[KGZ_ST_KGZ_NDATA].st_size = HTOLE32(kh->nsize);
+	ehdr.st[KGZ_ST_KGZ_NDATA].st_size = htole32(kh->nsize);
 	ehdr.sh[KGZ_SH_DATA].sh_size =
-	    HTOLE32(LE32TOH(ehdr.sh[KGZ_SH_DATA].sh_size) + kh->nsize);
+	    htole32(le32toh(ehdr.sh[KGZ_SH_DATA].sh_size) + kh->nsize);
 	xseek(&ido, 0);
 	xwrite(&ido, &ehdr, sizeof(ehdr));
     }
     khle = *kh;
-    khle.dload = HTOLE32(khle.dload);
-    khle.dsize = HTOLE32(khle.dsize);
-    khle.isize = HTOLE32(khle.isize);
-    khle.entry = HTOLE32(khle.entry);
-    khle.nsize = HTOLE32(khle.nsize);
+    khle.dload = htole32(khle.dload);
+    khle.dsize = htole32(khle.dsize);
+    khle.isize = htole32(khle.isize);
+    khle.entry = htole32(khle.entry);
+    khle.nsize = htole32(khle.nsize);
     xwrite(&ido, &khle, sizeof(khle));
     xclose(&ido);
     xclose(&idi);
@@ -113,7 +115,7 @@ mk_data(const struct iodesc * idi, const struct iodesc * ido,
 	struct kgz_hdr * kh, size_t off)
 {
     union {
-	struct i386_exec ex;
+	struct exec ex;
 	Elf32_Ehdr ee;
     } hdr;
     struct stat sb;
@@ -127,7 +129,7 @@ mk_data(const struct iodesc * idi, const struct iodesc * ido,
     fmt = 0;
     if (n >= sizeof(hdr.ee) && IS_ELF(hdr.ee))
 	fmt = F_ELF;
-    else if (n >= sizeof(hdr.ex) && I386_N_GETMAGIC(hdr.ex) == ZMAGIC)
+    else if (n >= sizeof(hdr.ex) && N_GETMAGIC(hdr.ex) == ZMAGIC)
 	fmt = F_AOUT;
     if (!fmt)
 	errx(1, "%s: Format not supported", idi->fname);
@@ -216,20 +218,20 @@ ld_elf(const struct iodesc * idi, const struct iodesc * ido,
  */
 static int
 ld_aout(const struct iodesc * idi, const struct iodesc * ido,
-	struct kgz_hdr * kh, const struct i386_exec * a)
+	struct kgz_hdr * kh, const struct exec * a)
 {
     size_t load, addr;
 
-    load = addr = I386_N_TXTADDR(*a);
-    xcopy(idi, ido, LE32TOH(a->a_text), I386_N_TXTOFF(*a));
-    addr += LE32TOH(a->a_text);
-    if (I386_N_DATADDR(*a) != addr)
+    load = addr = N_TXTADDR(*a);
+    xcopy(idi, ido, le32toh(a->a_text), N_TXTOFF(*a));
+    addr += le32toh(a->a_text);
+    if (N_DATADDR(*a) != addr)
 	return -1;
-    xcopy(idi, ido, LE32TOH(a->a_data), I386_N_DATOFF(*a));
-    addr += LE32TOH(a->a_data);
+    xcopy(idi, ido, le32toh(a->a_data), N_DATOFF(*a));
+    addr += le32toh(a->a_data);
     kh->dload = load;
     kh->dsize = addr - load;
-    kh->isize = kh->dsize + LE32TOH(a->a_bss);
-    kh->entry = LE32TOH(a->a_entry);
+    kh->isize = kh->dsize + le32toh(a->a_bss);
+    kh->entry = le32toh(a->a_entry);
     return 0;
 }
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index 4f6acc8..11a20a5 100644
--- a/usr.sbin/kgzip/kgzld.c
+++ b/usr.sbin/kgzip/kgzld.c
@@ -27,6 +27,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/endian.h>
 #include <sys/wait.h>
 
 #include <err.h>