Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58270 )
Change subject: Makefile: copy determination test for the endian to Makefile.d ......................................................................
Makefile: copy determination test for the endian to Makefile.d
Copy the test code for endian detection in an extra directory to split it from the main flashrom code.
Change-Id: I0c2420fd60d7d6a23c94c9962b06bfd7f3c86ad8 Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.de Reviewed-on: https://review.coreboot.org/c/flashrom/+/58270 Reviewed-by: Nico Huber nico.h@gmx.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M Makefile A Makefile.d/endian_test.h D endiantest.c 3 files changed, 92 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/Makefile b/Makefile index 1e96e8a..cea5c69 100644 --- a/Makefile +++ b/Makefile @@ -164,8 +164,7 @@ # the lines below use CC itself. override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) -override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ - | tail -1)) +override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h)
ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include @@ -869,6 +868,8 @@ @if [ $(ARCH) = unknown ]; then echo Aborting.; exit 1; fi @echo Target OS is $(TARGET_OS) @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi + @echo Target endian is $(ENDIAN) + @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi ifeq ($(TARGET_OS), libpayload) @$(CC) --version 2>&1 | grep -q coreboot || \ ( echo "Warning: It seems you are not using coreboot's reference compiler."; \ diff --git a/Makefile.d/endian_test.h b/Makefile.d/endian_test.h new file mode 100644 index 0000000..36658b3 --- /dev/null +++ b/Makefile.d/endian_test.h @@ -0,0 +1,89 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2011 Carl-Daniel Hailfinger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This file determinate the target endian. It should only be used my the Makefile + */ + +#if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) +/* All x86 is little-endian. */ +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif defined (__mips) || defined (__mips__) || defined (__MIPS__) || defined (mips) +/* MIPS can be either endian. */ +#if defined (__MIPSEL) || defined (__MIPSEL__) || defined (_MIPSEL) || defined (MIPSEL) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif defined (__MIPSEB) || defined (__MIPSEB__) || defined (_MIPSEB) || defined (MIPSEB) +#define __FLASHROM_BIG_ENDIAN__ 1 +#endif +#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ + defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ + defined(_ARCH_PPC64) || defined(__ppc) +/* PowerPC can be either endian. */ +#if defined (_BIG_ENDIAN) || defined (__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined (_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(__arm) || \ + defined(__aarch64__) +/* ARM can be either endian. */ +#if defined (__ARMEB__) || defined (__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined (__ARMEL__) || defined (__LITTLE_ENDIAN__) +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#elif defined (__sparc__) || defined (__sparc) +/* SPARC is big endian in general (but allows to access data in little endian too). */ +#define __FLASHROM_BIG_ENDIAN__ 1 +#elif defined(__arc__) +#if defined(__BIG_ENDIAN__) +#define __FLASHROM_BIG_ENDIAN__ 1 +#else +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#endif +#endif + +#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) +/* If architecture-specific approaches fail try generic variants. First: BSD (works about everywhere). */ +#if !(defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) +#include <sys/param.h> +#if defined (__BYTE_ORDER) +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define __FLASHROM_LITTLE_ENDIAN__ +#elif __BYTE_ORDER == __BIG_ENDIAN +#define __FLASHROM_BIG_ENDIAN__ +#else +#error Unknown byte order! +#endif +#endif /* defined __BYTE_ORDER */ +#endif /* !IS_WINDOWS */ +#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) +/* Nonstandard libc-specific macros for determining endianness. */ +/* musl provides an endian.h as well... but it can not be detected from within C. */ +#if defined(__GLIBC__) +#include <endian.h> +#if BYTE_ORDER == LITTLE_ENDIAN +#define __FLASHROM_LITTLE_ENDIAN__ 1 +#elif BYTE_ORDER == BIG_ENDIAN +#define __FLASHROM_BIG_ENDIAN__ 1 +#endif +#endif +#endif +#endif +#if defined(__FLASHROM_LITTLE_ENDIAN__) +"little" +#else +"big" +#endif diff --git a/endiantest.c b/endiantest.c deleted file mode 100644 index a73b908..0000000 --- a/endiantest.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "platform.h" -#if defined(__FLASHROM_LITTLE_ENDIAN__) -little -#else -big -#endif