diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-06-03 12:24:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-06-03 12:24:50 +0200 |
| commit | 878f38de8fea2523cb18562344a2ab0dafc58017 (patch) | |
| tree | 23c7fff3a4562b4cb06cdf63b5650b09d3a55695 /arch | |
| parent | dabec3a7a165f7cce58f45c05059c4ee9e2529a9 (diff) | |
| download | barebox-878f38de8fea2523cb18562344a2ab0dafc58017.tar.gz barebox-878f38de8fea2523cb18562344a2ab0dafc58017.tar.xz | |
[kbuild] change architecture Makefiles not to overwrite
CFLAGS, instead append them to the existing CFLAGS.
Also, remove all double CFLAGS
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 2 | ||||
| -rw-r--r-- | arch/m68k/Makefile | 5 | ||||
| -rw-r--r-- | arch/ppc/Makefile | 2 | ||||
| -rw-r--r-- | arch/sandbox/Makefile | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f817906bf8..211100c6dd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -20,7 +20,7 @@ cpu-$(CONFIG_ARM926EJS) := arm926ejs TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P -CFLAGS := -fno-common -msoft-float -Os +CFLAGS += -msoft-float -Os # Add cleanup flags CPPFLAGS += -fdata-sections -ffunction-sections diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index f68da3231d..f84d76643d 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -9,7 +9,7 @@ cpu-$(CONFIG_BF561) := bf561 TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P -CFLAGS := -fno-common -Os -D__blackfin__ +CFLAGS += -Os -D__blackfin__ # -Ttext $(TEXT_BASE) KALLSYMS += --symbol-prefix=_ diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index e376354a45..995c160ee8 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -41,9 +41,8 @@ TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P AFLAGS += -gdwarf-2 -save-temps # FIXME - remove overide -CFLAGS := -Wall -Wundef -Wstrict-prototypes \ - -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \ - -fmerge-all-constants -Os +CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \ + -fmerge-all-constants -Os # Incompatible code in U-Boot for -std=c99 LDFLAGS_uboot :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc # --verbose --stats diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index 0299b794ed..230d4146de 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -15,7 +15,7 @@ cpu-$(CONFIG_ARCH_MPC5200) := mpc5xxx TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P -CFLAGS := -fno-common -Os +CFLAGS += -Os ifeq ($(incdir-y),) incdir-y := $(machine-y) diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index e15009e2ab..b1ed283745 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -11,7 +11,7 @@ lds-y := arch/sandbox/lib/u-boot.lds TEXT_BASE = $(CONFIG_TEXT_BASE) CPPFLAGS += -P -CFLAGS := -fno-common -Os -Dmalloc=u_boot_malloc \ +CFLAGS += -Os -Dmalloc=u_boot_malloc \ -Dfree=u_boot_free -Drealloc=u_boot_realloc \ -Dread=u_boot_read -Dwrite=u_boot_write \ -Dopen=u_boot_open -Dclose=u_boot_close \ |