aboutsummaryrefslogtreecommitdiff
path: root/ld/testsuite/ld-i386
diff options
context:
space:
mode:
Diffstat (limited to 'ld/testsuite/ld-i386')
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-1.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-2a.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-2b.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-2c.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-2d.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-3a.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-3b.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-3c.d20
-rw-r--r--ld/testsuite/ld-i386/ibt-plt-3d.d20
-rw-r--r--ld/testsuite/ld-i386/plt2.dd26
-rw-r--r--ld/testsuite/ld-i386/pr20830.d18
-rw-r--r--ld/testsuite/ld-i386/tlsbin-nacl.rd3
-rw-r--r--ld/testsuite/ld-i386/tlsbin.rd3
-rw-r--r--ld/testsuite/ld-i386/tlsbin2-nacl.rd3
-rw-r--r--ld/testsuite/ld-i386/tlsbin2.rd3
-rw-r--r--ld/testsuite/ld-i386/tlsbindesc-nacl.rd9
-rw-r--r--ld/testsuite/ld-i386/tlsbindesc.rd9
-rw-r--r--ld/testsuite/ld-i386/tlsdesc-nacl.rd6
-rw-r--r--ld/testsuite/ld-i386/tlsdesc.rd6
-rw-r--r--ld/testsuite/ld-i386/tlsgdesc-nacl.rd6
-rw-r--r--ld/testsuite/ld-i386/tlsgdesc.rd6
-rw-r--r--ld/testsuite/ld-i386/tlsnopic-nacl.rd14
-rw-r--r--ld/testsuite/ld-i386/tlsnopic.dd12
-rw-r--r--ld/testsuite/ld-i386/tlsnopic.rd6
-rw-r--r--ld/testsuite/ld-i386/tlsnopic.sd4
-rw-r--r--ld/testsuite/ld-i386/tlspic-nacl.rd6
-rw-r--r--ld/testsuite/ld-i386/tlspic.rd6
-rw-r--r--ld/testsuite/ld-i386/tlspic2-nacl.rd6
-rw-r--r--ld/testsuite/ld-i386/tlspic2.rd6
29 files changed, 130 insertions, 208 deletions
diff --git a/ld/testsuite/ld-i386/ibt-plt-1.d b/ld/testsuite/ld-i386/ibt-plt-1.d
index e164095..2a8e043 100644
--- a/ld/testsuite/ld-i386/ibt-plt-1.d
+++ b/ld/testsuite/ld-i386/ibt-plt-1.d
@@ -7,45 +7,45 @@
Disassembly of section .plt:
-0+1b0 <.plt>:
+0+160 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 e2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 d2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .plt.sec:
-0+1e0 <bar1@plt>:
+0+190 <bar1@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-0+1f0 <bar2@plt>:
+0+1a0 <bar2@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 10 00 00 00 jmp \*0x10\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
Disassembly of section .text:
-0+200 <foo>:
+0+1b0 <foo>:
+[a-f0-9]+: 53 push %ebx
- +[a-f0-9]+: e8 18 00 00 00 call 21e <__x86.get_pc_thunk.bx>
+ +[a-f0-9]+: e8 18 00 00 00 call 1ce <__x86.get_pc_thunk.bx>
+[a-f0-9]+: 81 c3 36 11 00 00 add \$0x1136,%ebx
+[a-f0-9]+: 83 ec 08 sub \$0x8,%esp
- +[a-f0-9]+: e8 dc ff ff ff call 1f0 <bar2@plt>
- +[a-f0-9]+: e8 c7 ff ff ff call 1e0 <bar1@plt>
+ +[a-f0-9]+: e8 dc ff ff ff call 1a0 <bar2@plt>
+ +[a-f0-9]+: e8 c7 ff ff ff call 190 <bar1@plt>
+[a-f0-9]+: 83 c4 08 add \$0x8,%esp
+[a-f0-9]+: 5b pop %ebx
+[a-f0-9]+: c3 ret
-0+21e <__x86.get_pc_thunk.bx>:
+0+1ce <__x86.get_pc_thunk.bx>:
+[a-f0-9]+: 8b 1c 24 mov \(%esp\),%ebx
+[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/ibt-plt-2a.d b/ld/testsuite/ld-i386/ibt-plt-2a.d
index 6b84a3a..03c8e12 100644
--- a/ld/testsuite/ld-i386/ibt-plt-2a.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2a.d
@@ -8,45 +8,45 @@
Disassembly of section .plt:
-0+1b0 <.plt>:
+0+160 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 e2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 d2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .plt.sec:
-0+1e0 <bar1@plt>:
+0+190 <bar1@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-0+1f0 <bar2@plt>:
+0+1a0 <bar2@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 10 00 00 00 jmp \*0x10\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
Disassembly of section .text:
-0+200 <foo>:
+0+1b0 <foo>:
+[a-f0-9]+: 53 push %ebx
- +[a-f0-9]+: e8 18 00 00 00 call 21e <__x86.get_pc_thunk.bx>
+ +[a-f0-9]+: e8 18 00 00 00 call 1ce <__x86.get_pc_thunk.bx>
+[a-f0-9]+: 81 c3 36 11 00 00 add \$0x1136,%ebx
+[a-f0-9]+: 83 ec 08 sub \$0x8,%esp
- +[a-f0-9]+: e8 dc ff ff ff call 1f0 <bar2@plt>
- +[a-f0-9]+: e8 c7 ff ff ff call 1e0 <bar1@plt>
+ +[a-f0-9]+: e8 dc ff ff ff call 1a0 <bar2@plt>
+ +[a-f0-9]+: e8 c7 ff ff ff call 190 <bar1@plt>
+[a-f0-9]+: 83 c4 08 add \$0x8,%esp
+[a-f0-9]+: 5b pop %ebx
+[a-f0-9]+: c3 ret
-0+21e <__x86.get_pc_thunk.bx>:
+0+1ce <__x86.get_pc_thunk.bx>:
+[a-f0-9]+: 8b 1c 24 mov \(%esp\),%ebx
+[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/ibt-plt-2b.d b/ld/testsuite/ld-i386/ibt-plt-2b.d
index 2927290..d7b4e1e 100644
--- a/ld/testsuite/ld-i386/ibt-plt-2b.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2b.d
@@ -18,31 +18,31 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0+18 0000001c 0000001c FDE cie=00000000 pc=00000200..0000021e
- DW_CFA_advance_loc: 1 to 00000201
+0+18 0000001c 0000001c FDE cie=00000000 pc=000001b0..000001ce
+ DW_CFA_advance_loc: 1 to 000001b1
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r3 \(ebx\) at cfa-8
- DW_CFA_advance_loc: 14 to 0000020f
+ DW_CFA_advance_loc: 14 to 000001bf
DW_CFA_def_cfa_offset: 16
- DW_CFA_advance_loc: 13 to 0000021c
+ DW_CFA_advance_loc: 13 to 000001cc
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 1 to 0000021d
+ DW_CFA_advance_loc: 1 to 000001cd
DW_CFA_restore: r3 \(ebx\)
DW_CFA_def_cfa_offset: 4
-0+38 00000010 0000003c FDE cie=00000000 pc=0000021e..00000222
+0+38 00000010 0000003c FDE cie=00000000 pc=000001ce..000001d2
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0+4c 00000020 00000050 FDE cie=00000000 pc=000001b0..000001e0
+0+4c 00000020 00000050 FDE cie=00000000 pc=00000160..00000190
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 6 to 000001b6
+ DW_CFA_advance_loc: 6 to 00000166
DW_CFA_def_cfa_offset: 12
- DW_CFA_advance_loc: 10 to 000001c0
+ DW_CFA_advance_loc: 10 to 00000170
DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit9; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
-0+70 00000010 00000074 FDE cie=00000000 pc=000001e0..00000200
+0+70 00000010 00000074 FDE cie=00000000 pc=00000190..000001b0
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
diff --git a/ld/testsuite/ld-i386/ibt-plt-2c.d b/ld/testsuite/ld-i386/ibt-plt-2c.d
index f3d9faf..d71f34d 100644
--- a/ld/testsuite/ld-i386/ibt-plt-2c.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2c.d
@@ -8,45 +8,45 @@
Disassembly of section .plt:
-0+1b0 <.plt>:
+0+160 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 e2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d2 ff ff ff jmp 1b0 <.plt>
+ +[a-f0-9]+: e9 d2 ff ff ff jmp 160 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .plt.sec:
-0+1e0 <bar1@plt>:
+0+190 <bar1@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-0+1f0 <bar2@plt>:
+0+1a0 <bar2@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 10 00 00 00 jmp \*0x10\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
Disassembly of section .text:
-0+200 <foo>:
+0+1b0 <foo>:
+[a-f0-9]+: 53 push %ebx
- +[a-f0-9]+: e8 18 00 00 00 call 21e <__x86.get_pc_thunk.bx>
+ +[a-f0-9]+: e8 18 00 00 00 call 1ce <__x86.get_pc_thunk.bx>
+[a-f0-9]+: 81 c3 36 11 00 00 add \$0x1136,%ebx
+[a-f0-9]+: 83 ec 08 sub \$0x8,%esp
- +[a-f0-9]+: e8 dc ff ff ff call 1f0 <bar2@plt>
- +[a-f0-9]+: e8 c7 ff ff ff call 1e0 <bar1@plt>
+ +[a-f0-9]+: e8 dc ff ff ff call 1a0 <bar2@plt>
+ +[a-f0-9]+: e8 c7 ff ff ff call 190 <bar1@plt>
+[a-f0-9]+: 83 c4 08 add \$0x8,%esp
+[a-f0-9]+: 5b pop %ebx
+[a-f0-9]+: c3 ret
-0+21e <__x86.get_pc_thunk.bx>:
+0+1ce <__x86.get_pc_thunk.bx>:
+[a-f0-9]+: 8b 1c 24 mov \(%esp\),%ebx
+[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/ibt-plt-2d.d b/ld/testsuite/ld-i386/ibt-plt-2d.d
index efd0cd8..ec1a95c 100644
--- a/ld/testsuite/ld-i386/ibt-plt-2d.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2d.d
@@ -18,31 +18,31 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0+18 0000001c 0000001c FDE cie=00000000 pc=00000200..0000021e
- DW_CFA_advance_loc: 1 to 00000201
+0+18 0000001c 0000001c FDE cie=00000000 pc=000001b0..000001ce
+ DW_CFA_advance_loc: 1 to 000001b1
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r3 \(ebx\) at cfa-8
- DW_CFA_advance_loc: 14 to 0000020f
+ DW_CFA_advance_loc: 14 to 000001bf
DW_CFA_def_cfa_offset: 16
- DW_CFA_advance_loc: 13 to 0000021c
+ DW_CFA_advance_loc: 13 to 000001cc
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 1 to 0000021d
+ DW_CFA_advance_loc: 1 to 000001cd
DW_CFA_restore: r3 \(ebx\)
DW_CFA_def_cfa_offset: 4
-0+38 00000010 0000003c FDE cie=00000000 pc=0000021e..00000222
+0+38 00000010 0000003c FDE cie=00000000 pc=000001ce..000001d2
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0+4c 00000020 00000050 FDE cie=00000000 pc=000001b0..000001e0
+0+4c 00000020 00000050 FDE cie=00000000 pc=00000160..00000190
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 6 to 000001b6
+ DW_CFA_advance_loc: 6 to 00000166
DW_CFA_def_cfa_offset: 12
- DW_CFA_advance_loc: 10 to 000001c0
+ DW_CFA_advance_loc: 10 to 00000170
DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit9; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
-0+70 00000010 00000074 FDE cie=00000000 pc=000001e0..00000200
+0+70 00000010 00000074 FDE cie=00000000 pc=00000190..000001b0
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
diff --git a/ld/testsuite/ld-i386/ibt-plt-3a.d b/ld/testsuite/ld-i386/ibt-plt-3a.d
index a9c0f53..4bbf1a3 100644
--- a/ld/testsuite/ld-i386/ibt-plt-3a.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3a.d
@@ -8,45 +8,45 @@
Disassembly of section .plt:
-0+190 <.plt>:
+0+140 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e2 ff ff ff jmp 190 <.plt>
+ +[a-f0-9]+: e9 e2 ff ff ff jmp 140 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d2 ff ff ff jmp 190 <.plt>
+ +[a-f0-9]+: e9 d2 ff ff ff jmp 140 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .plt.sec:
-0+1c0 <bar1@plt>:
+0+170 <bar1@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-0+1d0 <bar2@plt>:
+0+180 <bar2@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 10 00 00 00 jmp \*0x10\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
Disassembly of section .text:
-0+1e0 <foo>:
+0+190 <foo>:
+[a-f0-9]+: 53 push %ebx
- +[a-f0-9]+: e8 18 00 00 00 call 1fe <__x86.get_pc_thunk.bx>
+ +[a-f0-9]+: e8 18 00 00 00 call 1ae <__x86.get_pc_thunk.bx>
+[a-f0-9]+: 81 c3 1a 11 00 00 add \$0x111a,%ebx
+[a-f0-9]+: 83 ec 08 sub \$0x8,%esp
- +[a-f0-9]+: e8 dc ff ff ff call 1d0 <bar2@plt>
- +[a-f0-9]+: e8 c7 ff ff ff call 1c0 <bar1@plt>
+ +[a-f0-9]+: e8 dc ff ff ff call 180 <bar2@plt>
+ +[a-f0-9]+: e8 c7 ff ff ff call 170 <bar1@plt>
+[a-f0-9]+: 83 c4 08 add \$0x8,%esp
+[a-f0-9]+: 5b pop %ebx
+[a-f0-9]+: c3 ret
-0+1fe <__x86.get_pc_thunk.bx>:
+0+1ae <__x86.get_pc_thunk.bx>:
+[a-f0-9]+: 8b 1c 24 mov \(%esp\),%ebx
+[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/ibt-plt-3b.d b/ld/testsuite/ld-i386/ibt-plt-3b.d
index fa66d63..75a2ecb 100644
--- a/ld/testsuite/ld-i386/ibt-plt-3b.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3b.d
@@ -18,31 +18,31 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0+18 0000001c 0000001c FDE cie=00000000 pc=000001e0..000001fe
- DW_CFA_advance_loc: 1 to 000001e1
+0+18 0000001c 0000001c FDE cie=00000000 pc=00000190..000001ae
+ DW_CFA_advance_loc: 1 to 00000191
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r3 \(ebx\) at cfa-8
- DW_CFA_advance_loc: 14 to 000001ef
+ DW_CFA_advance_loc: 14 to 0000019f
DW_CFA_def_cfa_offset: 16
- DW_CFA_advance_loc: 13 to 000001fc
+ DW_CFA_advance_loc: 13 to 000001ac
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 1 to 000001fd
+ DW_CFA_advance_loc: 1 to 000001ad
DW_CFA_restore: r3 \(ebx\)
DW_CFA_def_cfa_offset: 4
-0+38 00000010 0000003c FDE cie=00000000 pc=000001fe..00000202
+0+38 00000010 0000003c FDE cie=00000000 pc=000001ae..000001b2
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0+4c 00000020 00000050 FDE cie=00000000 pc=00000190..000001c0
+0+4c 00000020 00000050 FDE cie=00000000 pc=00000140..00000170
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 6 to 00000196
+ DW_CFA_advance_loc: 6 to 00000146
DW_CFA_def_cfa_offset: 12
- DW_CFA_advance_loc: 10 to 000001a0
+ DW_CFA_advance_loc: 10 to 00000150
DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit9; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
-0+70 00000010 00000074 FDE cie=00000000 pc=000001c0..000001e0
+0+70 00000010 00000074 FDE cie=00000000 pc=00000170..00000190
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
diff --git a/ld/testsuite/ld-i386/ibt-plt-3c.d b/ld/testsuite/ld-i386/ibt-plt-3c.d
index a9c0f53..4bbf1a3 100644
--- a/ld/testsuite/ld-i386/ibt-plt-3c.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3c.d
@@ -8,45 +8,45 @@
Disassembly of section .plt:
-0+190 <.plt>:
+0+140 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e2 ff ff ff jmp 190 <.plt>
+ +[a-f0-9]+: e9 e2 ff ff ff jmp 140 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d2 ff ff ff jmp 190 <.plt>
+ +[a-f0-9]+: e9 d2 ff ff ff jmp 140 <.plt>
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .plt.sec:
-0+1c0 <bar1@plt>:
+0+170 <bar1@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-0+1d0 <bar2@plt>:
+0+180 <bar2@plt>:
+[a-f0-9]+: f3 0f 1e fb endbr32
+[a-f0-9]+: ff a3 10 00 00 00 jmp \*0x10\(%ebx\)
+[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
Disassembly of section .text:
-0+1e0 <foo>:
+0+190 <foo>:
+[a-f0-9]+: 53 push %ebx
- +[a-f0-9]+: e8 18 00 00 00 call 1fe <__x86.get_pc_thunk.bx>
+ +[a-f0-9]+: e8 18 00 00 00 call 1ae <__x86.get_pc_thunk.bx>
+[a-f0-9]+: 81 c3 1a 11 00 00 add \$0x111a,%ebx
+[a-f0-9]+: 83 ec 08 sub \$0x8,%esp
- +[a-f0-9]+: e8 dc ff ff ff call 1d0 <bar2@plt>
- +[a-f0-9]+: e8 c7 ff ff ff call 1c0 <bar1@plt>
+ +[a-f0-9]+: e8 dc ff ff ff call 180 <bar2@plt>
+ +[a-f0-9]+: e8 c7 ff ff ff call 170 <bar1@plt>
+[a-f0-9]+: 83 c4 08 add \$0x8,%esp
+[a-f0-9]+: 5b pop %ebx
+[a-f0-9]+: c3 ret
-0+1fe <__x86.get_pc_thunk.bx>:
+0+1ae <__x86.get_pc_thunk.bx>:
+[a-f0-9]+: 8b 1c 24 mov \(%esp\),%ebx
+[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/ibt-plt-3d.d b/ld/testsuite/ld-i386/ibt-plt-3d.d
index 231798c..35742ca 100644
--- a/ld/testsuite/ld-i386/ibt-plt-3d.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3d.d
@@ -18,31 +18,31 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0+18 0000001c 0000001c FDE cie=00000000 pc=00000200..0000021e
- DW_CFA_advance_loc: 1 to 00000201
+0+18 0000001c 0000001c FDE cie=00000000 pc=000001b0..000001ce
+ DW_CFA_advance_loc: 1 to 000001b1
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r3 \(ebx\) at cfa-8
- DW_CFA_advance_loc: 14 to 0000020f
+ DW_CFA_advance_loc: 14 to 000001bf
DW_CFA_def_cfa_offset: 16
- DW_CFA_advance_loc: 13 to 0000021c
+ DW_CFA_advance_loc: 13 to 000001cc
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 1 to 0000021d
+ DW_CFA_advance_loc: 1 to 000001cd
DW_CFA_restore: r3 \(ebx\)
DW_CFA_def_cfa_offset: 4
-0+38 00000010 0000003c FDE cie=00000000 pc=0000021e..00000222
+0+38 00000010 0000003c FDE cie=00000000 pc=000001ce..000001d2
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0+4c 00000020 00000050 FDE cie=00000000 pc=000001b0..000001e0
+0+4c 00000020 00000050 FDE cie=00000000 pc=00000160..00000190
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 6 to 000001b6
+ DW_CFA_advance_loc: 6 to 00000166
DW_CFA_def_cfa_offset: 12
- DW_CFA_advance_loc: 10 to 000001c0
+ DW_CFA_advance_loc: 10 to 00000170
DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit9; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
-0+70 00000010 00000074 FDE cie=00000000 pc=000001e0..00000200
+0+70 00000010 00000074 FDE cie=00000000 pc=00000190..000001b0
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
diff --git a/ld/testsuite/ld-i386/plt2.dd b/ld/testsuite/ld-i386/plt2.dd
index 9f8e11d..f1a49e5 100644
--- a/ld/testsuite/ld-i386/plt2.dd
+++ b/ld/testsuite/ld-i386/plt2.dd
@@ -9,26 +9,26 @@
Disassembly of section .plt:
-0+80481c0 <.plt>:
- +[a-f0-9]+: ff 35 a0 92 04 08 pushl 0x80492a0
- +[a-f0-9]+: ff 25 a4 92 04 08 jmp \*0x80492a4
+0+8048160 <.plt>:
+ +[a-f0-9]+: ff 35 40 92 04 08 pushl 0x8049240
+ +[a-f0-9]+: ff 25 44 92 04 08 jmp \*0x8049244
+[a-f0-9]+: 00 00 add %al,\(%eax\)
...
-0+80481d0 <fn1@plt>:
- +[a-f0-9]+: ff 25 a8 92 04 08 jmp \*0x80492a8
+0+8048170 <fn1@plt>:
+ +[a-f0-9]+: ff 25 48 92 04 08 jmp \*0x8049248
+[a-f0-9]+: 68 00 00 00 00 push \$0x0
- +[a-f0-9]+: e9 e0 ff ff ff jmp 80481c0 <.plt>
+ +[a-f0-9]+: e9 e0 ff ff ff jmp 8048160 <.plt>
-0+80481e0 <fn2@plt>:
- +[a-f0-9]+: ff 25 ac 92 04 08 jmp \*0x80492ac
+0+8048180 <fn2@plt>:
+ +[a-f0-9]+: ff 25 4c 92 04 08 jmp \*0x804924c
+[a-f0-9]+: 68 08 00 00 00 push \$0x8
- +[a-f0-9]+: e9 d0 ff ff ff jmp 80481c0 <.plt>
+ +[a-f0-9]+: e9 d0 ff ff ff jmp 8048160 <.plt>
Disassembly of section .text:
-0+80481f0 <_start>:
- +[a-f0-9]+: e8 db ff ff ff call 80481d0 <fn1@plt>
- +[a-f0-9]+: e8 e6 ff ff ff call 80481e0 <fn2@plt>
- +[a-f0-9]+: 81 7c 24 04 d0 81 04 08 cmpl \$0x80481d0,0x4\(%esp\)
+0+8048190 <_start>:
+ +[a-f0-9]+: e8 db ff ff ff call 8048170 <fn1@plt>
+ +[a-f0-9]+: e8 e6 ff ff ff call 8048180 <fn2@plt>
+ +[a-f0-9]+: 81 7c 24 04 70 81 04 08 cmpl \$0x8048170,0x4\(%esp\)
#pass
diff --git a/ld/testsuite/ld-i386/pr20830.d b/ld/testsuite/ld-i386/pr20830.d
index a16ea67..5532207 100644
--- a/ld/testsuite/ld-i386/pr20830.d
+++ b/ld/testsuite/ld-i386/pr20830.d
@@ -20,19 +20,19 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0+18 00000010 0000001c FDE cie=00000000 pc=00000188..00000193
+0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0+2c 00000020 00000030 FDE cie=00000000 pc=00000170..00000180
+0+2c 00000020 00000030 FDE cie=00000000 pc=00000110..00000120
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 6 to 00000176
+ DW_CFA_advance_loc: 6 to 00000116
DW_CFA_def_cfa_offset: 12
- DW_CFA_advance_loc: 10 to 00000180
+ DW_CFA_advance_loc: 10 to 00000120
DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
-0+50 00000010 00000054 FDE cie=00000000 pc=00000180..00000188
+0+50 00000010 00000054 FDE cie=00000000 pc=00000120..00000128
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
@@ -40,7 +40,7 @@ Contents of the .eh_frame section:
Disassembly of section .plt:
-0+170 <.plt>:
+0+110 <.plt>:
+[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\)
+[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\)
+[a-f0-9]+: 00 00 add %al,\(%eax\)
@@ -48,13 +48,13 @@ Disassembly of section .plt:
Disassembly of section .plt.got:
-0+180 <func@plt>:
+0+120 <func@plt>:
+[a-f0-9]+: ff a3 fc ff ff ff jmp \*-0x4\(%ebx\)
+[a-f0-9]+: 66 90 xchg %ax,%ax
Disassembly of section .text:
-0+188 <foo>:
- +[a-f0-9]+: e8 f3 ff ff ff call 180 <func@plt>
+0+128 <foo>:
+ +[a-f0-9]+: e8 f3 ff ff ff call 120 <func@plt>
+[a-f0-9]+: 8b 83 fc ff ff ff mov -0x4\(%ebx\),%eax
#pass
diff --git a/ld/testsuite/ld-i386/tlsbin-nacl.rd b/ld/testsuite/ld-i386/tlsbin-nacl.rd
index 7bb8b0a..38642ce 100644
--- a/ld/testsuite/ld-i386/tlsbin-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsbin-nacl.rd
@@ -78,11 +78,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index d3bae56..ee272f6 100644
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -76,11 +76,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsbin2-nacl.rd b/ld/testsuite/ld-i386/tlsbin2-nacl.rd
index 0011716..da69c27 100644
--- a/ld/testsuite/ld-i386/tlsbin2-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsbin2-nacl.rd
@@ -73,11 +73,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsbin2.rd b/ld/testsuite/ld-i386/tlsbin2.rd
index e34d167..5abf9ea 100644
--- a/ld/testsuite/ld-i386/tlsbin2.rd
+++ b/ld/testsuite/ld-i386/tlsbin2.rd
@@ -71,11 +71,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd
index 39c60a5..f86ad79 100644
--- a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd
@@ -60,9 +60,9 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
0*100310ec +00000425 R_386_TLS_TPOFF32 0+ +sG2
0*100310f0 +00000525 R_386_TLS_TPOFF32 0+ +sG4
0*100310f4 +0000050e R_386_TLS_TPOFF +0+ +sG4
-0*100310f8 +00000725 R_386_TLS_TPOFF32 0+ +sG6
-0*100310fc +00000825 R_386_TLS_TPOFF32 0+ +sG1
-0*10031100 +00000b0e R_386_TLS_TPOFF +0+ +sG8
+0*100310f8 +00000625 R_386_TLS_TPOFF32 0+ +sG6
+0*100310fc +00000725 R_386_TLS_TPOFF32 0+ +sG1
+0*10031100 +0000080e R_386_TLS_TPOFF +0+ +sG8
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx Name
@@ -72,11 +72,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
Symbol table '\.symtab' contains [0-9]+ entries:
diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd
index 7cc85f1..cd3c06e 100644
--- a/ld/testsuite/ld-i386/tlsbindesc.rd
+++ b/ld/testsuite/ld-i386/tlsbindesc.rd
@@ -58,9 +58,9 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
0+804a0ec +00000425 R_386_TLS_TPOFF32 0+ +sG2
0+804a0f0 +00000525 R_386_TLS_TPOFF32 0+ +sG4
0+804a0f4 +0000050e R_386_TLS_TPOFF +0+ +sG4
-0+804a0f8 +00000725 R_386_TLS_TPOFF32 0+ +sG6
-0+804a0fc +00000825 R_386_TLS_TPOFF32 0+ +sG1
-0+804a100 +00000b0e R_386_TLS_TPOFF +0+ +sG8
+0+804a0f8 +00000625 R_386_TLS_TPOFF32 0+ +sG6
+0+804a0fc +00000725 R_386_TLS_TPOFF32 0+ +sG1
+0+804a100 +0000080e R_386_TLS_TPOFF +0+ +sG8
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx Name
@@ -70,11 +70,8 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[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+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
Symbol table '\.symtab' contains [0-9]+ entries:
diff --git a/ld/testsuite/ld-i386/tlsdesc-nacl.rd b/ld/testsuite/ld-i386/tlsdesc-nacl.rd
index 20c8ea2..6237691 100644
--- a/ld/testsuite/ld-i386/tlsdesc-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsdesc-nacl.rd
@@ -87,12 +87,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
Symbol table '\.symtab' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
@@ -143,9 +140,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd
index 3486847..d47d2e9 100644
--- a/ld/testsuite/ld-i386/tlsdesc.rd
+++ b/ld/testsuite/ld-i386/tlsdesc.rd
@@ -85,12 +85,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
Symbol table '\.symtab' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
@@ -141,9 +138,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
diff --git a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd b/ld/testsuite/ld-i386/tlsgdesc-nacl.rd
index 407bf2c..9107fd4 100644
--- a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsgdesc-nacl.rd
@@ -67,12 +67,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -94,10 +91,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsgdesc.rd b/ld/testsuite/ld-i386/tlsgdesc.rd
index 269cede..ef131ef 100644
--- a/ld/testsuite/ld-i386/tlsgdesc.rd
+++ b/ld/testsuite/ld-i386/tlsgdesc.rd
@@ -65,12 +65,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +7 fc1
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -92,10 +89,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +7 fc1
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsnopic-nacl.rd b/ld/testsuite/ld-i386/tlsnopic-nacl.rd
index 15e7eea..e981c86 100644
--- a/ld/testsuite/ld-i386/tlsnopic-nacl.rd
+++ b/ld/testsuite/ld-i386/tlsnopic-nacl.rd
@@ -16,9 +16,9 @@ Section Headers:
+\[[ 0-9]+\] \.dynstr +.*
+\[[ 0-9]+\] \.rel.dyn +.*
+\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000024 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10010284 .*
- +\[[ 0-9]+\] \.got +PROGBITS +0*10010304 .*
- +\[[ 0-9]+\] \.got.plt +PROGBITS +0*1001031c .*
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10010230 .*
+ +\[[ 0-9]+\] \.got +PROGBITS +0*100102b0 .*
+ +\[[ 0-9]+\] \.got.plt +PROGBITS +0*100102c8 .*
+\[[ 0-9]+\] \.symtab +.*
+\[[ 0-9]+\] \.strtab +.*
+\[[ 0-9]+\] \.shstrtab +.*
@@ -77,10 +77,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 fn3
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _end
Symbol table '\.symtab' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
@@ -105,14 +102,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+1c +0 +TLS +LOCAL +DEFAULT +6 sh3
+[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sh4
+[0-9]+: 0+14 +0 +TLS +LOCAL +DEFAULT +6 sh1
- +[0-9]+: 0*1001031c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: 0*100102c8 +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_
+[0-9]+: 0+18 +0 +TLS +LOCAL +DEFAULT +6 sh2
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4
+[0-9]+: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 fn3
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _end
diff --git a/ld/testsuite/ld-i386/tlsnopic.dd b/ld/testsuite/ld-i386/tlsnopic.dd
index 10d24a4..fb86490 100644
--- a/ld/testsuite/ld-i386/tlsnopic.dd
+++ b/ld/testsuite/ld-i386/tlsnopic.dd
@@ -16,14 +16,14 @@ Disassembly of section .text:
+[0-9a-f]+: 65 a1 00 00 00 00[ ]+mov %gs:0x0,%eax
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
- +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+c,%eax
+ +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+(c|8),%eax
# ->R_386_TLS_TPOFF sg1
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
# @indntpoff direct %gs access IE against global var
- +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+0,%edx
+ +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+(0|c),%edx
# ->R_386_TLS_TPOFF sg2
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
@@ -36,14 +36,14 @@ Disassembly of section .text:
+[0-9a-f]+: 65 a1 00 00 00 00[ ]+mov %gs:0x0,%eax
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
- +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+4,%eax
+ +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+(4|0),%eax
# ->R_386_TLS_TPOFF [0x14000000]
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
# @indntpoff direct %gs access IE against hidden var
- +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+8,%edx
+ +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+(8|4),%edx
# ->R_386_TLS_TPOFF [0x18000000]
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
@@ -56,14 +56,14 @@ Disassembly of section .text:
+[0-9a-f]+: 65 a1 00 00 00 00[ ]+mov %gs:0x0,%eax
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
- +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+4,%eax
+ +[0-9a-f]+: 03 05 ([0-9a-f]{2} ){4}[ ]+add 0x[0-9a-f]+(4|0),%eax
# ->R_386_TLS_TPOFF [0x00000000]
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
# @indntpoff direct %gs access IE against local var
- +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+8,%edx
+ +[0-9a-f]+: 8b 15 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+(8|4),%edx
# ->R_386_TLS_TPOFF [0x04000000]
+[0-9a-f]+: 90[ ]+nop *
+[0-9a-f]+: 90[ ]+nop *
diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index b60fb1d..4856c64 100644
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -75,10 +75,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +5 fn3
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _end
Symbol table '\.symtab' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
@@ -110,7 +107,4 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +5 fn3
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 __bss_start
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +9 _end
diff --git a/ld/testsuite/ld-i386/tlsnopic.sd b/ld/testsuite/ld-i386/tlsnopic.sd
index 786aac6..72420ad 100644
--- a/ld/testsuite/ld-i386/tlsnopic.sd
+++ b/ld/testsuite/ld-i386/tlsnopic.sd
@@ -8,5 +8,5 @@
.*: file format elf32-i386.*
Contents of section \.got:
- [0-9a-f]+4 00000000 04000000 00000000 00000000 .*
- [0-9a-f]+4 14000000 18000000 +.*
+ [0-9a-f]+(4|0) 00000000 04000000 00000000 00000000 .*
+ [0-9a-f]+(4|0) 14000000 18000000 +.*
diff --git a/ld/testsuite/ld-i386/tlspic-nacl.rd b/ld/testsuite/ld-i386/tlspic-nacl.rd
index 0ce64ce..38aaf6a 100644
--- a/ld/testsuite/ld-i386/tlspic-nacl.rd
+++ b/ld/testsuite/ld-i386/tlspic-nacl.rd
@@ -90,12 +90,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -147,10 +144,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index 4a06ba6..ae92058 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -88,12 +88,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -145,10 +142,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +12 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlspic2-nacl.rd b/ld/testsuite/ld-i386/tlspic2-nacl.rd
index 5fb6ba6..c5e8a0e 100644
--- a/ld/testsuite/ld-i386/tlspic2-nacl.rd
+++ b/ld/testsuite/ld-i386/tlspic2-nacl.rd
@@ -85,12 +85,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -140,10 +137,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlspic2.rd b/ld/testsuite/ld-i386/tlspic2.rd
index ab00063..59f1cdd 100644
--- a/ld/testsuite/ld-i386/tlspic2.rd
+++ b/ld/testsuite/ld-i386/tlspic2.rd
@@ -83,12 +83,9 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
Symbol table '\.symtab' contains [0-9]+ entries:
@@ -138,10 +135,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 fn1
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 __bss_start
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +10 _end
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr