diff --git a/SOURCES/binutils-verdef.patch b/SOURCES/binutils-verdef.patch new file mode 100644 index 0000000..105a138 --- /dev/null +++ b/SOURCES/binutils-verdef.patch @@ -0,0 +1,12 @@ +--- binutils.orig/bfd/elflink.c 2022-03-07 14:59:10.275856785 +0000 ++++ binutils-2.30/bfd/elflink.c 2022-03-07 15:00:19.129562705 +0000 +@@ -4578,7 +4578,8 @@ error_free_dyn: + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + +- if (elf_tdata (abfd)->verdef != NULL ++ if (h->versioned != unversioned ++ && elf_tdata (abfd)->verdef != NULL + && vernum > 1 + && definition) + h->verinfo.verdef = &elf_tdata (abfd)->verdef[vernum - 1]; diff --git a/SPECS/binutils.spec b/SPECS/binutils.spec index de1e0df..52f922e 100644 --- a/SPECS/binutils.spec +++ b/SPECS/binutils.spec @@ -43,7 +43,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?name_cross}%{?_with_debug:-debug} Version: 2.30 -Release: 113%{?dist} +Release: 114%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -611,6 +611,10 @@ Patch96: binutils-undefined-unversioned-symbols.patch # Lifetime: Fixed in 2.35 Patch97: binutils-plugin-error.patch +# Purpose: Don't set version info on unversioned symbols. +# Lifetime: Fixed in 2.37 +Patch98: binutils-verdef.patch + #---------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -845,6 +849,7 @@ using libelf instead of BFD. %patch95 -p1 %patch96 -p1 %patch97 -p1 +%patch98 -p1 # We cannot run autotools as there is an exact requirement of autoconf-2.59. # FIXME - this is no longer true. Maybe try reinstating autotool use ? @@ -1294,6 +1299,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Mar 07 2022 Nick Clifton - 2.30-114 +- DO not set version info on unversion symbols. (#2055179) + * Wed Jan 19 2022 Nick Clifton - 2.30-113 - When searching for plugins, do not complain if incompatible ones are found. (#2039117)