Rebase on 2.23.51.0.2 release.

Resolves: #856119
Retire binutils-2.23.51.0.1-gold-keep.patch and binutils-rh805974.patch.
This commit is contained in:
Nick Clifton 2012-09-11 14:17:34 +01:00
parent 23113b3c7c
commit a0cd9b74e1
4 changed files with 19 additions and 30 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ i686
*.log
HOWTO
build-sources
/binutils-2.23.51.0.2.tar.bz2

View File

@ -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,

View File

@ -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 <nickc@redhat.com> - 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 <law@redhat.com> 2.23.51.0.1-4
- Correctly handle PLTOFF relocs for s390 IFUNCs.

View File

@ -1 +1 @@
a6328eafc6bfc59fe555a4e50b3c3055 binutils-2.23.51.0.1.tar.bz2
438ab3c6b5d1bbbeb99e94f10aee00dd binutils-2.23.51.0.2.tar.bz2