Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-06-20 09:57:08 +03:00
commit f615db3f46
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,20 @@
--- binutils.orig/gold/aarch64.cc 2019-05-21 11:24:07.642560743 +0100
+++ binutils-2.32/gold/aarch64.cc 2019-05-21 11:25:02.425157682 +0100
@@ -6496,6 +6496,17 @@ Target_aarch64<size, big_endian>::Scan::
gold_error(_("%s: unsupported reloc %u in pos independent link."),
object->name().c_str(), r_type);
}
+ // Make a PLT entry if necessary.
+ if (gsym->needs_plt_entry())
+ {
+ target->make_plt_entry(symtab, layout, gsym);
+ // Since this is not a PC-relative relocation, we may be
+ // taking the address of a function. In that case we need to
+ // set the entry in the dynamic symbol table to the address of
+ // the PLT entry.
+ if (gsym->is_from_dynobj() && !parameters->options().shared())
+ gsym->set_needs_dynsym_value();
+ }
break;
case elfcpp::R_AARCH64_LD_PREL_LO19: // 273

View File

@ -85,7 +85,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.32
Release: 13.0.riscv64%{?dist}
Release: 14.0.riscv64%{?dist}
License: GPLv3+
URL: https://sourceware.org/binutils
@ -206,10 +206,16 @@ Patch18: binutils-disassembling-efi-files.patch
# Lifetime: Fixed in 2.33
Patch19: binutils-CVE-2019-9071.patch
# Purpose: Have the GOLD linker for AArch64 generate PLT entries for MOVW_ABS
# relocations if necessary.
# Lifetime: Fixed in 2.33
Patch20: binutils-aarch64-gold-PLT-for-MOVW_ABS.patch
# Purpose: Fix object files without ELF headers on RISC-V
# Lifetime: Fixed in master (2.33)
# Commit: 87f98bacb76001157d5a26555a41738ac3841a56
Patch25: binutils-2.32-backport-24389.patch
#----------------------------------------------------------------------------
Provides: bundled(libiberty)
@ -355,6 +361,7 @@ Conflicts: gcc-c++ < 4.0.0
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch25 -p1
@ -753,9 +760,12 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Sat May 04 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2.32-13.0.riscv64
* Thu Jun 20 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 2.32-14.0.riscv64
- Backport fix for binary objects without ELF headers flags set on RISC-V
* Tue May 21 2019 Nick Clifton <nickc@redhat.com> - 2.32-14
- Import fix for PR 23870 in order to help building Go binaries.
* Mon Apr 29 2019 Nick Clifton <nickc@redhat.com> - 2.32-13
- Do not include ld.gold in the base binutils package. (#1703714)