rpms/binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix another problem with note merging.

Browse source
This commit is contained in:
Nick Clifton 2021-02-22 16:08:22 +00:00
commit 9da135ced5
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
binutils-ppc64le-note-merge.patch
View file

@ -12,3 +12,31 @@
if (is_open_note (pnote))
{
if (start)
--- binutils.orig/binutils/objcopy.c 2021-02-22 10:44:20.107263089 +0000
+++ binutils-2.35.1/binutils/objcopy.c 2021-02-22 16:07:12.134344229 +0000
@@ -2243,23 +2243,8 @@ merge_gnu_build_notes (bfd * ab
break;
case 8:
- if (! is_64bit (abfd))
- {
- start = bfd_get_32 (abfd, pnote->note.descdata);
- end = bfd_get_32 (abfd, pnote->note.descdata + 4);
- }
- else
- {
- start = bfd_get_64 (abfd, pnote->note.descdata);
- /* FIXME: For version 1 and 2 notes we should try to
- calculate the end address by finding a symbol whose
- value is START, and then adding in its size.
-
- For now though, since v1 and v2 was not intended to
- handle gaps, we chose an artificially large end
- address. */
- end = (bfd_vma) -1;
- }
+ start = bfd_get_32 (abfd, pnote->note.descdata);
+ end = bfd_get_32 (abfd, pnote->note.descdata + 4);
break;
case 16:

5
binutils.spec
View file

@ -39,7 +39,7 @@
Summary: A GNU collection of binary utilities
Name: binutils%{?name_cross}%{?_with_debug:-debug}
Version: 2.35.1
Release: 37%{?dist}
Release: 38%{?dist}
License: GPLv3+
URL: https://sourceware.org/binutils
@ -935,6 +935,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Mon Feb 22 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-38
- Fix another problem with note merging.
* Mon Feb 22 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-37
- Stop readelf from warning about gaps in notes. (#1931356)