From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 3FB473858C20; Tue, 22 Nov 2022 22:05:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3FB473858C20 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: H.J. Lu To: bfd-cvs@sourceware.org Subject: [binutils-gdb] x86: Don't define _TLS_MODULE_BASE_ for ld -r X-Act-Checkin: binutils-gdb X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: 26c527e62e701ae256c1af243ec9d73e5560bd48 X-Git-Newrev: 04ad71937f28561ad5a2bbbc7e8f0af21e1019f8 Message-Id: <20221122220525.3FB473858C20@sourceware.org> Date: Tue, 22 Nov 2022 22:05:25 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Nov 2022 22:05:25 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D04ad71937f28= 561ad5a2bbbc7e8f0af21e1019f8 commit 04ad71937f28561ad5a2bbbc7e8f0af21e1019f8 Author: H.J. Lu Date: Tue Nov 22 13:58:47 2022 -0800 x86: Don't define _TLS_MODULE_BASE_ for ld -r =20 bfd/ =20 PR ld/29820 * elfxx-x86.c (_bfd_x86_elf_always_size_sections): Don't define _TLS_MODULE_BASE_ for ld -r. =20 ld/ =20 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. Diff: --- 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(-) 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 =3D elf_hash_table (info)->tls_sec; =20 - if (tls_sec) + if (tls_sec && !bfd_link_relocatable (info)) { struct elf_link_hash_entry *tlsbase; =20 diff --git a/ld/testsuite/ld-x86-64/pr29820.d b/ld/testsuite/ld-x86-64/pr29= 820.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/pr29= 820.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" =20 proc undefined_weak {cflags ldflags} { set testname "Undefined weak symbol"