[powerpcspe] Fix -mcpu= options for SPE-only compiler

debian/changelog

@@ -11,6 +11,7 @@ linux (4.19.12-2) UNRELEASED; urgency=medium
   * [riscv64] tools/include/.../bitsperlong.h: Add support for riscv
   * [powerpc,powerpcspe,ppc64] linux-config: Eliminate config.*_bootwrapper.gz
     files
+  * [powerpcspe] Fix -mcpu= options for SPE-only compiler
 
  -- Uwe Kleine-König <ukleinek@debian.org>  Sun, 23 Dec 2018 17:28:52 +0100
 

debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch

@@ -0,0 +1,41 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 26 Dec 2018 00:00:40 +0000
+Subject: powerpc: Fix -mcpu= options for SPE-only compiler
+
+GCC for Debian's "powerpcspe" architecture only supports 32-bit
+SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
+error.
+
+* Change the test for a biarch compiler to pass both the -m32 and -m64
+  options, so that it doesn't catch 32-bit-only compilers
+* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -12,7 +12,7 @@
+ # Rewritten by Cort Dougan and Paul Mackerras
+ #
+ 
+-HAS_BIARCH	:= $(call cc-option-yn, -m32)
++HAS_BIARCH	:= $(call cc-option-yn, -m32 -m64)
+ 
+ # Set default 32 bits cross compilers for vdso and boot wrapper
+ CROSS32_COMPILE ?=
+@@ -148,6 +148,7 @@ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-opti
+ CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 $(MULTIPLEWORD)
+ CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option,-mno-readonly-in-sdata)
+ 
++ifdef CONFIG_PPC64
+ ifdef CONFIG_PPC_BOOK3S_64
+ ifdef CONFIG_CPU_LITTLE_ENDIAN
+ CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
+@@ -159,6 +160,7 @@ endif
+ else
+ CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
+ endif
++endif
+ 
+ ifdef CONFIG_MPROFILE_KERNEL
+ 	CC_FLAGS_FTRACE := -pg -mprofile-kernel

debian/patches/series

@@ -79,6 +79,7 @@ bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
 bugfix/x86/x86-32-disable-3dnow-in-generic-config.patch
 bugfix/x86/x86-mm-Fix-guard-hole-handling.patch
 bugfix/arm/gpio-mvebu-only-fail-on-missing-clk-if-pwm-is-actual.patch
+bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch
 
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch