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
This commit is contained in:
parent
fc8cdd87d2
commit
112dc321de
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=111130
@ -4,5 +4,6 @@ PROG= elf2aout
|
|||||||
NOMAN=
|
NOMAN=
|
||||||
NO_WERROR?=
|
NO_WERROR?=
|
||||||
WARNS?= 5
|
WARNS?= 5
|
||||||
|
CFLAGS+= -I${.CURDIR}/../../usr.sbin/crunch/crunchide
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/elf64.h>
|
#include <sys/elf64.h>
|
||||||
#include <sys/endian.h>
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
@ -38,6 +37,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include "endian.h"
|
||||||
#define xe16toh(x) ((data == ELFDATA2MSB) ? be16toh(x) : le16toh(x))
|
#define xe16toh(x) ((data == ELFDATA2MSB) ? be16toh(x) : le16toh(x))
|
||||||
#define xe32toh(x) ((data == ELFDATA2MSB) ? be32toh(x) : le32toh(x))
|
#define xe32toh(x) ((data == ELFDATA2MSB) ? be32toh(x) : le32toh(x))
|
||||||
#define xe64toh(x) ((data == ELFDATA2MSB) ? be64toh(x) : le64toh(x))
|
#define xe64toh(x) ((data == ELFDATA2MSB) ? be64toh(x) : le64toh(x))
|
||||||
|
Loading…
Reference in New Issue
Block a user