From 1f63ec7264b8be3bc25649cd59e39ee0c130af4d Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Thu, 21 Jan 2016 17:10:39 -0800 Subject: [PATCH] Revert "Move compiler optimization to the SoC" This reverts commit 778d5b11c5327be4b40c7745e9beaecfd6327e13. This patch has been identified as breaking the build when trying to manually build non-x86 applications. Change-Id: I1857745049dfef7193de58737108314b7aae01c5 Signed-off-by: Andrew Boie --- arch/arc/Makefile | 9 +++++---- arch/arc/soc/quark_se_ss/Makefile | 5 ----- arch/arm/Makefile | 10 +++++++--- arch/arm/soc/fsl_frdm_k64f/Makefile | 6 ------ arch/arm/soc/ti_lm3s6965/Makefile | 5 ----- arch/x86/Makefile | 7 +++++-- arch/x86/soc/atom/Makefile | 4 ---- arch/x86/soc/ia32/Makefile | 3 --- arch/x86/soc/quark_d2000/Makefile | 4 ---- arch/x86/soc/quark_se/Makefile | 4 ---- arch/x86/soc/quark_x1000/Makefile | 3 --- 11 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 arch/arc/soc/quark_se_ss/Makefile delete mode 100644 arch/arm/soc/fsl_frdm_k64f/Makefile delete mode 100644 arch/arm/soc/ti_lm3s6965/Makefile delete mode 100644 arch/x86/soc/atom/Makefile delete mode 100644 arch/x86/soc/ia32/Makefile delete mode 100644 arch/x86/soc/quark_d2000/Makefile delete mode 100644 arch/x86/soc/quark_se/Makefile delete mode 100644 arch/x86/soc/quark_x1000/Makefile diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 32a3e060df2..77e95c2ce99 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,6 +1,7 @@ cflags-y += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,) -cflags-$(CONFIG_LTO) = $(call cc-option,-flto,) +arch-$(CONFIG_LTO) = $(call cc-option,-flto,) +arch-$(CONFIG_CPU_ARCEM4) = $(call cc-option,-mARCv2EM) \ + $(call cc-option,-mav2em,) $(call cc-option,-mno-sdata) -include $(srctree)/arch/$(ARCH)/soc/$(SOC_NAME)/Makefile - -KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += $(arch-y) $(cflags-y) +KBUILD_AFLAGS += $(arch-y) diff --git a/arch/arc/soc/quark_se_ss/Makefile b/arch/arc/soc/quark_se_ss/Makefile deleted file mode 100644 index 517ed91b1d7..00000000000 --- a/arch/arc/soc/quark_se_ss/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -KBUILD_CFLAGS += $(call cc-option,-mARCv2EM) \ - $(call cc-option,-mav2em,) $(call cc-option,-mno-sdata) - -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b3e809621f5..9484210ca0e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,10 +1,14 @@ KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,) -include $(srctree)/arch/$(ARCH)/soc/$(SOC_NAME)/Makefile +arch-$(CONFIG_CPU_CORTEX_M3) += $(call cc-option,-mthumb -mcpu=cortex-m3) \ + $(call cc-option,-mthumb -march=armv7-m) +arch-$(CONFIG_CPU_CORTEX_M4) += $(call cc-option,-mthumb -mcpu=cortex-m4) \ + $(call cc-option,-mthumb -march=armv7e-m) -cflags-$(CONFIG_LTO) += $(call cc-option,-flto,) +cflags-$(CONFIG_LTO) = $(call cc-option,-flto,) -KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += $(cflags-y) $(arch-y) +KBUILD_AFLAGS += $(arch-y) QEMU_CPU_TYPE_arm = cortex-m3 QEMU_FLAGS_arm = -cpu $(QEMU_CPU_TYPE_arm) \ diff --git a/arch/arm/soc/fsl_frdm_k64f/Makefile b/arch/arm/soc/fsl_frdm_k64f/Makefile deleted file mode 100644 index 2b8373057f1..00000000000 --- a/arch/arm/soc/fsl_frdm_k64f/Makefile +++ /dev/null @@ -1,6 +0,0 @@ - - -KBUILD_CFLAGS += $(call cc-option,-mthumb -mcpu=cortex-m4) \ - $(call cc-option,-mthumb -march=armv7e-m) - -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/arm/soc/ti_lm3s6965/Makefile b/arch/arm/soc/ti_lm3s6965/Makefile deleted file mode 100644 index 7646acefc89..00000000000 --- a/arch/arm/soc/ti_lm3s6965/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -KBUILD_CFLAGS += $(call cc-option,-mthumb -mcpu=cortex-m3) \ - $(call cc-option,-mthumb -march=armv7-m) - -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 96994cd90ac..cb6920e37c1 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -20,9 +20,12 @@ ifneq ($(CONFIG_SSE_FP_MATH),y) cflags-y += -mno-sse endif -include $(srctree)/arch/$(ARCH)/soc/$(SOC_NAME)/Makefile +arch-$(CONFIG_CPU_ATOM) += $(call cc-option,-march=atom) \ + $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) +arch-$(CONFIG_CPU_MINUTEIA) += $(call cc-option,-march=pentium) -KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += $(cflags-y) $(arch-y) +KBUILD_AFLAGS += $(arch-y) QEMU_BIOS ?= /usr/share/qemu QEMU_CPU_TYPE_x86 = qemu32 diff --git a/arch/x86/soc/atom/Makefile b/arch/x86/soc/atom/Makefile deleted file mode 100644 index 7e659bd40bf..00000000000 --- a/arch/x86/soc/atom/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - - -KBUILD_CFLAGS += -march=atom $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/x86/soc/ia32/Makefile b/arch/x86/soc/ia32/Makefile deleted file mode 100644 index 276930ecef2..00000000000 --- a/arch/x86/soc/ia32/Makefile +++ /dev/null @@ -1,3 +0,0 @@ - -KBUILD_CFLAGS += $(call cc-option,-march=pentium) -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/x86/soc/quark_d2000/Makefile b/arch/x86/soc/quark_d2000/Makefile deleted file mode 100644 index 56e432c1914..00000000000 --- a/arch/x86/soc/quark_d2000/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - - -KBUILD_CFLAGS += -march=lakemont -mtune=lakemont -miamcu -msoft-float -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/x86/soc/quark_se/Makefile b/arch/x86/soc/quark_se/Makefile deleted file mode 100644 index 76972f63463..00000000000 --- a/arch/x86/soc/quark_se/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - - -KBUILD_CFLAGS += $(call cc-option,-march=lakemont -mtune=lakemont -miamcu -msoft-float, -march=pentium) -KBUILD_AFLAGS += $(KBUILD_CFLAGS) diff --git a/arch/x86/soc/quark_x1000/Makefile b/arch/x86/soc/quark_x1000/Makefile deleted file mode 100644 index 276930ecef2..00000000000 --- a/arch/x86/soc/quark_x1000/Makefile +++ /dev/null @@ -1,3 +0,0 @@ - -KBUILD_CFLAGS += $(call cc-option,-march=pentium) -KBUILD_AFLAGS += $(KBUILD_CFLAGS)