[systemd-commits] src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/shared/architecture.h |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2a9899d862ec00ad2287e3bc97194054a8c9c479
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Jul 3 09:08:30 2014 -0400

    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 7163d1f..a014ad6 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__)