From 1a47df5d0db9861444a2b1461d654c16ddcffcfb Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 5 Nov 2019 12:30:47 +0000 Subject: [PATCH] Objcopy: Do not generate a failure exit status if note merging fails. Relates: #1767937 --- binutils-improved-note-merging.patch | 11 +++++++++++ binutils.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/binutils-improved-note-merging.patch b/binutils-improved-note-merging.patch index 8bdc785..b830728 100644 --- a/binutils-improved-note-merging.patch +++ b/binutils-improved-note-merging.patch @@ -1863,3 +1863,14 @@ diff -rupN binutils.orig/binutils/testsuite/binutils-all/objcopy.exp binutils-2. + .asciz "GA$hello world" + + .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); diff --git a/binutils.spec b/binutils.spec index bf0e6f0..9959ec8 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.33.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -765,6 +765,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue Nov 05 2019 Nick Clifton - 2.33-4 +- Objcopy: Do not generate a failure exit status if note merging fails. (#1767937) + * Wed Oct 30 2019 Nick Clifton - 2.33-3 - Fix the verification of the installed linker symlink. (#1767000)