From 2941b28080fff82503484a99c3fa740a01bb30cc Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 7 Jul 2015 23:37:11 +0200 Subject: toolchain.inc: Don't overwrite architecture specific CFLAGS For almost all platforms the CFLAGS_ specified in .xcompile were overwritten by toolchain.inc, effectively breaking the build in different places and in subtle ways. Change-Id: I8e1db0eee7ca417ec56ed2156ae1b0b318e57e81 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/10831 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- toolchain.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/toolchain.inc b/toolchain.inc index a26da477a8..3e28bb9d0b 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -62,17 +62,17 @@ ARCHDIR-arm64 := arm64 ARCHDIR-riscv := riscv ARCHDIR-mips := mips -CFLAGS_arm := -ffunction-sections -fdata-sections +CFLAGS_arm += -ffunction-sections -fdata-sections -CFLAGS_arm64 := -ffunction-sections -fdata-sections +CFLAGS_arm64 += -ffunction-sections -fdata-sections -CFLAGS_mips := -mips32r2 -G 0 -ffunction-sections -fdata-sections +CFLAGS_mips += -mips32r2 -G 0 -ffunction-sections -fdata-sections CFLAGS_mips += -mno-abicalls -fno-pic CFLAGS_x86_32 += -ffunction-sections -fdata-sections -CFLAGS_riscv := -ffunction-sections -fdata-sections +CFLAGS_riscv += -ffunction-sections -fdata-sections -CFLAGS_x86_64 := -mcmodel=large +CFLAGS_x86_64 += -mcmodel=large toolchain_to_dir = \ $(foreach arch,$(ARCH_SUPPORTED),\ -- cgit v1.2.3