From b8058ea8eeb104adb62e53820192f57a80d42e98 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Mon, 21 Apr 2014 21:17:19 +0200 Subject: [PATCH] Disable multilib for the ARM compiler build. * This avoids mixup of the soft/hard float libs * It also means we can use the hard-float libs for targets that supports it * Again, we could introduce an arm_softfp compiler for targets that don't have floating point support, with a different gcc build. --- build/jam/board/beagle/BoardSetup | 6 +++--- build/scripts/build_cross_tools_gcc4 | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/jam/board/beagle/BoardSetup b/build/jam/board/beagle/BoardSetup index 538e2c44b5..6c588d15d1 100644 --- a/build/jam/board/beagle/BoardSetup +++ b/build/jam/board/beagle/BoardSetup @@ -63,8 +63,8 @@ HAIKU_BOARD_SDIMAGE_FILES = # HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) - += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ; + += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=hard ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) - += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ; + += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=hard ; HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) - += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ; + += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=hard ; diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index e6f5cd2be4..62854a0505 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -33,8 +33,9 @@ m68k-*) gccConfigureArgs="--enable-multilib" ;; arm-*) - binutilsConfigureArgs="--enable-multilib" - gccConfigureArgs="--enable-multilib" + # Multilib creates a lot of confusion as the wrong libs end up being linked. + binutilsConfigureArgs="--disable-multilib --with-float=hard" + gccConfigureArgs="--disable-multilib --with-float=hard" ;; *) binutilsConfigureArgs="--disable-multilib"