From ec10b3bb916cde1203912847e3f5844ab5ab24bd Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 27 Aug 2020 13:52:45 +0100 Subject: [PATCH] Remove commit 9fb2400ce6 --- ld/ChangeLog | 7 --- ld/testsuite/ld-alpha/tlsbinr.dd | 34 +++++----- ld/testsuite/ld-alpha/tlsbinr.rd | 103 ++++++++++++++----------------- ld/testsuite/ld-alpha/tlsbinr.sd | 1 - 4 files changed, 64 insertions(+), 81 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index b1e03d02e3..4fd5546e92 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,10 +1,3 @@ -2020-08-27 Nick Clifton - - PR 26416 - * testsuite/ld-alpha/tlsbinr.rd: Update expected output. - * testsuite/ld-alpha/tlsbinr.dd: Likewise. - * testsuite/ld-alpha/tlsbinr.sd: Likewise. - 2020-08-27 Nick Alcock * ldlang.c (dump_ctf_errs): Unquote CTF error messages. diff --git a/ld/testsuite/ld-alpha/tlsbinr.dd b/ld/testsuite/ld-alpha/tlsbinr.dd index d25d428379..44b5059815 100644 --- a/ld/testsuite/ld-alpha/tlsbinr.dd +++ b/ld/testsuite/ld-alpha/tlsbinr.dd @@ -12,30 +12,30 @@ Disassembly of section \.text: 0+120001000 : 120001000: 02 00 bb 27 ldah gp,2\(t12\) - 120001004: a8 82 bd 23 lda gp,-32088\(gp\) + 120001004: 98 82 bd 23 lda gp,-32104\(gp\) 120001008: 3e 15 c2 43 subq sp,0x10,sp 12000100c: 00 00 5e b7 stq ra,0\(sp\) - 120001010: 10 80 1d a6 ldq a0,-32752\(gp\) + 120001010: 08 80 1d a6 ldq a0,-32760\(gp\) 120001014: 00 00 fe 2f unop 120001018: 9e 00 00 00 rduniq 12000101c: 00 04 00 42 addq a0,v0,v0 120001020: 00 00 fe 2f unop - 120001024: 28 80 1d 22 lda a0,-32728\(gp\) - 120001028: 08 80 7d a7 ldq t12,-32760\(gp\) - 12000102c: 00 40 5b 6b jsr ra,\(t12\),120001030 - 120001030: 02 00 ba 27 ldah gp,2\(ra\) - 120001034: 78 82 bd 23 lda gp,-32136\(gp\) - 120001038: 18 80 1d 22 lda a0,-32744\(gp\) - 12000103c: 08 80 7d a7 ldq t12,-32760\(gp\) - 120001040: 00 40 5b 6b jsr ra,\(t12\),120001044 - 120001044: 02 00 ba 27 ldah gp,2\(ra\) - 120001048: 64 82 bd 23 lda gp,-32156\(gp\) + 120001024: 34 00 1f 22 lda a0,52 + 120001028: 00 00 fe 2f unop + 12000102c: 9e 00 00 00 rduniq + 120001030: 00 04 00 42 addq a0,v0,v0 + 120001034: 00 00 fe 2f unop + 120001038: 10 00 1f 22 lda a0,16 + 12000103c: 00 00 fe 2f unop + 120001040: 9e 00 00 00 rduniq + 120001044: 00 04 00 42 addq a0,v0,v0 + 120001048: 00 00 fe 2f unop 12000104c: 21 00 20 20 lda t0,33\(v0\) - 120001050: 18 80 1d 22 lda a0,-32744\(gp\) - 120001054: 08 80 7d a7 ldq t12,-32760\(gp\) - 120001058: 00 40 5b 6b jsr ra,\(t12\),12000105c - 12000105c: 02 00 ba 27 ldah gp,2\(ra\) - 120001060: 4c 82 bd 23 lda gp,-32180\(gp\) + 120001050: 10 00 1f 22 lda a0,16 + 120001054: 00 00 fe 2f unop + 120001058: 9e 00 00 00 rduniq + 12000105c: 00 04 00 42 addq a0,v0,v0 + 120001060: 00 00 fe 2f unop 120001064: 40 00 20 20 lda t0,64\(v0\) 120001068: 46 00 20 20 lda t0,70\(v0\) 12000106c: 00 00 20 24 ldah t0,0\(v0\) diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd index 7c829c6b28..ea51686640 100644 --- a/ld/testsuite/ld-alpha/tlsbinr.rd +++ b/ld/testsuite/ld-alpha/tlsbinr.rd @@ -16,8 +16,6 @@ Section Headers: +\[[ 0-9]+\] \.dynsym +.* +\[[ 0-9]+\] \.dynstr +.* +\[[ 0-9]+\] \.rela\.dyn +.* - +\[[ 0-9]+\] \.rela\.plt +.* - +\[[ 0-9]+\] \.plt +.* +\[[ 0-9]+\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096 +\[[ 0-9]+\] \.eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8 +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4 @@ -49,10 +47,6 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: [0-9a-f]+ +0+100000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0 [0-9a-f]+ +0+300000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0 -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry: - +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend -[0-9a-f]+ +0+20000001a R_ALPHA_JMP_SLOT +0+ __tls_get_addr \+ 0 - Symbol table '\.dynsym' contains [0-9]+ entries: +Num: +Value +Size +Type +Bind +Vis +Ndx +Name [0-9 ]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND @@ -74,59 +68,56 @@ Symbol table '\.symtab' contains [0-9]+ entries: [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 -[0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 -[0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 .* FILE +LOCAL +DEFAULT +ABS .* -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl1 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl3 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl4 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl5 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl6 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl7 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sl8 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl3 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl4 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl5 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl6 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl7 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl8 .* FILE +LOCAL +DEFAULT +ABS .* -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl1 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl3 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl4 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl5 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl6 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl7 -[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +11 bl8 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl1 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl3 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl4 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl5 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl6 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl7 +[0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 bl8 .* FILE +LOCAL +DEFAULT +ABS .* -[0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _DYNAMIC -[0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _PROCEDURE_LINKAGE_TABLE_ -[0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_ -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg8 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg8 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg6 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg3 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg3 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh3 +[0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC +[0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg8 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg8 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg6 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg3 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg3 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh3 [0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +UND sG2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg4 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg5 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg5 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg4 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg5 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg5 [0-9 ]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND __tls_get_addr -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh7 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh8 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg1 -[0-9 ]+: [0-9a-f]+ +52 +FUNC +GLOBAL +DEFAULT +8 _start -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh4 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg7 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh5 -[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 __bss_start -[0-9 ]+: [0-9a-f]+ +136 +FUNC +GLOBAL +DEFAULT +\[STD GPLOAD\] +8 fn2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh7 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh8 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg1 +[0-9 ]+: [0-9a-f]+ +52 +FUNC +GLOBAL +DEFAULT +6 _start +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh4 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg7 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh5 +[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start +[0-9 ]+: [0-9a-f]+ +136 +FUNC +GLOBAL +DEFAULT +\[STD GPLOAD\] +6 fn2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg2 [0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +UND sG1 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh1 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg6 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +10 sg7 -[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 _edata -[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 _end -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +10 sh6 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg2 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg1 -[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +11 bg4 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh1 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg6 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg7 +[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata +[0-9 ]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +HIDDEN +8 sh6 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg2 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg1 +[0-9 ]+: [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 bg4 diff --git a/ld/testsuite/ld-alpha/tlsbinr.sd b/ld/testsuite/ld-alpha/tlsbinr.sd index 469cac4a52..59e9449de2 100644 --- a/ld/testsuite/ld-alpha/tlsbinr.sd +++ b/ld/testsuite/ld-alpha/tlsbinr.sd @@ -10,4 +10,3 @@ Contents of section .got: [0-9a-f]+ 00000000 00000000 00000000 00000000 .* -#pass -- 2.34.1