[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#816048: gcc-5: Please drop fix-powerpcspe.diff, it has been merged upstream



Source: gcc-5
Version: 5.3.1-10
Severity: normal
User: debian-powerpc@lists.debian.org
Usertags: powerpcspe

Hello!

I am currently reviving the powerpcspe port. I have successfully built
binutils_2.26-4 and I'm working on gcc-5 now.

Trying to build the package as is fails with:

Applying patch fix-powerpcspe.diff
patching file src/gcc/config/rs6000/rs6000.c
Hunk #1 FAILED at 1703.
1 out of 1 hunk FAILED -- rejects in file src/gcc/config/rs6000/rs6000.c
patching file src/gcc/defaults.h
Hunk #1 succeeded at 443 with fuzz 1 (offset 5 lines).
patching file src/gcc/dwarf2cfi.c
Hunk #1 FAILED at 252.
Hunk #2 FAILED at 261.
2 out of 2 hunks FAILED -- rejects in file src/gcc/dwarf2cfi.c
patching file src/libgcc/unwind-dw2.c
Hunk #1 FAILED at 55.
1 out of 1 hunk FAILED -- rejects in file src/libgcc/unwind-dw2.c
Patch fix-powerpcspe.diff does not apply (enforce with -f)

On closer inspection, it turns out that fix-powerpcspe.diff has been applied
in the upstream gcc-5 source, albeit with some slight deviations from the
Debian patch. However, I am confident that these changes came up during
review before the changes were merged upstream.

In any case, please drop fix-powerpcspe.diff. Same applies to gcc-6.

Cheers,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913


Reply to: