From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id 5734C3858C56 for ; Fri, 19 Jan 2024 16:40:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5734C3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=xry111.site Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xry111.site ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5734C3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=89.208.246.23 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705682438; cv=none; b=eStOvU6aUdiSYJn3Aiex1krg2ywac5sE2BYnmJQ1peHGz4H47+RFAD+JPanTcNWQ+o5TjKFOjOXlWYkmGXcSmOaqhetCMSrJO/u+JOxEKtd8rX/YlWWxhXibycsgs698buJkqQXvfu7xJnzPi7MgFVkcqaNIey72M4IOA7ksaQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705682438; c=relaxed/simple; bh=3hFIj2zzOnk0pa7YKZZgWuBGTYoswnAG90WQqwB/7mo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=mK2W5mu6Ud154+zmSZHz9H5T8CKeLBcuwz7Lg6YQ/ACy00Yio0GCTFOXFCo+Ss+03zLgxfeg4bc7wcM00Ji9dSXQ6cjW9HRrmtrWC7iGfLS3l1nMx2uZlAviepSljqZgbjAgv2U/vb2/m2feH5nX9aFIYbamMzUufu4ERjoRVxk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1705682435; bh=3hFIj2zzOnk0pa7YKZZgWuBGTYoswnAG90WQqwB/7mo=; h=From:To:Cc:Subject:Date:From; b=lqFdFb0Jy/szB6wyax2lEha7uxghpHtwJFEtTWJ97qjtfvIqPUCPx2dG15xK+5ncW Rogsq8LT0MGFxUAsSXIjwQ65jD3Sf/YLEoVqRhxN13aaELaQUSl3v8f5W94NrDr4jU KacAKAORWKo2LG45Epo6eEDdHsrBewxMi1daC3sY= Received: from stargazer.. (unknown [IPv6:240e:358:1166:6900:dc73:854d:832e:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id B655966A7E; Fri, 19 Jan 2024 11:40:31 -0500 (EST) From: Xi Ruoyao To: binutils@sourceware.org Cc: mengqinggang@loongson.cn, changjiachen , i.swmail@xen0n.name, Nick Clifton , Xi Ruoyao Subject: [PATCH] LoongArch: Fix some test failures about TLS desc and TLS relaxation Date: Sat, 20 Jan 2024 00:38:24 +0800 Message-ID: <20240119164017.509102-1-xry111@xry111.site> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,LIKELY_SPAM_FROM,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: There are two issues causing 11 test failures: 1. The TLS desc tests are matching the entire disassemble of a linked executable. But if ld is configured --enable-default-hash-style=gnu (note that most modern distros use this option), the layout of the linked executables will be different and the immediate operands in the linked executables will also be different. So we add "--hash-style=both" for these tests to cancel the effect of --enable-default-hash-style=gnu, like [x86_64 mark-plt tests]. 2. By default objdump disassemble uses [pseudo-instructions] so "addi.w" is outputed as "li.w", causing mismatches in TLS relaxation tests. We can turn off the pseudo-instruction usage in objdump using "-M no-aliases" to fix them. [x86_64 mark-plt tests]: 16666ccc91295d1568c5c2cb0e7600694840dfd9 [pseudo-instructions]: 17f9439038257b1de0c130a416a9a7645c653cb0 Signed-off-by: Xi Ruoyao --- Nick: if Qinggang approves this I'd request an approve for 2.42 branch as well. This is a target bug fix and it only changes tests. ld/testsuite/ld-loongarch-elf/desc-ie.d | 2 +- ld/testsuite/ld-loongarch-elf/desc-norelax.d | 2 +- ld/testsuite/ld-loongarch-elf/desc-relax.d | 2 +- ld/testsuite/ld-loongarch-elf/relax.exp | 14 +++++++------- ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ld/testsuite/ld-loongarch-elf/desc-ie.d b/ld/testsuite/ld-loongarch-elf/desc-ie.d index d1acbfc6972..32e350507db 100644 --- a/ld/testsuite/ld-loongarch-elf/desc-ie.d +++ b/ld/testsuite/ld-loongarch-elf/desc-ie.d @@ -1,5 +1,5 @@ #as: -#ld: -shared -z norelro -e 0x0 +#ld: -shared -z norelro -e 0x0 --hash-style=both #objdump: -dr #skip: loongarch32-*-* diff --git a/ld/testsuite/ld-loongarch-elf/desc-norelax.d b/ld/testsuite/ld-loongarch-elf/desc-norelax.d index 32ce3e5eb94..e4863dda36a 100644 --- a/ld/testsuite/ld-loongarch-elf/desc-norelax.d +++ b/ld/testsuite/ld-loongarch-elf/desc-norelax.d @@ -1,5 +1,5 @@ #as: -#ld: -z norelro -shared --section-start=.got=0x1ff000 +#ld: -z norelro -shared --section-start=.got=0x1ff000 --hash-style=both #objdump: -dr #skip: loongarch32-*-* diff --git a/ld/testsuite/ld-loongarch-elf/desc-relax.d b/ld/testsuite/ld-loongarch-elf/desc-relax.d index ce53d317272..c885953c727 100644 --- a/ld/testsuite/ld-loongarch-elf/desc-relax.d +++ b/ld/testsuite/ld-loongarch-elf/desc-relax.d @@ -1,5 +1,5 @@ #as: -#ld: -z norelro -shared +#ld: -z norelro -shared --hash-style=both #objdump: -dr #skip: loongarch32-*-* diff --git a/ld/testsuite/ld-loongarch-elf/relax.exp b/ld/testsuite/ld-loongarch-elf/relax.exp index f3fd169dbd3..f421e8af8dd 100644 --- a/ld/testsuite/ld-loongarch-elf/relax.exp +++ b/ld/testsuite/ld-loongarch-elf/relax.exp @@ -104,7 +104,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/relax-tls-le"] { - set objdump_output1 [run_host_cmd "objdump" "-d tmpdir/relax-tls-le"] + set objdump_output1 [run_host_cmd "objdump" "-d tmpdir/relax-tls-le -M no-aliases"] if { [ regexp ".addi.*st.*" $objdump_output1] } { pass "loongarch relax success" } { @@ -125,7 +125,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/no-relax-tls-le"] { - set objdump_output2 [run_host_cmd "objdump" "-d tmpdir/no-relax-tls-le"] + set objdump_output2 [run_host_cmd "objdump" "-d tmpdir/no-relax-tls-le -M no-aliases"] if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output2] } { pass "loongarch no-relax success" } { @@ -146,7 +146,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/old-tls-le"] { - set objdump_output3 [run_host_cmd "objdump" "-d tmpdir/old-tls-le"] + set objdump_output3 [run_host_cmd "objdump" "-d tmpdir/old-tls-le -M no-aliases"] if { [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output3] } { pass "loongarch old tls le success" } { @@ -167,7 +167,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/realx-compatible"] { - set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible"] + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible -M no-aliases"] if { [ regexp ".addi.*st.*" $objdump_output4] && \ [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } { pass "loongarch tls le relax compatible check success" @@ -188,7 +188,7 @@ if [istarget loongarch64-*-*] { ] \ ] if [file exist "tmpdir/no-realx-compatible"] { - set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/no-realx-compatible"] + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/no-realx-compatible -M no-aliases"] if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output4] && \ [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } { pass "loongarch tls le no-relax compatible check success" @@ -210,7 +210,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/relax-bound-check-tls-le"] { - set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/relax-bound-check-tls-le"] + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/relax-bound-check-tls-le -M no-aliases"] if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output5] && \ [ regexp ".addi.*st.*" $objdump_output5] } { pass "loongarch no-relax success" @@ -232,7 +232,7 @@ if [istarget loongarch64-*-*] { ] if [file exist "tmpdir/no-relax-bound-check-tls-le"] { - set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/no-relax-bound-check-tls-le"] + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/no-relax-bound-check-tls-le -M no-aliases"] if { [ regexp ".*addi.*st.*" $objdump_output5] } { pass "loongarch no-relax success" } { diff --git a/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d b/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d index 667ad746f62..453902d1622 100644 --- a/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d +++ b/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d @@ -1,5 +1,5 @@ #as: -#ld: -shared -z norelro +#ld: -shared -z norelro --hash-style=both #objdump: -dr #skip: loongarch32-*-* -- 2.43.0