Bug#735316: gcc-4.8: FTBFS on powerpcspe: Obsolete patch doesn't apply anymore
Source: gcc-4.8
Version: 4.8.2-13
Severity: wishlist
Tags: patch
User: debian-powerpcspe@breakpoint.cc
Usertags: powerpcspe
Hi,
gcc-4.8 FTBFS on powerpcspe like this:
...
Applying patch gcc-powerpcspe-ldbl-fix.diff
patching file src/gcc/config/rs6000/rs6000.c
Hunk #1 FAILED at 5428.
1 out of 1 hunk FAILED -- rejects in file src/gcc/config/rs6000/rs6000.c
Patch gcc-powerpcspe-ldbl-fix.diff does not apply (enforce with -f)
make: *** [stamps/02-patch-stamp] Error 1
...
This is because the patch collides with other (new) upstream changes that make
the patch obsolete. Consider the attached patch.
Roland
-- System Information:
Debian Release: 7.0
APT prefers unreleased
APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: powerpcspe (ppc)
Kernel: Linux 3.9.0-dirty (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
--- gcc-4.8-4.8.2/debian/patches/gcc-powerpcspe-ldbl-fix.diff 2014-01-14 17:18:32.000000000 +0100
+++ gcc-4.8-4.8.2/debian/patches/gcc-powerpcspe-ldbl-fix.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-# DP: Fix long-double-128 on powerpcspe.
-
---- a/src/gcc/config/rs6000/rs6000.c
-+++ b/src/gcc/config/rs6000/rs6000.c
-@@ -5428,12 +5428,12 @@
- break;
-
- case TFmode:
-- case TDmode:
-- case TImode:
- if (TARGET_E500_DOUBLE)
- return (SPE_CONST_OFFSET_OK (offset)
- && SPE_CONST_OFFSET_OK (offset + 8));
-
-+ case TDmode:
-+ case TImode:
- extra = 8;
- if (!worst_case)
- break;
--- gcc-4.8-4.8.2/debian/rules.patch 2014-01-14 17:18:32.000000000 +0100
+++ gcc-4.8-4.8.2/debian/rules.patch 2014-01-13 20:40:44.279095079 +0100
@@ -216,7 +216,6 @@
ifeq ($(DEB_TARGET_ARCH),powerpcspe)
debian_patches += powerpc_remove_many
debian_patches += powerpc_nofprs
- debian_patches += gcc-powerpcspe-ldbl-fix
endif
ifeq ($(DEB_TARGET_ARCH),ppc64)
Reply to: