From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 3 Jul 2014 13:08:30 +0000 (-0400)
Subject: architecture: add tuple for old arm abi
X-Git-Tag: v215~13
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2a9899d862ec00ad2287e3bc97194054a8c9c479

architecture: add tuple for old arm abi

I don't have suitable hardware at hand, so this is based
on debian documentation:

https://wiki.debian.org/ArmEabiPort#GCC_preprocessor_macros_for_floating_point
---

diff --git a/src/shared/architecture.h b/src/shared/architecture.h
index 7163d1fca..a014ad6c1 100644
--- a/src/shared/architecture.h
+++ b/src/shared/architecture.h
@@ -150,10 +150,14 @@ Architecture uname_architecture(void);
 #    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
-#      define LIB_ARCH_TUPLE "arm-linux-gnueabi"
+#      define LIB_ARCH_TUPLE "arm-linux-gnu"
 #    endif
 #  endif
 #elif defined(__sh64__)