-# 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