This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH] tile: Remove the __tls_get_addr check from gc_mark_hook
On Tue, Oct 17, 2017 at 7:09 PM, Alan Modra <amodra@gmail.com> wrote:
> On Tue, Oct 17, 2017 at 06:20:27PM -0700, H.J. Lu wrote:
>> TLS_GD_CALL relocations implicitly reference __tls_get_addr. Since
>> elf_gc_mark_hook is called before check_relocs now, we need to call
>> _bfd_generic_link_add_one_symbol to mark __tls_get_addr for garbage
>> collection.
>>
>> * elf32-tilepro.c (tilepro_elf_gc_mark_hook): Call
>> _bfd_generic_link_add_one_symbol to mark __tls_get_addr.
>> * elfxx-tilegx.c (tilegx_elf_gc_mark_hook): Likewise.
>
> OK, but
>
>> case R_TILEPRO_TLS_GD_CALL:
>> - /* This reloc implicitly references __tls_get_addr. We know
>> - another reloc will reference the same symbol as the one
>> - on this reloc, so the real symbol and section will be
>> - gc marked when processing the other reloc. That lets
>> - us handle __tls_get_addr here. */
>> - h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
>> - FALSE, FALSE, TRUE);
>> + /* This reloc implicitly references __tls_get_addr. This
>> + function is called before check_relocs. Mark it for
>> + garbage collection here. */
>
> please leave the existing comment unchanged rather than adding this
> new comment. Ditto for tilegx. The old comment saying why it is
> reasonable to not process the actual reloc symbol is useful.
>
This is what I checked in.
--
H.J.
From cb0da5dfb48590531092cece9bf16c198576f386 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 17 Oct 2017 13:07:50 -0700
Subject: [PATCH] tile: Mark __tls_get_addr in gc_mark_hook
TLS_GD_CALL relocations implicitly reference __tls_get_addr. Since
elf_gc_mark_hook is called before check_relocs now, we need to call
_bfd_generic_link_add_one_symbol to mark __tls_get_addr for garbage
collection.
* elf32-tilepro.c (tilepro_elf_gc_mark_hook): Call
_bfd_generic_link_add_one_symbol to mark __tls_get_addr.
* elfxx-tilegx.c (tilegx_elf_gc_mark_hook): Likewise.
---
bfd/elf32-tilepro.c | 12 ++++++++++--
bfd/elfxx-tilegx.c | 12 ++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index 7ab60bbaca..0bdb6c46e8 100644
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -1864,6 +1864,8 @@ tilepro_elf_gc_mark_hook (asection *sec,
dealing with TLS optimization, ought to be !bfd_link_executable (info). */
if (bfd_link_pic (info))
{
+ struct bfd_link_hash_entry *bh;
+
switch (ELF32_R_TYPE (rel->r_info))
{
case R_TILEPRO_TLS_GD_CALL:
@@ -1872,8 +1874,14 @@ tilepro_elf_gc_mark_hook (asection *sec,
on this reloc, so the real symbol and section will be
gc marked when processing the other reloc. That lets
us handle __tls_get_addr here. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
- FALSE, FALSE, TRUE);
+ bh = NULL;
+ if (! _bfd_generic_link_add_one_symbol (info, sec->owner,
+ "__tls_get_addr", 0,
+ bfd_und_section_ptr,
+ 0, NULL, FALSE,
+ FALSE, &bh))
+ return NULL;
+ h = (struct elf_link_hash_entry *) bh;
BFD_ASSERT (h != NULL);
h->mark = 1;
if (h->u.weakdef != NULL)
diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index c9e860a70c..d7b04193ef 100644
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -2103,6 +2103,8 @@ tilegx_elf_gc_mark_hook (asection *sec,
dealing with TLS optimization, ought to be !bfd_link_executable (info). */
if (bfd_link_pic (info))
{
+ struct bfd_link_hash_entry *bh;
+
switch (TILEGX_ELF_R_TYPE (rel->r_info))
{
case R_TILEGX_TLS_GD_CALL:
@@ -2111,8 +2113,14 @@ tilegx_elf_gc_mark_hook (asection *sec,
on this reloc, so the real symbol and section will be
gc marked when processing the other reloc. That lets
us handle __tls_get_addr here. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
- FALSE, FALSE, TRUE);
+ bh = NULL;
+ if (! _bfd_generic_link_add_one_symbol (info, sec->owner,
+ "__tls_get_addr", 0,
+ bfd_und_section_ptr,
+ 0, NULL, FALSE,
+ FALSE, &bh))
+ return NULL;
+ h = (struct elf_link_hash_entry *) bh;
BFD_ASSERT (h != NULL);
h->mark = 1;
if (h->u.weakdef != NULL)
--
2.13.6