Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board/arm: cleanup setting of ARM compiler options

Browse Source 
The ones with ARCH extension are used for setting up the KERNEL
ones, so no need to try and set both.
Also, the verdex target was not setting the ARCH one, and therefore
never configured gcc for ARMv5.
This commit is contained in:
Ithamar R. Adema 2014-02-15 11:25:43 +01:00
parent 4b47d96a77
commit f5e19a38de
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/board/beagle/BoardSetup
View File

@ -62,8 +62,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
HAIKU_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
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=soft ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)

2
build/jam/board/neo_freerunner/BoardSetup
View File

@ -69,8 +69,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
HAIKU_KERNEL_CCFLAGS += -mcpu=arm920t ;
HAIKU_KERNEL_C++FLAGS += -mcpu=arm920t ;
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ; HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=arm920t ;

2
build/jam/board/overo/BoardSetup
View File

@ -58,8 +58,6 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
HAIKU_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
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=soft ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)

2
build/jam/board/raspberry_pi/BoardSetup
View File

@ -46,8 +46,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
HAIKU_KERNEL_CCFLAGS += -mtune=arm1176jzf-s ;
HAIKU_KERNEL_C++FLAGS += -mtune=arm1176jzf-s ;
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ; HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mtune=arm1176jzf-s ;

8
build/jam/board/verdex/BoardSetup
View File

@ -68,11 +68,9 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
HAIKU_KERNEL_CCFLAGS += -mcpu=xscale -D__XSCALE__ ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
HAIKU_KERNEL_C++FLAGS += -mcpu=xscale -D__XSCALE__ ; HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
HAIKU_CCFLAGS += -mcpu=xscale -D__XSCALE__ ; TARGET_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
HAIKU_C++FLAGS += -mcpu=xscale -D__XSCALE__ ;
TARGET_ASFLAGS += -mcpu=xscale -D__XSCALE__ ;
# Workaround for ld using 32k for alignment despite forcing it in the config... # Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed! # should definitely not be needed!