From c9a2fbaad109a30d62723486dcbe014eb429a002 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 27 Jul 2012 17:19:39 +0800 Subject: [PATCH] Add multiarch directory for arm hardfloat variant Arm hardfloat variant uses a different ABI than arm and uses thus a different multiarch directory for headers and libraries. This commit detect whether the system uses the hardfloat variant and configure the multiarch directory accordingly. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cdaad28..5b1e3bb 100644 --- a/Makefile +++ b/Makefile @@ -59,8 +59,10 @@ NATIVE_DEFINES+=-DWITHOUT_LIBTCC NATIVE_DEFINES+=$(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI) NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabi),-DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabi\") NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP) -# To use ARM hardfloat calling convension +# To use ARM hardfloat calling convension, uncomment the next 2 lines +# Beware: only -run and -c work so far, linking is not yet supported #NATIVE_DEFINES+=-DTCC_ARM_HARDFLOAT +#NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabihf),-DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabihf\") endif ifdef CONFIG_WIN32