Objcopy: Do not generate a failure exit status if note merging fails.

Relates: #1767937
This commit is contained in:
Nick Clifton 2019-11-05 12:30:47 +00:00
parent dd47049996
commit 1a47df5d0d
2 changed files with 15 additions and 1 deletions

View File

@ -1863,3 +1863,14 @@ diff -rupN binutils.orig/binutils/testsuite/binutils-all/objcopy.exp binutils-2.
+ .asciz "GA$hello world" + .asciz "GA$hello world"
+ +
+ .popsection + .popsection
--- binutils.orig/binutils/objcopy.c 2019-11-05 12:01:47.440187230 +0000
+++ binutils-2.33.1/binutils/objcopy.c 2019-11-05 12:02:51.346706812 +0000
@@ -2526,7 +2526,7 @@ merge_gnu_build_notes (bfd * ab
{
bfd_set_error (bfd_error_bad_value);
bfd_nonfatal_message (NULL, abfd, sec, err);
- status = 1;
+ /* status = 1; */
}
free (pnotes);

View File

@ -2,7 +2,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.33.1 Version: 2.33.1
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -765,6 +765,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Tue Nov 05 2019 Nick Clifton <nickc@redhat.com> - 2.33-4
- Objcopy: Do not generate a failure exit status if note merging fails. (#1767937)
* Wed Oct 30 2019 Nick Clifton <nickc@redhat.com> - 2.33-3 * Wed Oct 30 2019 Nick Clifton <nickc@redhat.com> - 2.33-3
- Fix the verification of the installed linker symlink. (#1767000) - Fix the verification of the installed linker symlink. (#1767000)