rpms/binutils
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove debugging fprintf statement accidentally left in patch.

Browse Source 
Resolves: #1645828
This commit is contained in:
Nick Clifton 2018-11-15 14:35:14 +00:00
parent 2c1a3f99f0
commit b094c0da4a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binutils-note-merge-improvements.patch
View File

@ -9,7 +9,7 @@
must be preserved. must be preserved.
4. Combine the numeric value of any NT_GNU_BUILD_ATTRIBUTE_OPEN notes 4. Combine the numeric value of any NT_GNU_BUILD_ATTRIBUTE_OPEN notes
of type GNU_BUILD_ATTRIBUTE_STACK_SIZE. of type GNU_BUILD_ATTRIBUTE_STACK_SIZE.
@@ -2182,16 +2182,48 @@ merge_gnu_build_notes (bfd * abfd, asect @@ -2182,16 +2182,47 @@ merge_gnu_build_notes (bfd * abfd, asect
its description field is empty then the nearest preceeding OPEN note its description field is empty then the nearest preceeding OPEN note
with a non-empty description field must also be preserved *OR* the with a non-empty description field must also be preserved *OR* the
description field of the note must be changed to contain the starting description field of the note must be changed to contain the starting
@ -45,7 +45,6 @@
+ && back->note.namesz == pnote->note.namesz + && back->note.namesz == pnote->note.namesz
+ && memcmp (back->note.namedata, pnote->note.namedata, pnote->note.namesz) == 0) + && memcmp (back->note.namedata, pnote->note.namedata, pnote->note.namesz) == 0)
+ { + {
+ fprintf (stderr, "DUP FUNXC\n");
+ duplicate_found = TRUE; + duplicate_found = TRUE;
+ pnote->note.type = 0; + pnote->note.type = 0;
+ break; + break;

5
binutils.spec
View File

@ -69,7 +69,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug} Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.31.1 Version: 2.31.1
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -775,6 +775,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Thu Nov 15 2018 Nick Clifton <nickc@redhat.com> - 2.31.1-16
- Remove debugging fprintf statement accidentally left in patch. (#1645828)
* Fri Oct 12 2018 Nick Clifton <nickc@redhat.com> - 2.31.1-15 * Fri Oct 12 2018 Nick Clifton <nickc@redhat.com> - 2.31.1-15
- Allow OS specific sections in section groups. (#1639485) - Allow OS specific sections in section groups. (#1639485)