From 112dc321de91a250f129ae3e6d8076de574cf15c Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 19 Feb 2003 15:25:07 +0000
Subject: [PATCH] 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
---
 usr.bin/elf2aout/Makefile   | 1 +
 usr.bin/elf2aout/elf2aout.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile
index 24f73f8353e8..f64004ed3320 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 3abf8188fcaf..a9e1a010503b 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))