[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1425/8267] binutils: backport fix for TLSDESC relocations with no TLS segment on arch64

[Emmanuele Bassi <ebassi src gnome org>]

commit bb915a1492df591602d6e0a6b160afaad215a893
Author: Ross Burton <ross burton intel com>
Date:   Thu Jul 14 19:59:47 2016 +0100

    binutils: backport fix for TLSDESC relocations with no TLS segment on arch64
    
    As exposed by WebKit on aarch64 hosts, which causes binutils to throw an
    internal error.
    
    [ YOCTO #9509 ]
    
    (From OE-Core rev: b31294e4f34dfb530c40526ab56c07aedb76e31b)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/binutils/binutils-2.26.inc   |    1 +
 .../binutils/binutils/aarch64-tls.patch            |  177 ++++++++++++++++++++
 2 files changed, 178 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/binutils/binutils-2.26.inc 
b/meta/recipes-devtools/binutils/binutils-2.26.inc
index 82cb7f5..1f7bee2 100644
--- a/meta/recipes-devtools/binutils/binutils-2.26.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.26.inc
@@ -35,6 +35,7 @@ SRC_URI = "\
      file://0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch \
      file://0014-Correct-nios2-_gp-address-computation.patch \
      file://0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
+     file://aarch64-tls.patch \
 "
 S  = "${WORKDIR}/git"
 
diff --git a/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch 
b/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch
new file mode 100644
index 0000000..6b123ac
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch
@@ -0,0 +1,177 @@
+Building WebKit on an aarch64 host will fail:
+
+gold/ld-new: internal error in relocate_tls, at ../../binutils/gold/aarch64.cc:7418
+
+This was a binutils bug, so backport the fix.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=19353
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross burton intel com>
+
+From d21f123b0ead1806416cf0dafae12bec4cca8920 Mon Sep 17 00:00:00 2001
+From: Cary Coutant <ccoutant gmail com>
+Date: Mon, 11 Jan 2016 23:57:44 -0800
+Subject: [PATCH] Fix internal error when applying TLSDESC relocations with no TLS segment.
+
+gold/
+       PR gold/19353
+       * aarch64.cc (Target_aarch64::relocate_tls): Don't insist that
+       we have a TLS segment for GD-to-IE optimization.
+       * i386.cc (Target_i386::tls_gd_to_ie): Remove tls_segment parameter.
+       Adjust all calls.
+       (Target_i386::tls_desc_gd_to_ie): Likewise.
+       (Target_i386::relocate_tls): Don't insist that we have a TLS segment
+       for TLSDESC GD-to-IE optimizations.
+       * x86_64.cc (Target_x86_64::tls_gd_to_ie): Remove tls_segment parameter.
+       Adjust all calls.
+       (Target_x86_64::tls_desc_gd_to_ie): Likewise.
+       (Target_x86_64::relocate_tls): Don't insist that we have a TLS segment
+       for TLSDESC GD-to-IE optimizations.
+---
+ gold/ChangeLog  |   16 ++++++++++++++++
+ gold/aarch64.cc |    6 ------
+ gold/i386.cc    |   14 ++------------
+ gold/x86_64.cc  |   14 ++------------
+ 4 files changed, 20 insertions(+), 30 deletions(-)
+
+diff --git a/gold/aarch64.cc b/gold/aarch64.cc
+index 20f2f4f..5ad061b 100644
+--- a/gold/aarch64.cc
++++ b/gold/aarch64.cc
+@@ -7422,12 +7422,6 @@ Target_aarch64<size, big_endian>::Relocate::relocate_tls(
+             }
+           if (tlsopt == tls::TLSOPT_TO_IE)
+             {
+-              if (tls_segment == NULL)
+-                {
+-                  gold_assert(parameters->errors()->error_count() > 0
+-                              || issue_undefined_symbol_error(gsym));
+-                  return aarch64_reloc_funcs::STATUS_BAD_RELOC;
+-                }
+               return tls_desc_gd_to_ie(relinfo, target, rela, r_type,
+                                        view, psymval, got_entry_address,
+                                        address);
+diff --git a/gold/i386.cc b/gold/i386.cc
+index 82886d4..a7168a8 100644
+--- a/gold/i386.cc
++++ b/gold/i386.cc
+@@ -668,7 +668,6 @@ class Target_i386 : public Sized_target<32, false>
+     // Do a TLS General-Dynamic to Initial-Exec transition.
+     inline void
+     tls_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
+-               Output_segment* tls_segment,
+                const elfcpp::Rel<32, false>&, unsigned int r_type,
+                elfcpp::Elf_types<32>::Elf_Addr value,
+                unsigned char* view,
+@@ -687,7 +686,6 @@ class Target_i386 : public Sized_target<32, false>
+     // transition.
+     inline void
+     tls_desc_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
+-                    Output_segment* tls_segment,
+                     const elfcpp::Rel<32, false>&, unsigned int r_type,
+                     elfcpp::Elf_types<32>::Elf_Addr value,
+                     unsigned char* view,
+@@ -3054,7 +3052,7 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
+           }
+         if (optimized_type == tls::TLSOPT_TO_IE)
+           {
+-            this->tls_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
++            this->tls_gd_to_ie(relinfo, relnum, rel, r_type,
+                                got_offset, view, view_size);
+             break;
+           }
+@@ -3116,13 +3114,7 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
+           }
+         if (optimized_type == tls::TLSOPT_TO_IE)
+           {
+-            if (tls_segment == NULL)
+-              {
+-                gold_assert(parameters->errors()->error_count() > 0
+-                            || issue_undefined_symbol_error(gsym));
+-                return;
+-              }
+-            this->tls_desc_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
++            this->tls_desc_gd_to_ie(relinfo, relnum, rel, r_type,
+                                     got_offset, view, view_size);
+             break;
+           }
+@@ -3354,7 +3346,6 @@ Target_i386::Relocate::tls_gd_to_le(const Relocate_info<32, false>* relinfo,
+ inline void
+ Target_i386::Relocate::tls_gd_to_ie(const Relocate_info<32, false>* relinfo,
+                                   size_t relnum,
+-                                  Output_segment*,
+                                   const elfcpp::Rel<32, false>& rel,
+                                   unsigned int,
+                                   elfcpp::Elf_types<32>::Elf_Addr value,
+@@ -3449,7 +3440,6 @@ inline void
+ Target_i386::Relocate::tls_desc_gd_to_ie(
+     const Relocate_info<32, false>* relinfo,
+     size_t relnum,
+-    Output_segment*,
+     const elfcpp::Rel<32, false>& rel,
+     unsigned int r_type,
+     elfcpp::Elf_types<32>::Elf_Addr value,
+diff --git a/gold/x86_64.cc b/gold/x86_64.cc
+index 3cfc064..4ad5afc 100644
+--- a/gold/x86_64.cc
++++ b/gold/x86_64.cc
+@@ -816,7 +816,6 @@ class Target_x86_64 : public Sized_target<size, false>
+     // Do a TLS General-Dynamic to Initial-Exec transition.
+     inline void
+     tls_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
+-               Output_segment* tls_segment,
+                const elfcpp::Rela<size, false>&, unsigned int r_type,
+                typename elfcpp::Elf_types<size>::Elf_Addr value,
+                unsigned char* view,
+@@ -835,7 +834,6 @@ class Target_x86_64 : public Sized_target<size, false>
+     // Do a TLSDESC-style General-Dynamic to Initial-Exec transition.
+     inline void
+     tls_desc_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
+-                    Output_segment* tls_segment,
+                     const elfcpp::Rela<size, false>&, unsigned int r_type,
+                     typename elfcpp::Elf_types<size>::Elf_Addr value,
+                     unsigned char* view,
+@@ -3733,7 +3731,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
+         if (optimized_type == tls::TLSOPT_TO_IE)
+           {
+             value = target->got_plt_section()->address() + got_offset;
+-            this->tls_gd_to_ie(relinfo, relnum, tls_segment, rela, r_type,
++            this->tls_gd_to_ie(relinfo, relnum, rela, r_type,
+                                value, view, address, view_size);
+             break;
+           }
+@@ -3800,14 +3798,8 @@ Target_x86_64<size>::Relocate::relocate_tls(
+           }
+         if (optimized_type == tls::TLSOPT_TO_IE)
+           {
+-            if (tls_segment == NULL)
+-              {
+-                gold_assert(parameters->errors()->error_count() > 0
+-                            || issue_undefined_symbol_error(gsym));
+-                return;
+-              }
+             value = target->got_plt_section()->address() + got_offset;
+-            this->tls_desc_gd_to_ie(relinfo, relnum, tls_segment,
++            this->tls_desc_gd_to_ie(relinfo, relnum,
+                                     rela, r_type, value, view, address,
+                                     view_size);
+             break;
+@@ -3973,7 +3965,6 @@ inline void
+ Target_x86_64<size>::Relocate::tls_gd_to_ie(
+     const Relocate_info<size, false>* relinfo,
+     size_t relnum,
+-    Output_segment*,
+     const elfcpp::Rela<size, false>& rela,
+     unsigned int,
+     typename elfcpp::Elf_types<size>::Elf_Addr value,
+@@ -4085,7 +4076,6 @@ inline void
+ Target_x86_64<size>::Relocate::tls_desc_gd_to_ie(
+     const Relocate_info<size, false>* relinfo,
+     size_t relnum,
+-    Output_segment*,
+     const elfcpp::Rela<size, false>& rela,
+     unsigned int r_type,
+     typename elfcpp::Elf_types<size>::Elf_Addr value,
+-- 
+1.7.1