From 1a51864b467c2d65bd37c3bc9cbab2cf1ee6a039 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Thu, 18 Aug 2022 02:46:38 -0700 Subject: xtensa: adjust expected output in ld TLS tests objdump output for l32r opcode was changed in commit b3ea76397a07 ("opcodes: xtensa: display loaded literal value"), but xtensa linker TLS relaxation tests weren't adjusted accordingly. readelf output was changed in commit 23356397449a ("Adjust readelf's output so that section symbols without a name as shown with their section name."), but xtensa linker TLS relaxation tests weren't adjusted accordingly. Fix expected output changes in xtensa ld TLS relaxation tests. ld/ * testsuite/ld-xtensa/tlsbin.dd: Adjust expected output for l32r opcodes. * testsuite/ld-xtensa/tlsbin.rd: Adjust expected output to allow for named section symbols. * testsuite/ld-xtensa/tlspic.dd: Adjust expected output for l32r opcodes. * testsuite/ld-xtensa/tlspic.rd: Adjust expected output to allow for named section symbols. --- ld/testsuite/ld-xtensa/tlspic.dd | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'ld/testsuite/ld-xtensa/tlspic.dd') diff --git a/ld/testsuite/ld-xtensa/tlspic.dd b/ld/testsuite/ld-xtensa/tlspic.dd index 9f6e20a..21edcc2 100644 --- a/ld/testsuite/ld-xtensa/tlspic.dd +++ b/ld/testsuite/ld-xtensa/tlspic.dd @@ -12,70 +12,70 @@ Disassembly of section \.text: 0+350 <_start>: [0-9a-f]+: [0-9a-f]+[ ]+entry a1, 32 # GD - [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 2e0 <.*> - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2e4 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 2e0 <.*> .* + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2e4 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+callx8 a8 # GD -> IE because variable is referenced through IE too [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2ec <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2ec <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a10, a10, a8 # GD against local variable - [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 2f0 <.*> - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2f4 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 2f0 <.*> .* + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2f4 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+callx8 a8 # GD -> IE against local variable referenced through IE too [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2fc <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 2fc <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a10, a10, a8 # GD against hidden and local variable - [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 300 <.*> - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 304 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 300 <.*> .* + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 304 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+callx8 a8 # GD -> IE against hidden and local variable referenced through IE too [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 30c <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 30c <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a10, a10, a8 # GD against hidden but not local variable - [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 310 <.*> - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 314 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 310 <.*> .* + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 314 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+callx8 a8 # GD -> IE against hidden but not local variable referenced through IE too [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 31c <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 31c <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a10, a10, a8 # LD - [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 320 <.*> - [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 324 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a8, 320 <.*> .* + [0-9a-f]+: [0-9a-f]+[ ]+l32r a10, 324 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+callx8 a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 328 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 328 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a12, a12, a10 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 32c <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 32c <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a13, a13, a10 # LD against hidden and local variables - [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 330 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 330 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a12, a12, a10 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 334 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 334 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a13, a13, a10 # LD against hidden but not local variables - [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 338 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a12, 338 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a12, a12, a10 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 33c <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a13, 33c <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a13, a13, a10 # IE against global var [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a2 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a3, 340 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a3, 340 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a3, a3, a2 # IE against local var [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a4 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a5, 344 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a5, 344 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a5, a5, a4 # IE against hidden and local var [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a6 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a7, 348 <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a7, 348 <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a7, a7, a6 # IE against hidden but not local var [0-9a-f]+: [0-9a-f]+[ ]+rur.threadptr a8 - [0-9a-f]+: [0-9a-f]+[ ]+l32r a9, 34c <.*> + [0-9a-f]+: [0-9a-f]+[ ]+l32r a9, 34c <.*> .* [0-9a-f]+: [0-9a-f]+[ ]+add.* a9, a9, a8 # [0-9a-f]+: [0-9a-f]+[ ]+retw.* -- cgit v1.1