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

ArchitectureRules: Pass -march / -mcpu flags to the assembler also.

Browse Source 
Fixes #14317.
This commit is contained in:
Augustin Cavalier
2018-08-11 15:18:36 -04:00
parent eef7e3f1f8
commit cf10fee2c1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+6 -9
View File
@@ -50,12 +50,14 @@ rule ArchitectureSetup architecture
} }
# default architecture tuning # default architecture tuning
# TODO: Do we want x86_gcc2 -march=pentium here?
local cpu = $(HAIKU_CPU_$(architecture)) ; local cpu = $(HAIKU_CPU_$(architecture)) ;
local archFlags ;
switch $(cpu) { switch $(cpu) {
case arm : case ppc : archFlags += -mcpu=440fp ;
ccBaseFlags += -march=armv7-a -mfloat-abi=hard ; case arm : archFlags += -march=armv7-a -mfloat-abi=hard ;
case x86 : archFlags += -march=pentium ;
} }
ccBaseFlags += $(archFlags) ;
if $(cpu) = arm { if $(cpu) = arm {
if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 { if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 {
@@ -78,6 +80,7 @@ rule ArchitectureSetup architecture
HAIKU_CCFLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ; HAIKU_CCFLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ;
HAIKU_C++FLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ; HAIKU_C++FLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ;
HAIKU_ASFLAGS_$(architecture) += $(archFlags) -nostdinc ;
# strip is required # strip is required
if ! $(HAIKU_STRIP_$(architecture)) { if ! $(HAIKU_STRIP_$(architecture)) {
@@ -111,9 +114,6 @@ rule ArchitectureSetup architecture
# set variables for gcc header options # set variables for gcc header options
SetIncludePropertiesVariables HAIKU : _$(architecture) ; SetIncludePropertiesVariables HAIKU : _$(architecture) ;
# assembler flags
HAIKU_ASFLAGS_$(architecture) = ;
# C/C++ flags # C/C++ flags
if $(gccVersion[1]) >= 4 { if $(gccVersion[1]) >= 4 {
HAIKU_C++FLAGS_$(architecture) += -Wno-deprecated ; HAIKU_C++FLAGS_$(architecture) += -Wno-deprecated ;
@@ -373,9 +373,6 @@ rule KernelArchitectureSetup architecture
HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ; HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ;
case x86 : case x86 :
HAIKU_KERNEL_CCFLAGS += -march=pentium ;
HAIKU_KERNEL_C++FLAGS += -march=pentium ;
# EFI Bootloader # EFI Bootloader
if $(HAIKU_BOOT_PLATFORM) = efi { if $(HAIKU_BOOT_PLATFORM) = efi {
HAIKU_BOOT_CCFLAGS += -mno-red-zone -maccumulate-outgoing-args ; HAIKU_BOOT_CCFLAGS += -mno-red-zone -maccumulate-outgoing-args ;