This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH 2/5] Content for TLS_IE_GOT not written to .got.
- From: Cupertino Miranda <Cupertino dot Miranda at synopsys dot com>
- To: Nick Clifton <nickc at redhat dot com>, Cupertino Miranda <Cupertino dot Miranda at synopsys dot com>, "binutils at sourceware dot org" <binutils at sourceware dot org>
- Cc: "Francois dot Bedard at synopsys dot com" <Francois dot Bedard at synopsys dot com>, "Claudiu dot Zissulescu at synopsys dot com" <Claudiu dot Zissulescu at synopsys dot com>
- Date: Wed, 24 Aug 2016 14:53:57 +0000
- Subject: Re: [PATCH 2/5] Content for TLS_IE_GOT not written to .got.
- Authentication-results: sourceware.org; auth=none
- References: <20160816155116.23937-1-cmiranda@synopsys.com> <20160816155116.23937-3-cmiranda@synopsys.com> <f84003d6-6da9-66c1-0664-ece45f6435c9@redhat.com>
Hi Nick,
Indeed, a test case makes sense.
Please find a new patch attached.
Cheers,
Cupertino
On 08/19/2016 09:43 AM, Nick Clifton wrote:
> Hi Cupertino,
>
>> When no dynamic relocation was generated the .got content would not be
>> updated for the TLS_IE_GOT relocation addresses.
> I think that this particular patch ought to be accompanied by a testcase
> to make sure that it continues to work. Could you see if you rustle one
> up please ?
>
>
> Cheers
> Nick
>
From 7af0a7dffd4d396214b1ffa28a5923dafd7e4154 Mon Sep 17 00:00:00 2001
From: Cupertino Miranda <cmiranda@synopsys.com>
Date: Tue, 12 Jul 2016 16:31:40 +0200
Subject: [PATCH 2/5] Content for TLS_IE_GOT not written to .got.
When no dynamic relocation was generated the .got content would not be
updated for the TLS_IE_GOT relocation addresses.
bfd/ChangeLog:
Cupertino Miranda <cmiranda@synopsys.com>
arc-got.h (relocate_fix_got_relocs_for_got_info): Fixed addresses in
debug comments. Fixed address in .got related to TLS_IE_GOT dynamic
relocation.
ld/ChangeLog:
Cupertino Miranda <cmiranda@synopsys.com>
testsuite/ld-arc/tls_ie-01.s: Added to verify associated fix.
testsuite/ld-arc/tls_ie-01.d: Likewise
---
bfd/arc-got.h | 24 +++++++++++++++++-------
ld/testsuite/ld-arc/tls_ie-01.d | 9 +++++++++
ld/testsuite/ld-arc/tls_ie-01.s | 10 ++++++++++
3 files changed, 36 insertions(+), 7 deletions(-)
create mode 100644 ld/testsuite/ld-arc/tls_ie-01.d
create mode 100644 ld/testsuite/ld-arc/tls_ie-01.s
diff --git a/bfd/arc-got.h b/bfd/arc-got.h
index 7c3cfd9..9ac0295 100644
--- a/bfd/arc-got.h
+++ b/bfd/arc-got.h
@@ -334,13 +334,15 @@ relocate_fix_got_relocs_for_got_info (struct got_entry ** list_p,
? 4 : 0));
ARC_DEBUG ("arc_info: FIXED -> %s value = %#lx "
- "@ %p, for symbol %s\n",
+ "@ %lx, for symbol %s\n",
(entry->type == GOT_TLS_GD ? "GOT_TLS_GD" :
"GOT_TLS_IE"),
(long) (sym_value - sec_vma),
- htab->sgot->contents + entry->offset
- + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
- ? 4 : 0),
+ (long) (htab->sgot->output_section->vma
+ + htab->sgot->output_offset->vma
+ + entry->offset
+ + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
+ ? 4 : 0)),
symbol_name);
}
break;
@@ -351,14 +353,22 @@ relocate_fix_got_relocs_for_got_info (struct got_entry ** list_p,
bfd_vma ATTRIBUTE_UNUSED sec_vma
= tls_sec->output_section->vma;
+ bfd_put_32 (output_bfd,
+ sym_value - sec_vma,
+ htab->sgot->contents + entry->offset
+ + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
+ ? 4 : 0));
+
ARC_DEBUG ("arc_info: FIXED -> %s value = %#lx "
"@ %p, for symbol %s\n",
(entry->type == GOT_TLS_GD ? "GOT_TLS_GD" :
"GOT_TLS_IE"),
(long) (sym_value - sec_vma),
- htab->sgot->contents + entry->offset
- + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
- ? 4 : 0),
+ (long) (htab->sgot->output_section->vma
+ + htab->sgot->output_offset->vma
+ + entry->offset
+ + (entry->existing_entries == TLS_GOT_MOD_AND_OFF
+ ? 4 : 0)),
symbol_name);
}
break;
diff --git a/ld/testsuite/ld-arc/tls_ie-01.d b/ld/testsuite/ld-arc/tls_ie-01.d
new file mode 100644
index 0000000..8d53ef5
--- /dev/null
+++ b/ld/testsuite/ld-arc/tls_ie-01.d
@@ -0,0 +1,9 @@
+#source: tls_ie-01.s
+#as: -mcpu=arc700
+#ld:
+#objdump: -s -j .got
+
+[^:]+: file format elf32-littlearc
+
+Contents of section \.got:
+ [0-9a-f]+ 00000000 04000000 .+
diff --git a/ld/testsuite/ld-arc/tls_ie-01.s b/ld/testsuite/ld-arc/tls_ie-01.s
new file mode 100644
index 0000000..74f40ed
--- /dev/null
+++ b/ld/testsuite/ld-arc/tls_ie-01.s
@@ -0,0 +1,10 @@
+ .tls_common foo,4,4
+ .tls_common bar,4,4
+
+ .text
+ .align 4
+
+ .global __start
+__start:
+ ld r14, [pcl, @foo@tlsie]
+ ld r15, [pcl, @bar@tlsie]
--
2.9.0