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

@@ -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) $@ $^

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

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

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

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

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

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

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"

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

extra/Configs/Config.h8300

@@ -26,6 +26,3 @@ config CONFIG_H8S
 	bool "H8S (edosk2674)"
 
 endchoice
-
-config ARCH_CFLAGS
-	string

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

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"

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

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-"

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

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

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

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

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

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

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

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-"

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-"

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

extra/Configs/Config.xtensa

@@ -6,7 +6,3 @@
 config TARGET_ARCH
 	string
 	default "xtensa"
-
-config ARCH_CFLAGS
-	string
-