chiark / gitweb /
architecture: also add tuples for old ARM BE ABI
authorLennart Poettering <lennart@poettering.net>
Thu, 3 Jul 2014 13:59:32 +0000 (15:59 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 3 Jul 2014 13:59:32 +0000 (15:59 +0200)
src/shared/architecture.h

index a014ad6..4821d5d 100644 (file)
 
 #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,10 +146,14 @@ Architecture uname_architecture(void);
 #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
-#      define LIB_ARCH_TUPLE "armeb-linux-gnueabi"
+#      define LIB_ARCH_TUPLE "armeb-linux-gnu"
 #    endif
 #  else
 #    define native_architecture() ARCHITECTURE_ARM