From 56764601af17aa6fb8b70b714c6bd8bb1d9f4229 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 20 Jan 2016 01:16:09 +0000 Subject: [PATCH] fix dynamic linker path file selection for arm vs armhf the __SOFTFP__ macro which was wrongly being used does not reflect the ABI (arm vs armhf) but just the availability of floating point instructions/registers, so -mfloat-abi=softfp was wrongly being treated as armhf. __ARM_PCS_VFP is the correct predefined macro to check for the armhf EABI variant. this macro usage was corrected for the build process in commit 4918c2bb206bfaaf5a1f7d3448c2f63d5e2b7d56 but reloc.h was apparently overlooked at the time. --- arch/arm/reloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index 6227bd1e..b175711d 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -6,10 +6,10 @@ #define ENDIAN_SUFFIX "" #endif -#if __SOFTFP__ -#define FP_SUFFIX "" -#else +#if __ARM_PCS_VFP #define FP_SUFFIX "hf" +#else +#define FP_SUFFIX "" #endif #define LDSO_ARCH "arm" ENDIAN_SUFFIX FP_SUFFIX