From: "H.J. Lu" <hjl.tools@gmail.com>
To: binutils@sourceware.org
Subject: [PATCH] x86: Don't define _TLS_MODULE_BASE_ for ld -r
Date: Tue, 22 Nov 2022 14:02:36 -0800 [thread overview]
Message-ID: <20221122220236.429230-1-hjl.tools@gmail.com> (raw)
bfd/
PR ld/29820
* elfxx-x86.c (_bfd_x86_elf_always_size_sections): Don't define
_TLS_MODULE_BASE_ for ld -r.
ld/
PR ld/29820
* testsuite/ld-x86-64/pr29820.d: New file.
* testsuite/ld-x86-64/pr29820.s: Likewise.
* testsuite/ld-x86-64/x86-64.ex: Run pr29820.
---
bfd/elfxx-x86.c | 2 +-
ld/testsuite/ld-x86-64/pr29820.d | 6 ++++++
ld/testsuite/ld-x86-64/pr29820.s | 12 ++++++++++++
ld/testsuite/ld-x86-64/x86-64.exp | 1 +
4 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 ld/testsuite/ld-x86-64/pr29820.d
create mode 100644 ld/testsuite/ld-x86-64/pr29820.s
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index c48d0385485..bbf868826e5 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2932,7 +2932,7 @@ _bfd_x86_elf_always_size_sections (bfd *output_bfd,
{
asection *tls_sec = elf_hash_table (info)->tls_sec;
- if (tls_sec)
+ if (tls_sec && !bfd_link_relocatable (info))
{
struct elf_link_hash_entry *tlsbase;
diff --git a/ld/testsuite/ld-x86-64/pr29820.d b/ld/testsuite/ld-x86-64/pr29820.d
new file mode 100644
index 00000000000..8dc5d6151c3
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr29820.d
@@ -0,0 +1,6 @@
+#ld: -r
+#readelf: -s -W
+
+#...
+ +[0-9]+: +0+ +0 +TLS +GLOBAL +DEFAULT +UND +_TLS_MODULE_BASE_
+#pass
diff --git a/ld/testsuite/ld-x86-64/pr29820.s b/ld/testsuite/ld-x86-64/pr29820.s
new file mode 100644
index 00000000000..7a4815ff7c5
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr29820.s
@@ -0,0 +1,12 @@
+ .text
+ leaq _TLS_MODULE_BASE_@tlsdesc(%rip), %rax
+ call *_TLS_MODULE_BASE_@tlscall(%rax)
+ movl %fs:a@dtpoff(%rax), %edx
+ addl %fs:b@dtpoff(%rax), %edx
+
+ .section .tbss
+ .zero 8
+a:
+ .zero 4
+b:
+ .zero 4
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 1782e8e5def..136371bd5a2 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -728,6 +728,7 @@ run_dump_test "pr27016a"
run_dump_test "pr27016b"
run_dump_test "report-reloc-1"
run_dump_test "report-reloc-1-x32"
+run_dump_test "pr29820"
proc undefined_weak {cflags ldflags} {
set testname "Undefined weak symbol"
--
2.38.1
next reply other threads:[~2022-11-22 22:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-22 22:02 H.J. Lu [this message]
2022-11-22 22:35 ` Fangrui Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221122220236.429230-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).