diff --git a/build/jam/OverriddenJamRules b/build/jam/OverriddenJamRules index 8a11b6b844..a452da6017 100644 --- a/build/jam/OverriddenJamRules +++ b/build/jam/OverriddenJamRules @@ -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)) ; diff --git a/build/jam/board/beagle/BoardSetup b/build/jam/board/beagle/BoardSetup index 3f431ae4d4..538e2c44b5 100644 --- a/build/jam/board/beagle/BoardSetup +++ b/build/jam/board/beagle/BoardSetup @@ -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) diff --git a/build/jam/board/verdex/BoardSetup b/build/jam/board/verdex/BoardSetup index 72cbfeef7c..b07a5af6ed 100644 --- a/build/jam/board/verdex/BoardSetup +++ b/build/jam/board/verdex/BoardSetup @@ -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!