From 97d35a552ec5b6ddf7923dd2f9a8eb973526acea Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Oct 2019 15:40:16 -0400 Subject: move __BYTE_ORDER definition to alltypes.h this change is motivated by the intersection of several factors. presently, despite being a nonstandard header, endian.h is exposing the unprefixed byte order macros and functions only if _BSD_SOURCE or _GNU_SOURCE is defined. this is to accommodate use of endian.h from other headers, including bits headers, which need to define structure layout in terms of endianness. with time64 switch-over, even more headers will need to do this. at the same time, the resolution of Austin Group issue 162 makes endian.h a standard header for POSIX-future, requiring that it expose the unprefixed macros and the functions even in standards-conforming profiles. changes to meet this new requirement would break existing internal usage of endian.h by causing it to violate namespace where it's used. instead, have the arch's alltypes.h define __BYTE_ORDER, either as a fixed constant or depending on the right arch-specific predefined macros for determining endianness. explicit literals 1234 and 4321 are used instead of __LITTLE_ENDIAN and __BIG_ENDIAN so that there's no danger of getting the wrong result if a macro is undefined and implicitly evaluates to 0 at the preprocessor level. the powerpc (32-bit) bits/endian.h being removed had logic for varying endianness, but our powerpc arch has never supported that and has always been big-endian-only. this logic is not carried over to the new __BYTE_ORDER definition in alltypes.h. --- arch/sh/bits/alltypes.h.in | 6 ++++++ arch/sh/bits/endian.h | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 arch/sh/bits/endian.h (limited to 'arch/sh') diff --git a/arch/sh/bits/alltypes.h.in b/arch/sh/bits/alltypes.h.in index 618f374c..5952e9e6 100644 --- a/arch/sh/bits/alltypes.h.in +++ b/arch/sh/bits/alltypes.h.in @@ -2,6 +2,12 @@ #define _Int64 long long #define _Reg int +#if __BIG_ENDIAN__ +#define __BYTE_ORDER 4321 +#else +#define __BYTE_ORDER 1234 +#endif + #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/sh/bits/endian.h b/arch/sh/bits/endian.h deleted file mode 100644 index 2016cb20..00000000 --- a/arch/sh/bits/endian.h +++ /dev/null @@ -1,5 +0,0 @@ -#if __BIG_ENDIAN__ -#define __BYTE_ORDER __BIG_ENDIAN -#else -#define __BYTE_ORDER __LITTLE_ENDIAN -#endif -- cgit v1.2.1