Fix definition and use of target ASFLAGS.

* ArchitectureRules define a variable named HAIKU_ASFLAGS, so other
Jamfiles can append to it.
* But, TARGET_ASFLAGS was used instead in the single place where we
tried to make use of this (the verdex BoardSetup), and in the As rule
* Moreover, the As rule used $(architecture) instead of
$(TARGET_PACKAGING_ARCH) (I suspect a bogus copypaste?). So, it never
actually made use of the flags

With this working, add the proper flags to the BeagleBoard BoardSetup,
so we implement atomic operations the ARMv7 way (no need to syscall).
This helps with compiling, as the As and Cc/Cpp rules now agree on the
defines and the atomic implementation to use.
This commit is contained in:
Adrien Destugues
2014-02-23 15:50:11 +01:00
parent cbc568498d
commit 81e7f1e992
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -197,7 +197,7 @@ rule As
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
} else {
flags = [ on $(1) return $(TARGET_ASFLAGS_$(architecture))
flags = [ on $(1) return $(HAIKU_ASFLAGS_$(TARGET_PACKAGING_ARCH))
$(ASFLAGS) ] ;
CC on $(1) = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
+2
View File
@@ -62,6 +62,8 @@ HAIKU_BOARD_SDIMAGE_FILES =
# gcc flags for the specific cpu
#
HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH)
+= -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH)
+= -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH)
+1 -1
View File
@@ -70,7 +70,7 @@ HAIKU_BOARD_SDIMAGE_FILES =
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
HAIKU_C++FLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
TARGET_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += -mcpu=xscale -D__XSCALE__ ;
# Workaround for ld using 32k for alignment despite forcing it in the config...
# should definitely not be needed!