From fc1db0cd30fd88013715af782f15489d7fe97e64 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 14 Aug 2013 14:17:24 +1000 Subject: [PATCH] Revert "powerpc/e500: Update compilation flags with core specific options" This reverts commit 6a15ec95e0f692f96f69eb31162be0a2c4b4b4a4. The commit breaks the build of all my 64-bit embedded configs. It looks like gcc-4.7.3 doesn't know about e5500. Additionally it incorrectly does -mcpu=e5500 on a config that has both e5500 and A2 support enabled. Signed-off-by: Benjamin Herrenschmidt --- --- arch/powerpc/Makefile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 23c1b7972d2ef..967fd23ace78b 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -98,7 +98,7 @@ CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7) CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell) KBUILD_CPPFLAGS += -Iarch/$(ARCH) -KBUILD_AFLAGS += -msoft-float -Iarch/$(ARCH) +KBUILD_AFLAGS += -Iarch/$(ARCH) KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) CPP = $(CC) -E $(KBUILD_CFLAGS) @@ -132,21 +132,6 @@ ifeq ($(CONFIG_6xx),y) KBUILD_CFLAGS += -mcpu=powerpc endif -ifeq ($(CONFIG_E500),y) -ifeq ($(CONFIG_64BIT),y) -KBUILD_CFLAGS += -mcpu=e5500 -KBUILD_AFLAGS += -mcpu=e5500 -else -ifeq ($(CONFIG_PPC_E500MC),y) -KBUILD_CFLAGS += -mcpu=e500mc -KBUILD_AFLAGS += -mcpu=e500mc -else -KBUILD_CFLAGS += -mcpu=8540 -KBUILD_AFLAGS += -mcpu=8540 -endif -endif -endif - # Work around a gcc code-gen bug with -fno-omit-frame-pointer. ifeq ($(CONFIG_FUNCTION_TRACER),y) KBUILD_CFLAGS += -mno-sched-epilog @@ -154,6 +139,7 @@ endif cpu-as-$(CONFIG_4xx) += -Wa,-m405 cpu-as-$(CONFIG_ALTIVEC) += -Wa,-maltivec +cpu-as-$(CONFIG_E500) += -Wa,-me500 cpu-as-$(CONFIG_E200) += -Wa,-me200 KBUILD_AFLAGS += $(cpu-as-y) -- 2.39.5