* [binutils-gdb] PR29961, plugin-api.h: "Could not detect architecture endianess"
@ 2023-05-17 1:52 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2023-05-17 1:52 UTC (permalink / raw)
To: bfd-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=80b6c32f233ed28607643c4e4e4e2ee3399fdfd7
commit 80b6c32f233ed28607643c4e4e4e2ee3399fdfd7
Author: Alan Modra <amodra@gmail.com>
Date: Mon May 15 22:32:32 2023 +0930
PR29961, plugin-api.h: "Could not detect architecture endianess"
Found when attempting to build binutils on sparc sunos-5.8 where
sys/byteorder.h defines _BIG_ENDIAN but not any of the BYTE_ORDER
variants. This patch adds the extra tests to cope with the old
machine, and tidies the header a little.
PR 29961
plugin-api.h: When handling non-gcc or gcc < 4.6.0 include
necessary header files before testing macros. Make more use
of #elif. Test _LITTLE_ENDIAN and _BIG_ENDIAN in final tests.
Diff:
---
include/plugin-api.h | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/include/plugin-api.h b/include/plugin-api.h
index 395d5bcc598..f3cf2d8101b 100644
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -37,7 +37,7 @@
#error cannot find uint64_t type
#endif
-/* Detect endianess based on __BYTE_ORDER__ macro. */
+/* Detect endianess based on gcc's (>=4.6.0) __BYTE_ORDER__ macro. */
#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_PDP_ENDIAN__)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
@@ -47,46 +47,47 @@
#elif __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__
#define PLUGIN_PDP_ENDIAN 1
#endif
+
#else
-/* Older GCC releases (<4.6.0) can make detection from glibc macros. */
+/* Include header files to define endian macros. */
#if defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__ANDROID__)
#include <endian.h>
+
+#elif defined(__SVR4) && defined(__sun)
+#include <sys/byteorder.h>
+
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__DragonFly__) || defined(__minix)
+#include <sys/endian.h>
+
+#elif defined(__OpenBSD__)
+#include <machine/endian.h>
+#endif
+
+/* Detect endianess based on __BYTE_ORDER. */
#ifdef __BYTE_ORDER
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define PLUGIN_LITTLE_ENDIAN 1
#elif __BYTE_ORDER == __BIG_ENDIAN
#define PLUGIN_BIG_ENDIAN 1
#endif
-#endif
-#endif
-/* Include all necessary header files based on target. */
-#if defined(__SVR4) && defined(__sun)
-#include <sys/byteorder.h>
-#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__) || \
- defined(__DragonFly__) || defined(__minix)
-#include <sys/endian.h>
-#endif
-#if defined(__OpenBSD__)
-#include <machine/endian.h>
-#endif
+
/* Detect endianess based on _BYTE_ORDER. */
-#ifdef _BYTE_ORDER
+#elif defined _BYTE_ORDER
#if _BYTE_ORDER == _LITTLE_ENDIAN
#define PLUGIN_LITTLE_ENDIAN 1
#elif _BYTE_ORDER == _BIG_ENDIAN
#define PLUGIN_BIG_ENDIAN 1
#endif
-#endif
+
/* Detect based on _WIN32. */
-#if defined(_WIN32)
+#elif defined _WIN32
#define PLUGIN_LITTLE_ENDIAN 1
-#endif
+
/* Detect based on __BIG_ENDIAN__ and __LITTLE_ENDIAN__ */
-#ifdef __LITTLE_ENDIAN__
+#elif defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN
#define PLUGIN_LITTLE_ENDIAN 1
-#endif
-#ifdef __BIG_ENDIAN__
+#elif defined __BIG_ENDIAN__ || defined _BIG_ENDIAN
#define PLUGIN_BIG_ENDIAN 1
#endif
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-17 1:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-17 1:52 [binutils-gdb] PR29961, plugin-api.h: "Could not detect architecture endianess" Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).