From a0cd9b74e14d6fc7a1d758a4a68ac5d4d5383d4c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 11 Sep 2012 14:17:34 +0100 Subject: [PATCH] Rebase on 2.23.51.0.2 release. Resolves: #856119 Retire binutils-2.23.51.0.1-gold-keep.patch and binutils-rh805974.patch. --- .gitignore | 1 + binutils-2.20.51.0.10-ppc64-pie.patch | 32 +++++++++------------------ binutils.spec | 14 +++++------- sources | 2 +- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index c8a70ab..3cbed9f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ i686 *.log HOWTO build-sources +/binutils-2.23.51.0.2.tar.bz2 diff --git a/binutils-2.20.51.0.10-ppc64-pie.patch b/binutils-2.20.51.0.10-ppc64-pie.patch index f68b329..8862d18 100644 --- a/binutils-2.20.51.0.10-ppc64-pie.patch +++ b/binutils-2.20.51.0.10-ppc64-pie.patch @@ -1,24 +1,14 @@ -*** ../binutils-2.20.51.0.10.original/bfd/elf64-ppc.c 2010-08-10 14:58:09.000000000 +0100 ---- bfd/elf64-ppc.c 2010-08-10 15:03:16.000000000 +0100 +*** ../binutils-2.23.51.0.2.orig/bfd/elf64-ppc.c 2012-09-11 12:13:00.637448573 +0100 +--- bfd/elf64-ppc.c 2012-09-11 12:13:17.922449052 +0100 *************** ppc64_elf_relocate_section (bfd *output_ -*** 12757,12763 **** - else if (!SYMBOL_CALLS_LOCAL (info, &h->elf) - && !is_opd - && r_type != R_PPC64_TOC) -! outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); +*** 13523,13528 **** +--- 13523,13531 ---- + { + BFD_ASSERT (h->elf.dynindx != -1); + outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); ++ if (h->elf.dynindx == -1 ++ && h->elf.root.type == bfd_link_hash_undefweak) ++ memset (&outrel, 0, sizeof outrel); + } else { - /* This symbol is local, or marked to become local, ---- 12757,12768 ---- - else if (!SYMBOL_CALLS_LOCAL (info, &h->elf) - && !is_opd - && r_type != R_PPC64_TOC) -! { -! outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); -! if (h->elf.dynindx == -1 -! && h->elf.root.type == bfd_link_hash_undefweak) -! memset (&outrel, 0, sizeof outrel); -! } - else - { - /* This symbol is local, or marked to become local, diff --git a/binutils.spec b/binutils.spec index 5621f08..aae46b6 100644 --- a/binutils.spec +++ b/binutils.spec @@ -16,8 +16,8 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} -Version: 2.23.51.0.1 -Release: 4%{?dist} +Version: 2.23.51.0.2 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -40,10 +40,6 @@ Patch08: binutils-2.22.52.0.1-relro-on-by-default.patch Patch09: binutils-2.22.52.0.1-export-demangle.h.patch # Disable checks that config.h has been included before system headers. BZ #845084 Patch10: binutils-2.22.52.0.4-no-config-h-check.patch -# Make GOLD honour the KEEP directive in linker scripts. -Patch11: binutils-2.23.51.0.1-gold-keep.patch -# Bugfix for s390[x] IFUNC support -Patch12: binutils-rh805974.patch %define gold_arches %ix86 x86_64 @@ -147,8 +143,6 @@ using libelf instead of BFD. %endif %patch09 -p0 -b .export-demangle-h~ %patch10 -p0 -b .no-config-h-check~ -%patch11 -p0 -b .gold-keep~ -%patch12 -p1 # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -447,6 +441,10 @@ exit 0 %endif # %{isnative} %changelog +* Tue Sep 11 2012 Nick Clifton - 2.23.51.0.2-1 +- Rebase on 2.23.51.0.2 release. (#856119) +- Retire binutils-2.23.51.0.1-gold-keep.patch and binutils-rh805974.patch. + * Tue Sep 4 2012 Jeff Law 2.23.51.0.1-4 - Correctly handle PLTOFF relocs for s390 IFUNCs. diff --git a/sources b/sources index 42d4059..783c492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6328eafc6bfc59fe555a4e50b3c3055 binutils-2.23.51.0.1.tar.bz2 +438ab3c6b5d1bbbeb99e94f10aee00dd binutils-2.23.51.0.2.tar.bz2