From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id C8AFE3858D35 for ; Tue, 22 Nov 2022 22:02:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C8AFE3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pg1-x532.google.com with SMTP id f9so10989851pgf.7 for ; Tue, 22 Nov 2022 14:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=gkjtESmzJpzXGLj1g149Z+DtduhgcIW6qtuUin55//4=; b=HuxMTVSP0Rd0gM2HPxxl9WnG3/7J0M4Wml1/J5m2CBQEAPphjtfT59Z7szFHHNac9M oxGMxkkl/eIwoZoDT5CcRrS9grxjEDFIHAJMz3VJ8WBcmlW+i1P8+JMZcNRDcrS/Yiy8 mQKk3sC5BafDALoZ18Wcz1qYOY+Cc9ELxnhuDxjs7so6YHF/mGk4TEUkdrL3XgVAU5fA ObhV+DPeL9pVEawIsegrp/9kz/IaQbUspmQOWV/vMQXFS+bF70qWr8w9xEohrUDQ61hI kfq49aZhFS7g7BVBc5hz4KuxhOMAvg1LUZjFRXX/kIhF2AdoKT3sjeLM0SdiOE11yGze rRXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gkjtESmzJpzXGLj1g149Z+DtduhgcIW6qtuUin55//4=; b=tu7E+aGHFB3mAMR+oN4u1LihYvQENd2o15QIhVhrBWI7pHdiG0VYaczO5wCGUsw9Z+ sM/HwziZCJSIx6qCWybKzb3ALKXNVu550QKdaOfrNUyBXsOIpj1rBL5WoUvpd4w2I1my NfEnaEsWXlfYbvyTuaUpKma6oJj4EohBC9enkhPvPBaQRdbneRr3FV554WZ1UHjM1NLY uwXpa+C5k3xZHGWZYhCZc6EHscnK/5TDGMGaLCP1gbvWb2PUOgzuuATMqcrH4I9e6X00 7seq8DFIoK/CTgIs2jcBeMaKR/LP64M9Hs67vzRiMTfacrefeez4mLcVHR9sjENcCO3P ZwZg== X-Gm-Message-State: ANoB5pmLfBTGV7FhEpmD4SniF7Qhp6VDxJi5zXtgD7kuwKUqciDfN2s5 AtdrgXYek93PnGXYQ+BeHxzQaMUnT0c= X-Google-Smtp-Source: AA0mqf7hHcecFlFp8yhPhxNQr8Pv1xEpVS39FoYJQ8Y0gC7aDqB9tSDUZY7a35h2ekWGpaxMolOucw== X-Received: by 2002:a63:4701:0:b0:476:d784:1c44 with SMTP id u1-20020a634701000000b00476d7841c44mr6782431pga.431.1669154558241; Tue, 22 Nov 2022 14:02:38 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.56.31.158]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001869079d083sm7560840plq.90.2022.11.22.14.02.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 14:02:37 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 43938C0202 for ; Tue, 22 Nov 2022 14:02:36 -0800 (PST) From: "H.J. Lu" 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 Message-Id: <20221122220236.429230-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3026.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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