1*4882a593SmuzhiyunFrom a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Ben Hutchings <ben@decadent.org.uk> 3*4882a593SmuzhiyunDate: Wed, 26 Dec 2018 00:00:40 +0000 4*4882a593SmuzhiyunSubject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunGCC for Debian's "powerpcspe" architecture only supports 32-bit 7*4882a593SmuzhiyunSPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal 8*4882a593Smuzhiyunerror. 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun* Change the test for a biarch compiler to pass both the -m32 and -m64 11*4882a593Smuzhiyun options, so that it doesn't catch 32-bit-only compilers 12*4882a593Smuzhiyun* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Ben Hutchings <ben@decadent.org.uk> 15*4882a593Smuzhiyun[Romain: Patch from Debian repository: 16*4882a593Smuzhiyunhttps://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch] 17*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun arch/powerpc/Makefile | 4 +++- 20*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile 23*4882a593Smuzhiyunindex 5c8c06215dd4..e3dbea6d7ae0 100644 24*4882a593Smuzhiyun--- a/arch/powerpc/Makefile 25*4882a593Smuzhiyun+++ b/arch/powerpc/Makefile 26*4882a593Smuzhiyun@@ -12,7 +12,7 @@ 27*4882a593Smuzhiyun # Rewritten by Cort Dougan and Paul Mackerras 28*4882a593Smuzhiyun # 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun-HAS_BIARCH := $(call cc-option-yn, -m32) 31*4882a593Smuzhiyun+HAS_BIARCH := $(call cc-option-yn, -m32 -m64) 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun # Set default 32 bits cross compilers for vdso and boot wrapper 34*4882a593Smuzhiyun CROSS32_COMPILE ?= 35*4882a593Smuzhiyun@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun+ifdef CONFIG_PPC64 40*4882a593Smuzhiyun ifdef CONFIG_PPC_BOOK3S_64 41*4882a593Smuzhiyun ifdef CONFIG_CPU_LITTLE_ENDIAN 42*4882a593Smuzhiyun CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 43*4882a593Smuzhiyun@@ -175,6 +176,7 @@ endif 44*4882a593Smuzhiyun else 45*4882a593Smuzhiyun CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 46*4882a593Smuzhiyun endif 47*4882a593Smuzhiyun+endif 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun ifdef CONFIG_FUNCTION_TRACER 50*4882a593Smuzhiyun CC_FLAGS_FTRACE := -pg 51*4882a593Smuzhiyun-- 52*4882a593Smuzhiyun2.17.1 53*4882a593Smuzhiyun 54