@@ -32,16 +32,6 @@ else
BOOTAR := $(AR)
endif
-BOOTCPPFLAGS := -nostdinc $(LINUXINCLUDE)
-BOOTCPPFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include)
-
-BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \
- $(call cc-option,-mno-prefixed) $(call cc-option,-mno-pcrel) \
- $(call cc-option,-mno-mma) \
- $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \
- -pipe -fomit-frame-pointer -fno-builtin -fPIC
-
ifdef CONFIG_PPC64_BOOT_WRAPPER
BOOTTARGETFLAGS := -m64
ifdef CONFIG_PPC64_ELF_ABI_V2
@@ -77,11 +67,21 @@ else
BOOTTARGETFLAGS += -mlittle-endian
endif
-BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) -pipe
+BOOTCPPFLAGS := -nostdinc $(LINUXINCLUDE)
+BOOTCPPFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include)
-BOOTARFLAGS := -crD
+BOOTCFLAGS := -pipe $(BOOTTARGETFLAGS) \
+ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+ -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \
+ $(call cc-option,-mno-prefixed) \
+ $(call cc-option,-mno-pcrel) \
+ $(call cc-option,-mno-mma) \
+ $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \
+ -fomit-frame-pointer -fno-builtin -fPIC
-BOOTCFLAGS += $(BOOTTARGETFLAGS)
+BOOTAFLAGS := -pipe $(BOOTTARGETFLAGS) -D__ASSEMBLY__
+
+BOOTARFLAGS := -crD
ifdef CONFIG_CC_IS_CLANG
BOOTCFLAGS += $(CLANG_FLAGS)
Tidy pass over boot Makefile. Move variables together where possible. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/boot/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)