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

Don't define __ARM*__ for Clang

Browse Source 
I have a patch for Clang ready that I will upstream instead.
This commit is contained in:
Jonathan Schleifer
2015-11-08 16:38:57 +01:00
parent f7ededa623
commit bfe60c1e5a
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+1 -4
View File
@@ -43,10 +43,7 @@ rule ArchitectureSetup architecture
local cpu = $(HAIKU_CPU_$(architecture)) ; local cpu = $(HAIKU_CPU_$(architecture)) ;
if $(cpu) = arm { if $(cpu) = arm {
if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 { if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 {
# Clang only defines __ARMEL__ when using -target arm-haiku-unknown
gccBaseFlags += -D__ARM__=1 ;
} else {
# For stackcrawls - not supported by Clang # For stackcrawls - not supported by Clang
gccBaseFlags += -mapcs-frame ; gccBaseFlags += -mapcs-frame ;
} }
build/jam/board/rpi2/BoardSetup
-3
View File
@@ -59,9 +59,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 128 ;
# #
local flags = -march=armv7-a -mfloat-abi=hard ; local flags = -march=armv7-a -mfloat-abi=hard ;
if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
flags += -D__ARM_ARCH__=7 ;
}
HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ; HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;