From a1dc8e2d32572832a9eac1fa4dc369a3c9102ead Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 28 Oct 2020 21:18:47 +0000 Subject: [PATCH] Correction for plugin as-needed patch. Resolves: #1889763 --- binutils-plugin-as-needed.patch | 13 +++++++++++++ binutils.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/binutils-plugin-as-needed.patch b/binutils-plugin-as-needed.patch index 91dbc79..089c300 100644 --- a/binutils-plugin-as-needed.patch +++ b/binutils-plugin-as-needed.patch @@ -81,3 +81,16 @@ diff -rup binutils.orig/bfd/elflink.c binutils-2.35.1/bfd/elflink.c if (! bfd_elf_link_record_dynamic_symbol (info, h)) goto error_free_vers; +--- binutils.orig/bfd/elflink.c 2020-10-28 15:56:39.444286352 +0000 ++++ binutils-2.35.1/bfd/elflink.c 2020-10-28 21:16:49.208917109 +0000 +@@ -4972,7 +4972,9 @@ elf_link_add_object_symbols (bfd *abfd, + + if (! dynamic) + { +- if (! definition) ++ if (abfd->flags & BFD_PLUGIN) ++ ; ++ else if (! definition) + { + h->ref_regular = 1; + if (bind != STB_WEAK) diff --git a/binutils.spec b/binutils.spec index c53d3aa..a7b0c9d 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.35.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -259,6 +259,9 @@ Patch27: binutils-recursive-debuglink-following.patch # Lifetime: Fixed in 2.36 Patch28: binutils-dwarf-type-sign.patch +# XXXX +Patch29: binutils-debugging.patch + #---------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -832,6 +835,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Wed Oct 28 2020 Nick Clifton - 2.35.1-9 +- Correction for plugin as-needed patch. (#1889763) + * Tue Oct 27 2020 Nick Clifton - 2.35.1-8 - Really fix erroneous decoding of LEB128 values. (#1891171)