Fix merging ppc64le notes.

This commit is contained in:
Nick Clifton 2021-02-18 12:42:56 +00:00
parent e5b60c3bbb
commit 2f53574f32
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,14 @@
--- binutils.orig/binutils/objcopy.c 2021-02-18 11:35:48.062479490 +0000
+++ binutils-2.30/binutils/objcopy.c 2021-02-18 11:36:52.207071148 +0000
@@ -2224,6 +2224,11 @@ merge_gnu_build_notes (bfd * ab
goto done;
}
+ if (start > end)
+ /* This can happen with PPC64LE binaries where empty notes are
+ encoded as start = end + 4. */
+ start = end;
+
if (is_open_note (pnote))
{
if (start)

View File

@ -39,7 +39,7 @@
Summary: A GNU collection of binary utilities
Name: binutils%{?name_cross}%{?_with_debug:-debug}
Version: 2.36.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
URL: https://sourceware.org/binutils
@ -260,6 +260,10 @@ Patch16: binutils-2.36-branch-updates.patch
# Lifetime: Permanent, but varying with each new rebase.
Patch17: binutils-testsuite-fixes.patch
# Purpose: Fix merging empty ppc64le notes.
# Lifetime: Fixed in 2.37
Patch18: binutils-ppc64le-note-merge.patch
#----------------------------------------------------------------------------
Provides: bundled(libiberty)
@ -847,6 +851,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Feb 18 2021 Nick Clifton <nickc@redhat.com> - 2.36.1-3
- Fix merging ppc64le notes. (#1928936)
* Fri Feb 12 2021 Nick Clifton <nickc@redhat.com> - 2.36.1-2
- Fix testsuite failures triggered by locally applied patches.