From 52947e584458c3e4119717f8cd637819fac81a60 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 29 Jan 2013 18:13:08 +0100 Subject: [PATCH] Favor arm hardfloat over arm softfloat. Favor ARM hardfloat over ARM softfloat calling convention. In particular, this solve the problem of the raspbian distribution where the softfloat ld.so pathname (lib/ld-linux.so.3) is actually a symlink to the hardfloat ld.so pathname (/lib/arm-linux-gnueabihf/ld-2.13.so). --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d155f45c..d2574640 100644 --- a/Makefile +++ b/Makefile @@ -57,12 +57,12 @@ endif ifeq ($(ARCH),arm) NATIVE_DEFINES=-DTCC_TARGET_ARM NATIVE_DEFINES+=-DWITHOUT_LIBTCC -ifneq (,$(wildcard /lib/ld-linux.so.3)) -NATIVE_DEFINES+=-DTCC_ARM_EABI -NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabi), -DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabi\") -else ifneq (,$(wildcard /lib/ld-linux-armhf.so.3 /lib/arm-linux-gnueabihf/ld-linux.so.3)) +ifneq (,$(wildcard /lib/ld-linux-armhf.so.3 /lib/arm-linux-gnueabihf/ld-linux.so.3)) NATIVE_DEFINES+=-DTCC_ARM_EABI -DTCC_ARM_HARDFLOAT NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabihf),-DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabihf\") +else ifneq (,$(wildcard /lib/ld-linux.so.3)) +NATIVE_DEFINES+=-DTCC_ARM_EABI +NATIVE_DEFINES+=$(if $(wildcard /lib/arm-linux-gnueabi), -DCONFIG_MULTIARCHDIR=\"arm-linux-gnueabi\") endif NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP) endif -- 2.11.4.GIT