escape: beef up new systemd-escape tool

[elogind.git] / src / shared / architecture.h

diff --git a/src/shared/architecture.h b/src/shared/architecture.h
index 6a3f0b2d4b51f9d436bbaed33f25606c522a9a29..4821d5d289f9dda0d6f961c39093bded046be09a 100644 (file)
--- a/src/shared/architecture.h
+++ b/src/shared/architecture.h
@@ -23,7 +23,10 @@
 
 #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,
@@ -143,14 +146,25 @@ Architecture uname_architecture(void);
 #elif defined(__arm__)
 #  if defined(WORDS_BIGENDIAN)
 #    define native_architecture() ARCHITECTURE_ARM_BE
-#    error "Missing LIB_ARCH_TUPLE for ARM_BE"
+#    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
+#      define LIB_ARCH_TUPLE "armeb-linux-gnu"
+#    endif
 #  else
-#    if defined(__ARM_PCS_VFP)
-#      define native_architecture() ARCHITECTURE_ARM
-#      define LIB_ARCH_TUPLE "arm-linux-gnueabihf"
+#    define native_architecture() ARCHITECTURE_ARM
+#    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
-#      define native_architecture() ARCHITECTURE_ARM
-#      define LIB_ARCH_TUPLE "arm-linux-gnueabi"
+#      define LIB_ARCH_TUPLE "arm-linux-gnu"
 #    endif
 #  endif
 #elif defined(__sh64__)