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

5 files changed, 70 insertions, 258 deletions

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>