From 90a6397236d3a17a3d7aaa2972432701359fc4b7 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Aug 2015 16:06:33 +0100 Subject: [PATCH] Retire: binutils-2.25-aarch64-fPIC-error.patch (no longer needed after rebase). Resovles: #1249969 --- binutils-2.25-aarch64-fPIC-error.patch | 53 -------------------------- binutils.spec | 11 +++--- 2 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 binutils-2.25-aarch64-fPIC-error.patch diff --git a/binutils-2.25-aarch64-fPIC-error.patch b/binutils-2.25-aarch64-fPIC-error.patch deleted file mode 100644 index f179110..0000000 --- a/binutils-2.25-aarch64-fPIC-error.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- binutils-2.25.orig/bfd/elfnn-aarch64.c 2015-07-02 14:38:44.178894336 +0100 -+++ binutils-2.25/bfd/elfnn-aarch64.c 2015-07-02 14:40:39.341603064 +0100 -@@ -4426,16 +4426,36 @@ elfNN_aarch64_final_link_relocate (reloc - signed_addend, weak_undef_p); - break; - -+ case BFD_RELOC_AARCH64_16_PCREL: -+ case BFD_RELOC_AARCH64_32_PCREL: -+ case BFD_RELOC_AARCH64_64_PCREL: -+ case BFD_RELOC_AARCH64_ADR_LO21_PCREL: -+ case BFD_RELOC_AARCH64_ADR_HI21_PCREL: -+ case BFD_RELOC_AARCH64_ADR_HI21_NC_PCREL: -+ case BFD_RELOC_AARCH64_LD_LO19_PCREL: -+ if (info->shared -+ && (input_section->flags & SEC_ALLOC) != 0 -+ && (input_section->flags & SEC_READONLY) != 0 -+ && h != NULL -+ && !h->def_regular) -+ { -+ int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; -+ -+ (*_bfd_error_handler) -+ (_("%B: relocation %s against external symbol `%s' can not be used" -+ " when making a shared object; recompile with -fPIC"), -+ input_bfd, elfNN_aarch64_howto_table[howto_index].name, -+ h->root.root.string); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ /* Fall through. */ - case BFD_RELOC_AARCH64_16: - #if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: - #endif - case BFD_RELOC_AARCH64_ADD_LO12: -- case BFD_RELOC_AARCH64_ADR_LO21_PCREL: -- case BFD_RELOC_AARCH64_ADR_HI21_PCREL: -- case BFD_RELOC_AARCH64_ADR_HI21_NC_PCREL: - case BFD_RELOC_AARCH64_BRANCH19: -- case BFD_RELOC_AARCH64_LD_LO19_PCREL: - case BFD_RELOC_AARCH64_LDST8_LO12: - case BFD_RELOC_AARCH64_LDST16_LO12: - case BFD_RELOC_AARCH64_LDST32_LO12: -@@ -4451,9 +4471,6 @@ elfNN_aarch64_final_link_relocate (reloc - case BFD_RELOC_AARCH64_MOVW_G2: - case BFD_RELOC_AARCH64_MOVW_G2_NC: - case BFD_RELOC_AARCH64_MOVW_G3: -- case BFD_RELOC_AARCH64_16_PCREL: -- case BFD_RELOC_AARCH64_32_PCREL: -- case BFD_RELOC_AARCH64_64_PCREL: - case BFD_RELOC_AARCH64_TSTBR14: - value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value, - signed_addend, weak_undef_p); diff --git a/binutils.spec b/binutils.spec index f2de66f..4b4461d 100644 --- a/binutils.spec +++ b/binutils.spec @@ -19,7 +19,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.25.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -52,8 +52,6 @@ Patch12: binutils-2.25-kernel-ld-r.patch Patch13: binutils-2.23.2-aarch64-em.patch # Fix detections little endian PPC shared libraries Patch14: binutils-2.24-ldforcele.patch -# Issue an error message when attempting to resolve PC-relative dynamic relocs in non-PIC objects. -Patch15: binutils-2.25-aarch64-fPIC-error.patch Provides: bundled(libiberty) @@ -177,9 +175,6 @@ using libelf instead of BFD. %ifarch ppc64le %patch14 -p1 -b .ldforcele~ %endif -%ifarch aarch64 -%patch15 -p1 -b .aarch64-fpic~ -%endif # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -493,6 +488,10 @@ exit 0 %endif # %{isnative} %changelog +* Tue Aug 04 2015 Nick Clifton - 2.25.1-2 +- Retire: binutils-2.25-aarch64-fPIC-error.patch +- Resovles: 1249969 + * Thu Jul 23 2015 Nick Clifton - 2.25.1-1 - Rebase on FSF binutils 2.25.1 release. - Retire: binutils-2.25-x86_64-pie-relocs.patch