From 0dfc6cabe199c408e92e1c98021ee1156ea1b29f Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 29 Jun 2012 13:45:42 +0100 Subject: [PATCH] Import fix for ld/14189. (#829311) --- binutils-2.22.52.0.4-arm-plt-refcount.patch | 20 ++++++++++++++++++++ binutils.spec | 10 ++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 binutils-2.22.52.0.4-arm-plt-refcount.patch diff --git a/binutils-2.22.52.0.4-arm-plt-refcount.patch b/binutils-2.22.52.0.4-arm-plt-refcount.patch new file mode 100644 index 0000000..934460f --- /dev/null +++ b/binutils-2.22.52.0.4-arm-plt-refcount.patch @@ -0,0 +1,20 @@ +*** ../binutils-2.22.52.0.4.orig/bfd/elf32-arm.c 2012-06-29 13:29:04.526090731 +0100 +--- bfd/elf32-arm.c 2012-06-29 13:29:35.977091603 +0100 +*************** elf32_arm_check_relocs (bfd *abfd, struc +*** 12629,12635 **** + + /* If the symbol is a function that doesn't bind locally, + this relocation will need a PLT entry. */ +! root_plt->refcount += 1; + + if (!call_reloc_p) + arm_plt->noncall_refcount++; +--- 12629,12636 ---- + + /* If the symbol is a function that doesn't bind locally, + this relocation will need a PLT entry. */ +! if (root_plt->refcount != -1) +! root_plt->refcount += 1; + + if (!call_reloc_p) + arm_plt->noncall_refcount++; diff --git a/binutils.spec b/binutils.spec index e9365f8..1ec16b2 100644 --- a/binutils.spec +++ b/binutils.spec @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.22.52.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -40,8 +40,10 @@ Patch08: binutils-2.22.52.0.1-relro-on-by-default.patch Patch09: binutils-2.22.52.0.1-export-demangle.h.patch # Backport for https://fedoraproject.org/wiki/Features/DwarfCompressor Patch10: binutils-2.22.52.0.4-dwz.patch -# Import of FSF PR #14302 +# Import of patch for FSF PR #14302 Patch11: binutils-2.22.52.0.4-ar-4Gb.patch +# Import of patch for FSF PR #14189 +Patch12: binutils-2.22.52.0.4-arm-plt-refcount.patch %define gold_arches %ix86 x86_64 @@ -145,6 +147,7 @@ using libelf instead of BFD. %patch09 -p0 -b .export-demangle-h~ %patch10 -p0 -b .dwz~ %patch11 -p0 -b .ar4Gb~ +%patch12 -p0 -b .arm-plt-refcount~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -439,6 +442,9 @@ exit 0 %endif # %{isnative} %changelog +* Fri Jun 30 2012 Nick Clifton - 2.22.52.0.4-4 +- Import fix for ld/14189. (#829311) + * Fri Jun 30 2012 Nick Clifton - 2.22.52.0.4-3 - Fix handling of archives > 4Gb in size by importing patch for PR binutils/14302. (#835957)