i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable multilib for the ARM compiler build.

Browse Source 
* 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.
This commit is contained in:
PulkoMandy
2014-04-21 21:21:28 +02:00
parent bfcb02267b
commit b8058ea8ee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/board/beagle/BoardSetup
+3 -3
View File
@@ -63,8 +63,8 @@ HAIKU_BOARD_SDIMAGE_FILES =
# #
HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) 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) 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) HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)
+= -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ; += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=hard ;
build/scripts/build_cross_tools_gcc4
+3 -2
View File
@@ -33,8 +33,9 @@ m68k-*)
gccConfigureArgs="--enable-multilib" gccConfigureArgs="--enable-multilib"
;; ;;
arm-*) arm-*)
binutilsConfigureArgs="--enable-multilib" # Multilib creates a lot of confusion as the wrong libs end up being linked.
gccConfigureArgs="--enable-multilib" binutilsConfigureArgs="--disable-multilib --with-float=hard"
gccConfigureArgs="--disable-multilib --with-float=hard"
;; ;;
*) *)
binutilsConfigureArgs="--disable-multilib" binutilsConfigureArgs="--disable-multilib"