chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-filesystem.c: terminate string array elements with \0
[elogind.git]
/
src
/
shared
/
architecture.h
diff --git
a/src/shared/architecture.h
b/src/shared/architecture.h
index 7163d1fcafa0b48ec0749325f5f999536c745d7b..4821d5d289f9dda0d6f961c39093bded046be09a 100644
(file)
--- a/
src/shared/architecture.h
+++ b/
src/shared/architecture.h
@@
-23,7
+23,10
@@
#include "util.h"
#include "util.h"
-/* A cleaned up architecture definition */
+/* A cleaned up architecture definition. We don't want to get lost in
+ * processor features, models, generations or even ABIs. Hence we
+ * focus on general family, and distuignish word width and
+ * endianess. */
typedef enum Architecture {
ARCHITECTURE_X86 = 0,
typedef enum Architecture {
ARCHITECTURE_X86 = 0,
@@
-143,17
+146,25
@@
Architecture uname_architecture(void);
#elif defined(__arm__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM_BE
#elif defined(__arm__)
# if defined(WORDS_BIGENDIAN)
# define native_architecture() ARCHITECTURE_ARM_BE
-# if defined(__ARM_PCS_VFP)
-# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf"
+# if defined(__ARM_EABI__)
+# if defined(__ARM_PCS_VFP)
+# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf"
+# else
+# define LIB_ARCH_TUPLE "armeb-linux-gnueabi"
+# endif
# else
# else
-# define LIB_ARCH_TUPLE "armeb-linux-gnu
eabi
"
+# define LIB_ARCH_TUPLE "armeb-linux-gnu"
# endif
# else
# define native_architecture() ARCHITECTURE_ARM
# endif
# else
# define native_architecture() ARCHITECTURE_ARM
-# if defined(__ARM_PCS_VFP)
-# define LIB_ARCH_TUPLE "arm-linux-gnueabihf"
+# if defined(__ARM_EABI__)
+# if defined(__ARM_PCS_VFP)
+# define LIB_ARCH_TUPLE "arm-linux-gnueabihf"
+# else
+# define LIB_ARCH_TUPLE "arm-linux-gnueabi"
+# endif
# else
# else
-# define LIB_ARCH_TUPLE "arm-linux-gnu
eabi
"
+# define LIB_ARCH_TUPLE "arm-linux-gnu"
# endif
# endif
#elif defined(__sh64__)
# endif
# endif
#elif defined(__sh64__)