summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-02-19 15:25:07 +0000
committerru <ru@FreeBSD.org>2003-02-19 15:25:07 +0000
commitcd6022184cbe69bfb445ed78032fb14ce4e9944c (patch)
treea75ed05f253fc99b248054767f99e86441c225cf
parente0c2153011e9f04c4a6984a2df6dd265c274b5df (diff)
downloadFreeBSD-src-cd6022184cbe69bfb445ed78032fb14ce4e9944c.zip
FreeBSD-src-cd6022184cbe69bfb445ed78032fb14ce4e9944c.tar.gz
Back out the removal (here too) of the "custom" version of
<sys/endian.h>. It is needed to cross-build sparc64 on RELENG_4 and to build sparc64 on say 5.0-DP1 (on systems without <sys/endian.h>). This will be revisited when we create RELENG_5. Spotted by: make universe
-rw-r--r--usr.bin/elf2aout/Makefile1
-rw-r--r--usr.bin/elf2aout/elf2aout.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile
index 24f73f8..f64004e 100644
--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@@ -4,5 +4,6 @@ PROG= elf2aout
NOMAN=
NO_WERROR?=
WARNS?= 5
+CFLAGS+= -I${.CURDIR}/../../usr.sbin/crunch/crunchide
.include <bsd.prog.mk>
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 3abf818..a9e1a01 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/elf64.h>
-#include <sys/endian.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -38,6 +37,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
+#include "endian.h"
#define xe16toh(x) ((data == ELFDATA2MSB) ? be16toh(x) : le16toh(x))
#define xe32toh(x) ((data == ELFDATA2MSB) ? be32toh(x) : le32toh(x))
#define xe64toh(x) ((data == ELFDATA2MSB) ? be64toh(x) : le64toh(x))
OpenPOWER on IntegriCloud