Bug#743718: gcc-4.8: FTCBFS for powerpcspe during patch application

[Helmut Grohne <helmut@subdivi.de>]

Package: gcc-4.8
Version: 4.8.2-19
Severity: normal
Tags: patch

Hi doko,

I got a FTCBFS for powerpcspe:

Applying patch powerpc_remove_many.diff
patching file src/gcc/config/rs6000/rs6000.h
Hunk #1 succeeded at 101 (offset 3 lines).
Hunk #2 FAILED at 176.
1 out of 2 hunks FAILED -- rejects in file src/gcc/config/rs6000/rs6000.h
Patch powerpc_remove_many.diff does not apply (enforce with -f)
make: *** [stamps/02-patch-stamp] Error 1
dpkg-buildpackage: error: debian/rules control gave error exit status 2

This is a regression introduced between 4.8.2-18 and 4.8.2-19.

The patch context changed. The attached debdiff fixes the patch context.

Helmut

diff -u gcc-4.8-4.8.2/debian/changelog gcc-4.8-4.8.2/debian/changelog
--- gcc-4.8-4.8.2/debian/changelog
+++ gcc-4.8-4.8.2/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.8 (4.8.2-19.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Adapt context of powerpc_remove_many.diff to fix FTCBFS for powerpcspe.
+    Closes: #-1.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 05 Apr 2014 17:30:17 +0200
+
 gcc-4.8 (4.8.2-19) unstable; urgency=medium
 
   * Update to SVN 20140404 (r209122) from the gcc-4_8-branch.
diff -u gcc-4.8-4.8.2/debian/patches/powerpc_remove_many.diff gcc-4.8-4.8.2/debian/patches/powerpc_remove_many.diff
--- gcc-4.8-4.8.2/debian/patches/powerpc_remove_many.diff
+++ gcc-4.8-4.8.2/debian/patches/powerpc_remove_many.diff
@@ -20,9 +20,9 @@
     handling -mcpu=xxx switches.  There is a parallel list in driver-rs6000.c to
     provide the default assembler options if the user uses -mcpu=native, so if
 @@ -170,7 +176,8 @@
- %{mcpu=e500mc64: -me500mc64} \
  %{maltivec: -maltivec} \
  %{mvsx: -mvsx %{!maltivec: -maltivec} %{!mcpu*: %(asm_cpu_power7)}} \
+ %{mpower8-vector|mcrypto|mdirect-move|mhtm: %{!mcpu*: %(asm_cpu_power8)}} \
 --many"
 +" \
 +ASM_CPU_SPU_MANY_NOT_SPE