From 64f11aa906c9df236d89f5db98132cf08c4f1393 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sat, 17 Oct 2009 00:38:07 +0200
Subject: remove ARCH_CFLAGS, ARCH_LDFLAGS and CROSS

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 Makerules                       |  4 ++--
 Rules.mak                       | 15 +++++++++++----
 extra/Configs/Config.alpha      |  3 ---
 extra/Configs/Config.arm        |  3 ---
 extra/Configs/Config.avr32      |  3 ---
 extra/Configs/Config.bfin       |  3 ---
 extra/Configs/Config.cris       |  3 ---
 extra/Configs/Config.e1         |  8 --------
 extra/Configs/Config.frv        |  3 ---
 extra/Configs/Config.h8300      |  3 ---
 extra/Configs/Config.hppa       |  3 ---
 extra/Configs/Config.i960       |  4 ----
 extra/Configs/Config.ia64       |  3 ---
 extra/Configs/Config.microblaze |  7 -------
 extra/Configs/Config.mips       |  4 ----
 extra/Configs/Config.nios       |  7 -------
 extra/Configs/Config.nios2      |  6 ------
 extra/Configs/Config.powerpc    |  3 ---
 extra/Configs/Config.sh         |  3 ---
 extra/Configs/Config.sh64       |  3 ---
 extra/Configs/Config.sparc      |  3 ---
 extra/Configs/Config.v850       |  7 -------
 extra/Configs/Config.vax        | 10 ----------
 extra/Configs/Config.x86_64     |  3 ---
 extra/Configs/Config.xtensa     |  4 ----
 25 files changed, 13 insertions(+), 105 deletions(-)

diff --git a/Makerules b/Makerules
index 4cc3e5813..87d7f4a0a 100644
--- a/Makerules
+++ b/Makerules
@@ -184,7 +184,7 @@ maybe_exec = \
 
 CFLAGS_gen.dep = -MT $@ -MD -MP -MF $(dir $@).$(notdir $@).dep
 
-cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) \
+cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) \
 	$(CFLAGS-$(suffix $@)) \
 	$(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(<D)))) \
 	$(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) \
@@ -198,7 +198,7 @@ cmd_compile.S = $(filter-out -std=gnu99, $(cmd_compile.c)) -D__ASSEMBLER__ $(ASF
 cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
 cmd_compile.mi= $(cmd_compile.m:-c=-E -dD $(EXTRA_CPPFLAGS))
 
-cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
+cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
 cmd_strip     = $(STRIPTOOL) $(STRIP_FLAGS) $^
 cmd_t_strip   = $(STRIPTOOL) $(STRIP_FLAGS) $@
 cmd_ar        = $(AR) $(ARFLAGS) $@ $^
diff --git a/Rules.mak b/Rules.mak
index d354e7db0..039625f66 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -345,6 +345,7 @@ ifeq ($(TARGET_ARCH),arm)
 endif
 
 ifeq ($(TARGET_ARCH),mips)
+	OPTIMIZATIONS+=-mno-split-addresses
 	CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1
 	CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2
 	CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3
@@ -366,6 +367,7 @@ ifeq ($(TARGET_ARCH),mips)
 endif
 
 ifeq ($(TARGET_ARCH),nios)
+	OPTIMIZATIONS+=-funaligned-struct-hack
 	CPU_LDFLAGS-y+=-Wl,-m32
 	CPU_CFLAGS-y+=-Wl,-m32
 endif
@@ -401,6 +403,14 @@ ifeq ($(TARGET_ARCH),h8300)
 	CPU_CFLAGS-$(CONFIG_H8S)    += -ms -mint32
 endif
 
+ifeq ($(TARGET_ARCH),i960)
+	OPTIMIZATIONS+=-mh -mint32 #-fsigned-char
+endif
+
+ifeq ($(TARGET_ARCH),e1)
+	OPTIMIZATIONS+=-mgnu-param
+endif
+
 ifeq ($(TARGET_ARCH),cris)
 	CPU_LDFLAGS-$(CONFIG_CRIS)+=-Wl,-mcrislinux
 	CPU_LDFLAGS-$(CONFIG_CRISV32)+=-Wl,-mcrislinux
@@ -520,9 +530,6 @@ XWARNINGS+=-Wnonnull -Wundef
 # Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc()
 #XWARNINGS+=-Wdeclaration-after-statement
 endif
-# Seems to be unused (no ARCH_CFLAGS anywhere), delete?
-# if yes, remove after 0.9.31
-XARCH_CFLAGS=$(call qstrip,$(ARCH_CFLAGS))
 CPU_CFLAGS=$(call qstrip,$(CPU_CFLAGS-y))
 
 SSP_DISABLE_FLAGS ?= $(call check_gcc,-fno-stack-protector,)
@@ -582,7 +589,7 @@ LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
 ifeq ($(DODEBUG),y)
 CFLAGS += -O0 -g3
 else
-CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS)
+CFLAGS += $(OPTIMIZATION)
 endif
 ifeq ($(DOSTRIP),y)
 LDFLAGS += -Wl,-s
diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha
index fd2d7a8e5..144924a65 100644
--- a/extra/Configs/Config.alpha
+++ b/extra/Configs/Config.alpha
@@ -14,6 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_HAS_MMU
 	select ARCH_HAS_NO_LDSO
 	select UCLIBC_HAS_LFS
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 2b91a34d3..b060ace96 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_ANY_ENDIAN
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target ABI"
 	default CONFIG_ARM_OABI
diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32
index 8d70e6e99..cbadb4cf5 100644
--- a/extra/Configs/Config.avr32
+++ b/extra/Configs/Config.avr32
@@ -13,9 +13,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_BIG_ENDIAN
 	select FORCE_SHAREABLE_TEXT_SEGMENTS
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target CPU Type"
 	default CONFIG_AVR32_AP7
diff --git a/extra/Configs/Config.bfin b/extra/Configs/Config.bfin
index 60c397af0..a70afcfd8 100644
--- a/extra/Configs/Config.bfin
+++ b/extra/Configs/Config.bfin
@@ -12,6 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_NO_MMU
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris
index b3811d1e9..52ca0c36b 100644
--- a/extra/Configs/Config.cris
+++ b/extra/Configs/Config.cris
@@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_LITTLE_ENDIAN
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target Architecture Type"
 	default CONFIG_CRIS
diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1
index 144d9d34d..ecaa9f0e5 100644
--- a/extra/Configs/Config.e1
+++ b/extra/Configs/Config.e1
@@ -13,11 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_BIG_ENDIAN
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_SHARED
-
-config ARCH_E1 
-	bool
-	default y
-
-config ARCH_CFLAGS
-	string
-	default "-mgnu-param"
diff --git a/extra/Configs/Config.frv b/extra/Configs/Config.frv
index 63bbfed72..b389870f9 100644
--- a/extra/Configs/Config.frv
+++ b/extra/Configs/Config.frv
@@ -13,6 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_BIG_ENDIAN
 	select UCLIBC_HAS_FPU
 	select ARCH_HAS_NO_MMU
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300
index 262a0d245..ffcb9c837 100644
--- a/extra/Configs/Config.h8300
+++ b/extra/Configs/Config.h8300
@@ -26,6 +26,3 @@ config CONFIG_H8S
 	bool "H8S (edosk2674)"
 
 endchoice
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.hppa b/extra/Configs/Config.hppa
index 1c264a800..1323de228 100644
--- a/extra/Configs/Config.hppa
+++ b/extra/Configs/Config.hppa
@@ -15,6 +15,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select HAS_NO_THREADS
 	select ARCH_HAS_NO_LDSO
 	select HAVE_NO_SSP
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960
index cb325c7ea..798dae0c2 100644
--- a/extra/Configs/Config.i960
+++ b/extra/Configs/Config.i960
@@ -13,7 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_NO_MMU
 	select HAS_NO_THREADS
-
-config ARCH_CFLAGS
-	string
-	default "-mh -mint32 -fsigned-char"
diff --git a/extra/Configs/Config.ia64 b/extra/Configs/Config.ia64
index dc13319b3..ae88be777 100644
--- a/extra/Configs/Config.ia64
+++ b/extra/Configs/Config.ia64
@@ -13,6 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_MMU
 	select ARCH_HAS_NO_LDSO
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze
index a89914ef1..a426ab51e 100644
--- a/extra/Configs/Config.microblaze
+++ b/extra/Configs/Config.microblaze
@@ -12,10 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_BIG_ENDIAN
 	select ARCH_HAS_NO_MMU
-
-config ARCH_CFLAGS
-	string
-
-config CROSS
-	string
-	default "mb-"
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 8350ea427..063b07cea 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -12,10 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_ANY_ENDIAN
 
-config ARCH_CFLAGS
-	string
-	default "-mno-split-addresses"
-
 choice
 	prompt "Target ABI"
 	default CONFIG_MIPS_O32_ABI
diff --git a/extra/Configs/Config.nios b/extra/Configs/Config.nios
index f1dbd6c42..4213a4cf8 100644
--- a/extra/Configs/Config.nios
+++ b/extra/Configs/Config.nios
@@ -14,10 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_LDSO
 	select HAVE_NO_PIC
-
-config ARCH_CFLAGS
-	string
-	default "-funaligned-struct-hack"
-
-config CROSS
-	string
diff --git a/extra/Configs/Config.nios2 b/extra/Configs/Config.nios2
index 1f945556b..2310a46c0 100644
--- a/extra/Configs/Config.nios2
+++ b/extra/Configs/Config.nios2
@@ -14,9 +14,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_LDSO
 	select HAVE_NO_PIC
-
-config ARCH_CFLAGS
-	string
-
-config CROSS
-	string
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 8ba267cf1..84c442329 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -13,9 +13,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_BIG_ENDIAN
 	select ARCH_HAS_MMU
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target Processor Type"
 	default CONFIG_CLASSIC
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 8538bcc65..10e9d8b0c 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_ANY_ENDIAN
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target Processor Type"
 	default CONFIG_SH4
diff --git a/extra/Configs/Config.sh64 b/extra/Configs/Config.sh64
index 54d738e36..02535b96b 100644
--- a/extra/Configs/Config.sh64
+++ b/extra/Configs/Config.sh64
@@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_ANY_ENDIAN
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target Processor Type"
 	default CONFIG_SH5
diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc
index 3b19f9d14..abb4d7874 100644
--- a/extra/Configs/Config.sparc
+++ b/extra/Configs/Config.sparc
@@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_BIG_ENDIAN
 
-config ARCH_CFLAGS
-	string
-
 choice
 	prompt "Target Processor Type"
 	default CONFIG_SPARC_V8
diff --git a/extra/Configs/Config.v850 b/extra/Configs/Config.v850
index a668bba7c..fb3c4b144 100644
--- a/extra/Configs/Config.v850
+++ b/extra/Configs/Config.v850
@@ -13,10 +13,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_NO_MMU
 	select HAVE_NO_PIC
-
-config ARCH_CFLAGS
-	string
-
-config CROSS
-	string
-	default "v850e-elf-"
diff --git a/extra/Configs/Config.vax b/extra/Configs/Config.vax
index 4192e28c2..989eeeab5 100644
--- a/extra/Configs/Config.vax
+++ b/extra/Configs/Config.vax
@@ -12,13 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_NO_LDSO
-
-config ARCH_CFLAGS
-	string
-
-config ARCH_LDFLAGS
-	string
-
-config CROSS
-	string
-	default "vax-linux-uclibc-"
diff --git a/extra/Configs/Config.x86_64 b/extra/Configs/Config.x86_64
index 7ae357f61..1b2808893 100644
--- a/extra/Configs/Config.x86_64
+++ b/extra/Configs/Config.x86_64
@@ -12,6 +12,3 @@ config FORCE_OPTIONS_FOR_ARCH
 	default y
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_HAS_MMU
-
-config ARCH_CFLAGS
-	string
diff --git a/extra/Configs/Config.xtensa b/extra/Configs/Config.xtensa
index 75132471a..d374f91bc 100644
--- a/extra/Configs/Config.xtensa
+++ b/extra/Configs/Config.xtensa
@@ -6,7 +6,3 @@
 config TARGET_ARCH
 	string
 	default "xtensa"
-
-config ARCH_CFLAGS
-	string
-
-- 
cgit v1.2.3