aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2005-08-15 15:39:48 +0000
committerAlan Modra <amodra@gmail.com>2005-08-15 15:39:48 +0000
commit85167a847e75be75d22a57909d384bad806e66ab (patch)
tree1cf8759980d9a880793809a4bf9dbc74761c8bc0
parentd98685ac81121ad2dc5acec4300d9f0833b7bd0f (diff)
downloadgdb-85167a847e75be75d22a57909d384bad806e66ab.zip
gdb-85167a847e75be75d22a57909d384bad806e66ab.tar.gz
gdb-85167a847e75be75d22a57909d384bad806e66ab.tar.bz2
Adjust for dynamic sym changes.
-rw-r--r--ld/testsuite/ChangeLog123
-rw-r--r--ld/testsuite/ld-alpha/tlsbin.rd153
-rw-r--r--ld/testsuite/ld-alpha/tlsbinr.rd159
-rw-r--r--ld/testsuite/ld-alpha/tlspic.rd9
-rw-r--r--ld/testsuite/ld-arm/mixed-app.d4
-rw-r--r--ld/testsuite/ld-arm/mixed-app.sym19
-rw-r--r--ld/testsuite/ld-arm/mixed-lib.sym1
-rw-r--r--ld/testsuite/ld-arm/tls-app.d22
-rw-r--r--ld/testsuite/ld-arm/tls-app.r12
-rw-r--r--ld/testsuite/ld-cris/expdyn5.d4
-rw-r--r--ld/testsuite/ld-cris/expdyn6.d4
-rw-r--r--ld/testsuite/ld-cris/expdyn7.d4
-rw-r--r--ld/testsuite/ld-cris/gotplt1.d38
-rw-r--r--ld/testsuite/ld-cris/gotplt2.d24
-rw-r--r--ld/testsuite/ld-cris/gotplt3.d26
-rw-r--r--ld/testsuite/ld-cris/hiddef1.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-10.d24
-rw-r--r--ld/testsuite/ld-cris/libdso-11.d18
-rw-r--r--ld/testsuite/ld-cris/libdso-12.d52
-rw-r--r--ld/testsuite/ld-cris/libdso-13.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-14.d8
-rw-r--r--ld/testsuite/ld-cris/libdso-2.d2
-rw-r--r--ld/testsuite/ld-cris/pv32-1.d39
-rw-r--r--ld/testsuite/ld-cris/weakref2.d2
-rw-r--r--ld/testsuite/ld-frv/fdpic-pie-1.d82
-rw-r--r--ld/testsuite/ld-frv/fdpic-pie-2.d110
-rw-r--r--ld/testsuite/ld-frv/fdpic-pie-6.d112
-rw-r--r--ld/testsuite/ld-frv/fdpic-pie-7.d88
-rw-r--r--ld/testsuite/ld-frv/fdpic-pie-8.d110
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-1.d88
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-2.d124
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-3.d136
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-4.d110
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-5.d134
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-6.d112
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-7.d88
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-8.d134
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-local-2.d134
-rw-r--r--ld/testsuite/ld-frv/fdpic-shared-local-8.d134
-rw-r--r--ld/testsuite/ld-frv/fdpic-static-1.d94
-rw-r--r--ld/testsuite/ld-frv/fdpic-static-2.d152
-rw-r--r--ld/testsuite/ld-frv/fdpic-static-6.d48
-rw-r--r--ld/testsuite/ld-frv/fdpic-static-7.d94
-rw-r--r--ld/testsuite/ld-frv/fdpic-static-8.d152
-rw-r--r--ld/testsuite/ld-frv/tls-dynamic-1.d118
-rw-r--r--ld/testsuite/ld-frv/tls-dynamic-2.d370
-rw-r--r--ld/testsuite/ld-frv/tls-dynamic-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-initial-shared-2.d438
-rw-r--r--ld/testsuite/ld-frv/tls-pie-1.d118
-rw-r--r--ld/testsuite/ld-frv/tls-pie-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-relax-dynamic-1.d110
-rw-r--r--ld/testsuite/ld-frv/tls-relax-dynamic-2.d274
-rw-r--r--ld/testsuite/ld-frv/tls-relax-dynamic-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-relax-initial-shared-2.d402
-rw-r--r--ld/testsuite/ld-frv/tls-relax-pie-1.d110
-rw-r--r--ld/testsuite/ld-frv/tls-relax-pie-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-relax-shared-1.d120
-rw-r--r--ld/testsuite/ld-frv/tls-relax-shared-2.d498
-rw-r--r--ld/testsuite/ld-frv/tls-relax-shared-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-relax-static-1.d106
-rw-r--r--ld/testsuite/ld-frv/tls-shared-1.d120
-rw-r--r--ld/testsuite/ld-frv/tls-shared-2.d498
-rw-r--r--ld/testsuite/ld-frv/tls-shared-3.d30
-rw-r--r--ld/testsuite/ld-frv/tls-static-1.d116
-rw-r--r--ld/testsuite/ld-frv/tls-static-3.d28
-rw-r--r--ld/testsuite/ld-i386/tlsbin.rd25
-rw-r--r--ld/testsuite/ld-i386/tlsnopic.rd5
-rw-r--r--ld/testsuite/ld-i386/tlspic.rd5
-rw-r--r--ld/testsuite/ld-ia64/tlsbin.dd8
-rw-r--r--ld/testsuite/ld-ia64/tlsbin.rd163
-rw-r--r--ld/testsuite/ld-ia64/tlspic.dd8
-rw-r--r--ld/testsuite/ld-ia64/tlspic.rd171
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe.g6
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe.r107
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe32.d2
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe32.g2
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe32.r131
-rw-r--r--ld/testsuite/ld-powerpc/tlsexetoc.g12
-rw-r--r--ld/testsuite/ld-powerpc/tlsexetoc.r113
-rw-r--r--ld/testsuite/ld-powerpc/tlsso.g12
-rw-r--r--ld/testsuite/ld-powerpc/tlsso.r163
-rw-r--r--ld/testsuite/ld-powerpc/tlsso32.d2
-rw-r--r--ld/testsuite/ld-powerpc/tlsso32.g2
-rw-r--r--ld/testsuite/ld-powerpc/tlsso32.r143
-rw-r--r--ld/testsuite/ld-powerpc/tlstocso.g12
-rw-r--r--ld/testsuite/ld-powerpc/tlstocso.r159
-rw-r--r--ld/testsuite/ld-s390/tlsbin.rd207
-rw-r--r--ld/testsuite/ld-s390/tlsbin_64.rd205
-rw-r--r--ld/testsuite/ld-s390/tlspic.rd213
-rw-r--r--ld/testsuite/ld-s390/tlspic_64.rd213
-rw-r--r--ld/testsuite/ld-sh/sh64/abi32.xd24
-rw-r--r--ld/testsuite/ld-sh/sh64/abi64.xd24
-rw-r--r--ld/testsuite/ld-sh/sh64/cmpct1.xd35
-rw-r--r--ld/testsuite/ld-sh/sh64/crange1.rd66
-rw-r--r--ld/testsuite/ld-sh/sh64/crange2.rd74
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3-cmpct.rd78
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3-media.rd78
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3.rd72
-rw-r--r--ld/testsuite/ld-sh/sh64/gotplt.d4
-rw-r--r--ld/testsuite/ld-sh/sh64/init-cmpct.d14
-rw-r--r--ld/testsuite/ld-sh/sh64/init-media.d13
-rw-r--r--ld/testsuite/ld-sh/sh64/init64.d13
-rw-r--r--ld/testsuite/ld-sh/sh64/mix1.xd28
-rw-r--r--ld/testsuite/ld-sh/sh64/mix2.xd26
-rw-r--r--ld/testsuite/ld-sh/sh64/sh64.exp10
-rw-r--r--ld/testsuite/ld-sh/sh64/shdl32.xd26
-rw-r--r--ld/testsuite/ld-sh/sh64/shdl64.xd26
-rw-r--r--ld/testsuite/ld-sh/shared-1.d6
-rw-r--r--ld/testsuite/ld-sh/tlsbin-2.d51
-rw-r--r--ld/testsuite/ld-sh/tlsbin-3.d4
-rw-r--r--ld/testsuite/ld-sh/tlsbin-4.d4
-rw-r--r--ld/testsuite/ld-sh/tlspic-2.d70
-rw-r--r--ld/testsuite/ld-sparc/tlssunbin32.rd184
-rw-r--r--ld/testsuite/ld-sparc/tlssunbin64.rd184
-rw-r--r--ld/testsuite/ld-sparc/tlssunnopic32.rd130
-rw-r--r--ld/testsuite/ld-sparc/tlssunnopic64.rd134
-rw-r--r--ld/testsuite/ld-sparc/tlssunpic32.rd182
-rw-r--r--ld/testsuite/ld-sparc/tlssunpic64.rd182
-rw-r--r--ld/testsuite/ld-x86-64/tlsbin.rd169
-rw-r--r--ld/testsuite/ld-x86-64/tlspic.dd14
-rw-r--r--ld/testsuite/ld-x86-64/tlspic.rd177
121 files changed, 5342 insertions, 5442 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 55fa5e8..919e396 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,126 @@
+2005-08-16 Alan Modra <amodra@bigpond.net.au>
+
+ * ld-alpha/tlsbin.rd: Adjust for dynamic sym changes.
+ * ld-alpha/tlsbinr.rd: Likewise.
+ * ld-alpha/tlspic.rd: Likewise.
+ * ld-arm/mixed-app.d: Likewise.
+ * ld-arm/mixed-app.sym: Likewise.
+ * ld-arm/mixed-lib.sym: Likewise.
+ * ld-arm/tls-app.d: Likewise.
+ * ld-arm/tls-app.r: Likewise.
+ * ld-cris/expdyn5.d: Likewise.
+ * ld-cris/expdyn6.d: Likewise.
+ * ld-cris/expdyn7.d: Likewise.
+ * ld-cris/gotplt1.d: Likewise.
+ * ld-cris/gotplt2.d: Likewise.
+ * ld-cris/gotplt3.d: Likewise.
+ * ld-cris/hiddef1.d: Likewise.
+ * ld-cris/libdso-10.d: Likewise.
+ * ld-cris/libdso-11.d: Likewise.
+ * ld-cris/libdso-12.d: Likewise.
+ * ld-cris/libdso-13.d: Likewise.
+ * ld-cris/libdso-14.d: Likewise.
+ * ld-cris/libdso-2.d: Likewise.
+ * ld-cris/pv32-1.d: Likewise.
+ * ld-cris/weakref2.d: Likewise.
+ * ld-frv/fdpic-pie-1.d: Likewise.
+ * ld-frv/fdpic-pie-2.d: Likewise.
+ * ld-frv/fdpic-pie-6.d: Likewise.
+ * ld-frv/fdpic-pie-7.d: Likewise.
+ * ld-frv/fdpic-pie-8.d: Likewise.
+ * ld-frv/fdpic-shared-1.d: Likewise.
+ * ld-frv/fdpic-shared-2.d: Likewise.
+ * ld-frv/fdpic-shared-3.d: Likewise.
+ * ld-frv/fdpic-shared-4.d: Likewise.
+ * ld-frv/fdpic-shared-5.d: Likewise.
+ * ld-frv/fdpic-shared-6.d: Likewise.
+ * ld-frv/fdpic-shared-7.d: Likewise.
+ * ld-frv/fdpic-shared-8.d: Likewise.
+ * ld-frv/fdpic-shared-local-2.d: Likewise.
+ * ld-frv/fdpic-shared-local-8.d: Likewise.
+ * ld-frv/fdpic-static-1.d: Likewise.
+ * ld-frv/fdpic-static-2.d: Likewise.
+ * ld-frv/fdpic-static-6.d: Likewise.
+ * ld-frv/fdpic-static-7.d: Likewise.
+ * ld-frv/fdpic-static-8.d: Likewise.
+ * ld-frv/tls-dynamic-1.d: Likewise.
+ * ld-frv/tls-dynamic-2.d: Likewise.
+ * ld-frv/tls-dynamic-3.d: Likewise.
+ * ld-frv/tls-initial-shared-2.d: Likewise.
+ * ld-frv/tls-pie-1.d: Likewise.
+ * ld-frv/tls-pie-3.d: Likewise.
+ * ld-frv/tls-relax-dynamic-1.d: Likewise.
+ * ld-frv/tls-relax-dynamic-2.d: Likewise.
+ * ld-frv/tls-relax-dynamic-3.d: Likewise.
+ * ld-frv/tls-relax-initial-shared-2.d: Likewise.
+ * ld-frv/tls-relax-pie-1.d: Likewise.
+ * ld-frv/tls-relax-pie-3.d: Likewise.
+ * ld-frv/tls-relax-shared-1.d: Likewise.
+ * ld-frv/tls-relax-shared-2.d: Likewise.
+ * ld-frv/tls-relax-shared-3.d: Likewise.
+ * ld-frv/tls-relax-static-1.d: Likewise.
+ * ld-frv/tls-shared-1.d: Likewise.
+ * ld-frv/tls-shared-2.d: Likewise.
+ * ld-frv/tls-shared-3.d: Likewise.
+ * ld-frv/tls-static-1.d: Likewise.
+ * ld-frv/tls-static-3.d: Likewise.
+ * ld-i386/tlsbin.rd: Likewise.
+ * ld-i386/tlsnopic.rd: Likewise.
+ * ld-i386/tlspic.rd: Likewise.
+ * ld-ia64/tlsbin.dd: Likewise.
+ * ld-ia64/tlsbin.rd: Likewise.
+ * ld-ia64/tlspic.dd: Likewise.
+ * ld-ia64/tlspic.rd: Likewise.
+ * ld-powerpc/tlsexe.g: Likewise.
+ * ld-powerpc/tlsexe.r: Likewise.
+ * ld-powerpc/tlsexe32.d: Likewise.
+ * ld-powerpc/tlsexe32.g: Likewise.
+ * ld-powerpc/tlsexe32.r: Likewise.
+ * ld-powerpc/tlsexetoc.g: Likewise.
+ * ld-powerpc/tlsexetoc.r: Likewise.
+ * ld-powerpc/tlsso.g: Likewise.
+ * ld-powerpc/tlsso.r: Likewise.
+ * ld-powerpc/tlsso32.d: Likewise.
+ * ld-powerpc/tlsso32.g: Likewise.
+ * ld-powerpc/tlsso32.r: Likewise.
+ * ld-powerpc/tlstocso.g: Likewise.
+ * ld-powerpc/tlstocso.r: Likewise.
+ * ld-s390/tlsbin.rd: Likewise.
+ * ld-s390/tlsbin_64.rd: Likewise.
+ * ld-s390/tlspic.rd: Likewise.
+ * ld-s390/tlspic_64.rd: Likewise.
+ * ld-sh/shared-1.d: Likewise.
+ * ld-sh/tlsbin-2.d: Likewise.
+ * ld-sh/tlsbin-3.d: Likewise.
+ * ld-sh/tlsbin-4.d: Likewise.
+ * ld-sh/tlspic-2.d: Likewise.
+ * ld-sh/sh64/abi32.xd: Likewise.
+ * ld-sh/sh64/abi64.xd: Likewise.
+ * ld-sh/sh64/cmpct1.xd: Likewise.
+ * ld-sh/sh64/crange1.rd: Likewise.
+ * ld-sh/sh64/crange2.rd: Likewise.
+ * ld-sh/sh64/crange3-cmpct.rd: Likewise.
+ * ld-sh/sh64/crange3-media.rd: Likewise.
+ * ld-sh/sh64/crange3.rd: Likewise.
+ * ld-sh/sh64/gotplt.d: Likewise.
+ * ld-sh/sh64/init-cmpct.d: Likewise.
+ * ld-sh/sh64/init-media.d: Likewise.
+ * ld-sh/sh64/init64.d: Likewise.
+ * ld-sh/sh64/mix1.xd: Likewise.
+ * ld-sh/sh64/mix2.xd: Likewise.
+ * ld-sh/sh64/sh64.exp: Likewise.
+ * ld-sh/sh64/shdl32.xd: Likewise.
+ * ld-sh/sh64/shdl64.xd: Likewise.
+ * ld-sparc/tlssunbin32.rd: Likewise.
+ * ld-sparc/tlssunbin64.rd: Likewise.
+ * ld-sparc/tlssunnopic32.rd: Likewise.
+ * ld-sparc/tlssunnopic64.rd: Likewise.
+ * ld-sparc/tlssunpic32.rd: Likewise.
+ * ld-sparc/tlssunpic64.rd: Likewise.
+ * ld-x86-64/tlsbin.rd: Likewise.
+ * ld-x86-64/tlspic.dd: Likewise.
+ * ld-x86-64/tlspic.rd: Likewise.
+
2005-08-15 Alan Modra <amodra@bigpond.net.au>
* ld-elf/empty.s: Define "start".
diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd
index 26da7e5..32c9268 100644
--- a/ld/testsuite/ld-alpha/tlsbin.rd
+++ b/ld/testsuite/ld-alpha/tlsbin.rd
@@ -56,84 +56,81 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +2: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +3: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +4: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +5: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +6: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +7: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+[0-9 ]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
- +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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
+[0-9 ]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
+[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
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +12 _PROCEDURE_LINKAGE_TABLE_
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
+[0-9 ]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
+[0-9 ]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+[0-9 ]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +13 _GLOBAL_OFFSET_TABLE_
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd
index 5be3895..3148293 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.rd
+++ b/ld/testsuite/ld-alpha/tlsbinr.rd
@@ -46,89 +46,86 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+200000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0
-[0-9a-f]+ +0+600000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0
+[0-9a-f]+ +0+100000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0
+[0-9a-f]+ +0+400000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +1: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +2: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +3: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +4: 0+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +5: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +6: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +7: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9 ]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
+[0-9 ]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
+[0-9 ]+: 0+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+[0-9 ]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
- +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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
- +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
+[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
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
+[0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
+[0-9 ]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +12 _PROCEDURE_LINKAGE_TABLE_
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
+[0-9 ]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
+[0-9 ]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+[0-9 ]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9 ]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +13 _GLOBAL_OFFSET_TABLE_
+[0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
+[0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index f5a8f18..04b2e0f 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -62,11 +62,9 @@ Symbol table '.dynsym' contains [0-9]+ entries:
.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 8
.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 9
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg8
-.* [0-9a-f]+ 0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg3
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg4
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg5
-.* [0-9a-f]+ 0 OBJECT GLOBAL DEFAULT ABS _PROCEDURE_LINKAGE_TABLE_
.* [0-9a-f]+ 0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg1
.* [0-9a-f]+ 172 FUNC GLOBAL DEFAULT 6 fn1
@@ -75,7 +73,6 @@ Symbol table '.dynsym' contains [0-9]+ entries:
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg6
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg7
.* [0-9a-f]+ 0 NOTYPE GLOBAL DEFAULT ABS _edata
-.* [0-9a-f]+ 0 OBJECT GLOBAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* [0-9a-f]+ 0 NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains [0-9]+ entries:
@@ -105,9 +102,11 @@ Symbol table '.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl7
.* [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl8
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH1
+.* [0-9a-f]+ +0 OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh3
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH2
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH7
+.* [0-9a-f]+ +0 OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh7
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh8
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH4
@@ -118,14 +117,13 @@ Symbol table '.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH6
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH8
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh1
+.* [0-9a-f]+ +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh2
.* [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh6
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg8
-.* [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg3
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg4
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg5
-.* [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg1
.* [0-9a-f]+ +172 FUNC +GLOBAL DEFAULT +6 fn1
@@ -134,5 +132,4 @@ Symbol table '.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg6
.* [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg7
.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index 4e6e2d2..3812227 100644
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -8,7 +8,7 @@ Disassembly of section .plt:
.* <.plt>:
.*: e52de004 str lr, \[sp, #-4\]!
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x2c>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x20>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
@@ -34,7 +34,7 @@ Disassembly of section .text:
.* <app_func>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 stmdb sp!, {fp, ip, lr, pc}
- .*: ebffffe. bl .* <_start-0x..>
+ .*: ebfffff. bl .*
.*: e89d6800 ldmia sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop \(mov r0,r0\)
diff --git a/ld/testsuite/ld-arm/mixed-app.sym b/ld/testsuite/ld-arm/mixed-app.sym
index 38952ef..49c5edf 100644
--- a/ld/testsuite/ld-arm/mixed-app.sym
+++ b/ld/testsuite/ld-arm/mixed-app.sym
@@ -2,18 +2,17 @@
Symbol table for image:
Num Buc: Value Size Type Bind Vis Ndx Name
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _edata
- .. ..: 0*[^0]*.* 20 FUNC GLOBAL DEFAULT UND lib_func1
- .. ..: 0*[^0]*.* 2 FUNC GLOBAL DEFAULT UND lib_func2
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _bss_end__
- .. ..: ........ 0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_start__
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _end
+ .. ..: ........ 4 OBJECT GLOBAL DEFAULT 12 data_obj
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_end__
+ .. ..: 0*[^0]*.* 20 FUNC GLOBAL DEFAULT UND lib_func1
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __exidx_start
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT 11 __data_start
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _stack
- .. ..: ........ 4 OBJECT GLOBAL DEFAULT 12 data_obj
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_start__
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __end__
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _end
.. ..: .......0 0 FUNC GLOBAL DEFAULT 8 app_func2
+ .. ..: 0*[^0]*.* 2 FUNC GLOBAL DEFAULT UND lib_func2
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _bss_end__
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __exidx_end
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT 11 __data_start
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __end__
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __exidx_start
diff --git a/ld/testsuite/ld-arm/mixed-lib.sym b/ld/testsuite/ld-arm/mixed-lib.sym
index bc5266f..4ccccdb 100644
--- a/ld/testsuite/ld-arm/mixed-lib.sym
+++ b/ld/testsuite/ld-arm/mixed-lib.sym
@@ -5,7 +5,6 @@ Symbol table for image:
.. ..: .......0 20 FUNC GLOBAL DEFAULT 6 lib_func1
.. ..: .......1 2 FUNC GLOBAL DEFAULT 6 lib_func2
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _bss_end__
- .. ..: ........ 0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_end__
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _stack
.. ..: ........ 4 OBJECT GLOBAL DEFAULT 9 data_obj
diff --git a/ld/testsuite/ld-arm/tls-app.d b/ld/testsuite/ld-arm/tls-app.d
index 7f486ef..67e5de4 100644
--- a/ld/testsuite/ld-arm/tls-app.d
+++ b/ld/testsuite/ld-arm/tls-app.d
@@ -2,17 +2,17 @@
.*: file format elf32-.*arm
architecture: arm, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
-start address 0x00008274
+start address 0x00008220
Disassembly of section .text:
-00008274 <foo>:
- 8274: e1a00000 nop \(mov r0,r0\)
- 8278: e1a00000 nop \(mov r0,r0\)
- 827c: e1a0f00e mov pc, lr
- 8280: 000080bc streqh r8, \[r0\], -ip
- 8284: 000080b4 streqh r8, \[r0\], -r4
- 8288: 000080ac andeq r8, r0, ip, lsr #1
- 828c: 00000004 andeq r0, r0, r4
- 8290: 000080c4 andeq r8, r0, r4, asr #1
- 8294: 00000014 andeq r0, r0, r4, lsl r0
+00008220 <foo>:
+ 8220: e1a00000 nop \(mov r0,r0\)
+ 8224: e1a00000 nop \(mov r0,r0\)
+ 8228: e1a0f00e mov pc, lr
+ 822c: 000080bc streqh r8, \[r0\], -ip
+ 8230: 000080b4 streqh r8, \[r0\], -r4
+ 8234: 000080ac andeq r8, r0, ip, lsr #1
+ 8238: 00000004 andeq r0, r0, r4
+ 823c: 000080c4 andeq r8, r0, r4, asr #1
+ 8240: 00000014 andeq r0, r0, r4, lsl r0
diff --git a/ld/testsuite/ld-arm/tls-app.r b/ld/testsuite/ld-arm/tls-app.r
index 3f02397..af6c2d7 100644
--- a/ld/testsuite/ld-arm/tls-app.r
+++ b/ld/testsuite/ld-arm/tls-app.r
@@ -3,10 +3,8 @@
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-00010334 R_ARM_TLS_DTPMOD32 app_gd
-00010338 R_ARM_TLS_DTPOFF32 app_gd
-0001033c R_ARM_TLS_DTPMOD32 lib_gd
-00010340 R_ARM_TLS_DTPOFF32 lib_gd
-00010344 R_ARM_TLS_TPOFF32 app_ie
-
-
+[0-9a-f]+ R_ARM_TLS_DTPMOD32 app_gd
+[0-9a-f]+ R_ARM_TLS_DTPOFF32 app_gd
+[0-9a-f]+ R_ARM_TLS_DTPMOD32 lib_gd
+[0-9a-f]+ R_ARM_TLS_DTPOFF32 lib_gd
+[0-9a-f]+ R_ARM_TLS_TPOFF32 app_ie
diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
index 2e404b8..5504534 100644
--- a/ld/testsuite/ld-cris/expdyn5.d
+++ b/ld/testsuite/ld-cris/expdyn5.d
@@ -9,5 +9,5 @@
.*: file format elf32-cris
Contents of section \.got:
- 82260 f8210800 00000000 00000000 dc010800 .*
- 82270 74220800 .*
+ 82244 dc210800 00000000 00000000 bf010800 .*
+ 82254 58220800 .*
diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
index 8888ac6..43d04ff 100644
--- a/ld/testsuite/ld-cris/expdyn6.d
+++ b/ld/testsuite/ld-cris/expdyn6.d
@@ -9,5 +9,5 @@
.*: file format elf32-cris
Contents of section \.got:
- 822bc 54220800 00000000 00000000 00000000 .*
- 822cc 24020800 d4220800 .*
+ 822a0 38220800 00000000 00000000 00000000 .*
+ 822b0 07020800 b8220800 .*
diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
index 02e1464..7bd91e0 100644
--- a/ld/testsuite/ld-cris/expdyn7.d
+++ b/ld/testsuite/ld-cris/expdyn7.d
@@ -9,5 +9,5 @@
.*: file format elf32-cris
Contents of section \.got:
- 822b8 50220800 00000000 00000000 d4220800 .*
- 822c8 21020800 d0220800 .*
+ 8229c 34220800 00000000 00000000 b8220800 .*
+ 822ac 04020800 b4220800 .*
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index aac6e32..8fcb7b5 100644
--- a/ld/testsuite/ld-cris/gotplt1.d
+++ b/ld/testsuite/ld-cris/gotplt1.d
@@ -19,30 +19,30 @@
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0008229c R_CRIS_JUMP_SLOT dsofn
+00082280 R_CRIS_JUMP_SLOT dsofn
Contents of section .*
#...
Contents of section \.rela\.plt:
- 801ac 9c220800 0b050000 00000000 .*
+ 80190 80220800 0b040000 00000000 .*
Contents of section \.plt:
- 801b8 fce17e7e 7f0d9422 0800307a 7f0d9822 .*
- 801c8 08003009 7f0d9c22 08003009 3f7e0000 .*
- 801d8 00002ffe d8ffffff .*
+ 8019c fce17e7e 7f0d7822 0800307a 7f0d7c22 .*
+ 801ac 08003009 7f0d8022 08003009 3f7e0000 .*
+ 801bc 00002ffe d8ffffff .*
Contents of section \.text:
- 801e0 5f1d0c00 30096f1d 0c000000 30090000 .*
- 801f0 6f0d1000 0000611a 6f2ecc01 08000000 .*
- 80200 6f3e70df ffff0000 .*
+ 801c4 5f1d0c00 30096f1d 0c000000 30090000 .*
+ 801d4 6f0d1000 0000611a 6f2eb001 08000000 .*
+ 801e4 6f3e70df ffff0000 .*
Contents of section \.dynamic:
- 82208 01000000 01000000 04000000 e4000800 .*
- 82218 05000000 70010800 06000000 10010800 .*
- 82228 0a000000 3b000000 0b000000 10000000 .*
- 82238 15000000 00000000 03000000 90220800 .*
- 82248 02000000 0c000000 14000000 07000000 .*
- 82258 17000000 ac010800 00000000 00000000 .*
- 82268 00000000 00000000 00000000 00000000 .*
- 82278 00000000 00000000 00000000 00000000 .*
- 82288 00000000 00000000 .*
+ 821ec 01000000 01000000 04000000 e4000800 .*
+ 821fc 05000000 5c010800 06000000 0c010800 .*
+ 8220c 0a000000 32000000 0b000000 10000000 .*
+ 8221c 15000000 00000000 03000000 74220800 .*
+ 8222c 02000000 0c000000 14000000 07000000 .*
+ 8223c 17000000 90010800 00000000 00000000 .*
+ 8224c 00000000 00000000 00000000 00000000 .*
+ 8225c 00000000 00000000 00000000 00000000 .*
+ 8226c 00000000 00000000 .*
Contents of section \.got:
- 82290 08220800 00000000 00000000 d4010800 .*
- 822a0 cc010800 .*
+ 82274 ec210800 00000000 00000000 b8010800 .*
+ 82284 b0010800 .*
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index f8d961e..48f1413 100644
--- a/ld/testsuite/ld-cris/gotplt2.d
+++ b/ld/testsuite/ld-cris/gotplt2.d
@@ -16,22 +16,22 @@
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-0000224c R_CRIS_GLOB_DAT dsofn
+00002230 R_CRIS_GLOB_DAT dsofn
Contents of section .*
#...
Contents of section \.rela\.got:
- 01a4 4c220000 0a090000 00000000 .*
+ 0188 30220000 0a080000 00000000 .*
Contents of section \.text:
- 01b0 5f1d0c00 30096f1d 0c000000 30090000 .*
- 01c0 6f0d0c00 0000611a 6f3e88df ffff0000 .*
+ 0194 5f1d0c00 30096f1d 0c000000 30090000 .*
+ 01a4 6f0d0c00 0000611a 6f3e88df ffff0000 .*
Contents of section \.dynamic:
- 21d0 04000000 94000000 05000000 70010000 .*
- 21e0 06000000 d0000000 0a000000 33000000 .*
- 21f0 0b000000 10000000 07000000 a4010000 .*
- 2200 08000000 0c000000 09000000 0c000000 .*
- 2210 00000000 00000000 00000000 00000000 .*
- 2220 00000000 00000000 00000000 00000000 .*
- 2230 00000000 00000000 00000000 00000000 .*
+ 21b4 04000000 94000000 05000000 5c010000 .*
+ 21c4 06000000 cc000000 0a000000 2a000000 .*
+ 21d4 0b000000 10000000 07000000 88010000 .*
+ 21e4 08000000 0c000000 09000000 0c000000 .*
+ 21f4 00000000 00000000 00000000 00000000 .*
+ 2204 00000000 00000000 00000000 00000000 .*
+ 2214 00000000 00000000 00000000 00000000 .*
Contents of section \.got:
- 2240 d0210000 00000000 00000000 00000000 .*
+ 2224 b4210000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index 24893fb..f4cb4be 100644
--- a/ld/testsuite/ld-cris/gotplt3.d
+++ b/ld/testsuite/ld-cris/gotplt3.d
@@ -13,23 +13,23 @@
DYNAMIC RELOCATION RECORDS
OFFSET TYPE VALUE
-00002250 R_CRIS_GLOB_DAT dsofn
+00002234 R_CRIS_GLOB_DAT dsofn
Contents of section .*
#...
Contents of section \.rela\.got:
- 01a4 50220000 0a090000 00000000 .*
+ 0188 34220000 0a080000 00000000 .*
Contents of section \.text:
- 01b0 5f1d0c00 30096f1d 0c000000 30090000 .*
- 01c0 6f0d0c00 0000611a 6f3e84df ffff0000 .*
- 01d0 0f050000 .*
+ 0194 5f1d0c00 30096f1d 0c000000 30090000 .*
+ 01a4 6f0d0c00 0000611a 6f3e84df ffff0000 .*
+ 01b4 0f050000 .*
Contents of section \.dynamic:
- 21d4 04000000 94000000 05000000 70010000 .*
- 21e4 06000000 d0000000 0a000000 33000000 .*
- 21f4 0b000000 10000000 07000000 a4010000 .*
- 2204 08000000 0c000000 09000000 0c000000 .*
- 2214 00000000 00000000 00000000 00000000 .*
- 2224 00000000 00000000 00000000 00000000 .*
- 2234 00000000 00000000 00000000 00000000 .*
+ 21b8 04000000 94000000 05000000 5c010000 .*
+ 21c8 06000000 cc000000 0a000000 2a000000 .*
+ 21d8 0b000000 10000000 07000000 88010000 .*
+ 21e8 08000000 0c000000 09000000 0c000000 .*
+ 21f8 00000000 00000000 00000000 00000000 .*
+ 2208 00000000 00000000 00000000 00000000 .*
+ 2218 00000000 00000000 00000000 00000000 .*
Contents of section \.got:
- 2244 d4210000 00000000 00000000 00000000 .*
+ 2228 b8210000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index ff03ab6..de00430 100644
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -22,7 +22,7 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
#...
[0-9a-f]+ 0+c R_CRIS_RELATIVE [0-9a-f]+
#...
-Symbol table '\.dynsym' contains 7 entries:
+Symbol table '\.dynsym' contains 6 entries:
#...
Symbol table '\.symtab' contains 19 entries:
#pass
diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index b63fb82..f06c7a5 100644
--- a/ld/testsuite/ld-cris/libdso-10.d
+++ b/ld/testsuite/ld-cris/libdso-10.d
@@ -9,29 +9,29 @@
Program Header:
LOAD off 0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
- filesz 0x0+160 memsz 0x0+160 flags r-x
- LOAD off 0x0+160 vaddr 0x0+2160 paddr 0x0+2160 align 2\*\*13
+ filesz 0x0+143 memsz 0x0+143 flags r-x
+ LOAD off 0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*13
filesz 0x0+64 memsz 0x0+64 flags rw-
- DYNAMIC off 0x0+160 vaddr 0x0+2160 paddr 0x0+2160 align 2\*\*2
+ DYNAMIC off 0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*2
filesz 0x0+58 memsz 0x0+58 flags rw-
Dynamic Section:
HASH 0x94
- STRTAB 0x134
- SYMTAB 0xc4
- STRSZ 0x28
+ STRTAB 0x120
+ SYMTAB 0xc0
+ STRSZ 0x1f
SYMENT 0x10
private flags = 2: \[v32\]
Sections:
Idx Name Size VMA LMA File off Algn
- 0 \.hash 0+30 0+94 0+94 0+94 2\*\*2
+ 0 \.hash 0+2c 0+94 0+94 0+94 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 1 \.dynsym 0+70 0+c4 0+c4 0+c4 2\*\*2
+ 1 \.dynsym 0+60 0+c0 0+c0 0+c0 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.dynstr 0+28 0+134 0+134 0+134 2\*\*0
+ 2 \.dynstr 0+1f 0+120 0+120 0+120 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 3 \.text 0+4 0+15c 0+15c 0+15c 2\*\*0
+ 3 \.text 0+4 0+13f 0+13f 0+13f 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 4 \.dynamic 0+58 0+2160 0+2160 0+160 2\*\*2
+ 4 \.dynamic 0+58 0+2144 0+2144 0+144 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 5 \.got 0+c 0+21b8 0+21b8 0+1b8 2\*\*2
+ 5 \.got 0+c 0+219c 0+219c 0+19c 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index b7aee18..754edff 100644
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -8,20 +8,20 @@
DYNAMIC SYMBOL TABLE:
#...
-0+1bc g DF \.text 0+8 dsofn3
+0+1a0 g DF \.text 0+8 dsofn3
#...
-0+1b8 g DF \.text 0+ dsofn
+0+19c g DF \.text 0+ dsofn
#...
Contents of section \.rela\.plt:
- 0178 48220000 0b070000 00000000 .*
+ 015c 2c220000 0b060000 00000000 .*
Contents of section \.plt:
- 0184 84e20401 7e7a3f7a 04f26ffa bf09b005 .*
- 0194 00000000 00000000 00006f0d 0c000000 .*
- 01a4 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
- 01b4 ffffb005 .*
+ 0168 84e20401 7e7a3f7a 04f26ffa bf09b005 .*
+ 0178 00000000 00000000 00006f0d 0c000000 .*
+ 0188 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
+ 0198 ffffb005 .*
Contents of section \.text:
- 01b8 b0050000 bfbee2ff ffffb005 .*
+ 019c b0050000 bfbee2ff ffffb005 .*
Contents of section \.dynamic:
#...
Contents of section \.got:
- 223c c4210000 00000000 00000000 aa010000 .*
+ 2220 a8210000 00000000 00000000 8e010000 .*
diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index 42d7fd5..2cb8038 100644
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -12,40 +12,40 @@
DYNAMIC SYMBOL TABLE:
#...
-0+26e g DF \.text 0+12 dsofn4
-0+264 g DF \.text 0+2 expfn
-0+232c g DO \.data 0+4 expobj
+0+252 g DF \.text 0+12 dsofn4
+0+248 g DF \.text 0+2 expfn
+0+2310 g DO \.data 0+4 expobj
#...
-0+266 g DF \.text 0+8 dsofn3
+0+24a g DF \.text 0+8 dsofn3
#...
0+ D \*UND\* 0+ dsofn
#...
Contents of section \.rela\.got:
- 01f0 28230000 0a060000 00000000 .*
+ 01d4 0c230000 0a050000 00000000 .*
Contents of section \.rela\.plt:
- 01fc 20230000 0b040000 00000000 24230000 .*
- 020c 0b0c0000 00000000 .*
+ 01e0 04230000 0b030000 00000000 08230000 .*
+ 01f0 0b0b0000 00000000 .*
Contents of section \.plt:
- 0214 84e20401 7e7a3f7a 04f26ffa bf09b005 .*
- 0224 00000000 00000000 00006f0d 0c000000 .*
- 0234 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
- 0244 ffffb005 6f0d1000 00006ffa bf09b005 .*
- 0254 3f7e0c00 0000bf0e baffffff b005 .*
+ 01f8 84e20401 7e7a3f7a 04f26ffa bf09b005 .*
+ 0208 00000000 00000000 00006f0d 0c000000 .*
+ 0218 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
+ 0228 ffffb005 6f0d1000 00006ffa bf09b005 .*
+ 0238 3f7e0c00 0000bf0e baffffff b005 .*
Contents of section \.text:
- 0262 b005b005 bfbee2ff ffffb005 7f0da620 .*
- 0272 00005f0d 1400bfbe b6ffffff b0050000 .*
+ 0246 b005b005 bfbee2ff ffffb005 7f0da620 .*
+ 0256 00005f0d 1400bfbe b6ffffff b0050000 .*
Contents of section \.dynamic:
- 2284 04000000 94000000 05000000 ac010000 .*
- 2294 06000000 dc000000 0a000000 43000000 .*
- 22a4 0b000000 10000000 03000000 14230000 .*
- 22b4 02000000 18000000 14000000 07000000 .*
- 22c4 17000000 fc010000 07000000 f0010000 .*
- 22d4 08000000 0c000000 09000000 0c000000 .*
- 22e4 00000000 00000000 00000000 00000000 .*
- 22f4 00000000 00000000 00000000 00000000 .*
- 2304 00000000 00000000 00000000 00000000 .*
+ 2268 04000000 94000000 05000000 98010000 .*
+ 2278 06000000 d8000000 0a000000 3a000000 .*
+ 2288 0b000000 10000000 03000000 f8220000 .*
+ 2298 02000000 18000000 14000000 07000000 .*
+ 22a8 17000000 e0010000 07000000 d4010000 .*
+ 22b8 08000000 0c000000 09000000 0c000000 .*
+ 22c8 00000000 00000000 00000000 00000000 .*
+ 22d8 00000000 00000000 00000000 00000000 .*
+ 22e8 00000000 00000000 00000000 00000000 .*
Contents of section \.got:
- 2314 84220000 00000000 00000000 3a020000 .*
- 2324 54020000 00000000 .*
+ 22f8 68220000 00000000 00000000 1e020000 .*
+ 2308 38020000 00000000 .*
Contents of section \.data:
- 232c 00000000 .*
+ 2310 00000000 .*
diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index a416557..4e66a5f 100644
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -17,7 +17,7 @@ Dynamic section at offset 0x[0-9a-f][0-9a-f][0-9a-f] contains 10 entries:
0x0+4 \(HASH\)[ ]+0x94
0x0+5 \(STRTAB\)[ ]+0x[12][0-9a-f][0-9a-f]
0x0+6 \(SYMTAB\)[ ]+0x[0-9a-f][0-9a-f]
- 0x0+a \(STRSZ\)[ ]+47 \(bytes\)
+ 0x0+a \(STRSZ\)[ ]+38 \(bytes\)
0x0+b \(SYMENT\)[ ]+16 \(bytes\)
0x0+7 \(RELA\)[ ]+0x[12][0-9a-f][0-9a-f]
0x0+8 \(RELASZ\)[ ]+12 \(bytes\)
diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index 56574df..c0a20e8 100644
--- a/ld/testsuite/ld-cris/libdso-14.d
+++ b/ld/testsuite/ld-cris/libdso-14.d
@@ -7,12 +7,12 @@
# Checking that a bsr to a non-PLT-decorated nonvisible function
# doesn't make the DSO textrel.
-Dynamic section at offset 0x188 contains 6 entries:
+Dynamic section at offset 0x16c contains 6 entries:
Tag[ ]+Type[ ]+Name/Value
0x0+4 \(HASH\)[ ]+0x94
- 0x0+5 \(STRTAB\)[ ]+0x148
- 0x0+6 \(SYMTAB\)[ ]+0xc8
- 0x0+a \(STRSZ\)[ ]+47 \(bytes\)
+ 0x0+5 \(STRTAB\)[ ]+0x134
+ 0x0+6 \(SYMTAB\)[ ]+0xc4
+ 0x0+a \(STRSZ\)[ ]+38 \(bytes\)
0x0+b \(SYMENT\)[ ]+16 \(bytes\)
0x0+ \(NULL\)[ ]+0x0
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index eba390a..f67c7b0 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -51,7 +51,7 @@ Symbol table '\.symtab' contains 21 entries:
10: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 10
11: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 11
12: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 12
- 13: 0+216c 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
+ 13: 0+216c 0 OBJECT LOCAL HIDDEN ABS _DYNAMIC
14: 0+2204 0 NOTYPE LOCAL DEFAULT ABS __bss_start
15: 0+2204 0 NOTYPE LOCAL DEFAULT ABS _edata
16: 0+21f4 0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index 9654697..2684c95 100644
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -8,34 +8,33 @@
.*: file format elf32-cris
DYNAMIC SYMBOL TABLE:
-0+8228c g DO \*ABS\* 0+ _DYNAMIC
-0+8023a DF \*UND\* 0+2 expfn
-0+82340 g DO \.bss 0+4 expobj
-0+82340 g D \*ABS\* 0+ __bss_start
-0+80254 DF \*UND\* 0+8 dsofn3
-0+82340 g D \*ABS\* 0+ _edata
-0+82360 g D \*ABS\* 0+ _end
-0+80280 g DF \.text 0+8 dsofn
+0+8021e DF \*UND\* 0+2 expfn
+0+82324 g DO \.bss 0+4 expobj
+0+82324 g D \*ABS\* 0+ __bss_start
+0+80238 DF \*UND\* 0+8 dsofn3
+0+82324 g D \*ABS\* 0+ _edata
+0+82340 g D \*ABS\* 0+ _end
+0+80264 g DF \.text 0+8 dsofn
Contents of section \.interp:
800d4 2f6c6962 2f6c642e 736f2e31 00 .*
#...
Contents of section \.rela\.dyn:
- 801fc 40230800 09030000 00000000 .*
+ 801e0 24230800 09020000 00000000 .*
Contents of section \.rela\.plt:
- 80208 38230800 0b020000 00000000 3c230800 .*
- 80218 0b050000 00000000 .*
+ 801ec 1c230800 0b010000 00000000 20230800 .*
+ 801fc 0b040000 00000000 .*
Contents of section \.plt:
- 80220 84e26ffe 30230800 7e7a3f7a 04f26ffa .*
- 80230 bf09b005 00000000 00006ffe 38230800 .*
- 80240 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
- 80250 ffffb005 6ffe3c23 08006ffa bf09b005 .*
- 80260 3f7e0c00 0000bf0e baffffff b005 .*
+ 80204 84e26ffe 14230800 7e7a3f7a 04f26ffa .*
+ 80214 bf09b005 00000000 00006ffe 1c230800 .*
+ 80224 6ffabf09 b0053f7e 00000000 bf0ed4ff .*
+ 80234 ffffb005 6ffe2023 08006ffa bf09b005 .*
+ 80244 3f7e0c00 0000bf0e baffffff b005 .*
Contents of section \.text:
- 8026e b005bfbe caffffff b005bfbe dcffffff .*
- 8027e b0056fae 40230800 b0050000 .*
+ 80252 b005bfbe caffffff b005bfbe dcffffff .*
+ 80262 b0056fae 24230800 b0050000 .*
Contents of section \.dynamic:
#...
Contents of section \.got:
- 8232c 8c220800 00000000 00000000 46020800 .*
- 8233c 60020800 .*
+ 82310 70220800 00000000 00000000 2a020800 .*
+ 82320 44020800 .*
diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index 5b34bfc..b78ccca 100644
--- a/ld/testsuite/ld-cris/weakref2.d
+++ b/ld/testsuite/ld-cris/weakref2.d
@@ -7,4 +7,4 @@
.*: file format elf32-cris
Contents of section \.got:
- 82204 9c210800 00000000 00000000 00000000 .*
+ 821e4 7c210800 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-frv/fdpic-pie-1.d b/ld/testsuite/ld-frv/fdpic-pie-1.d
index 0e5b236..0e37324 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-1.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-1.d
@@ -7,51 +7,51 @@
Disassembly of section \.text:
-00000340 <F1>:
- 340: 80 3c 00 01 call 344 <\.F0>
-
-00000344 <\.F0>:
- 344: 80 40 f0 0c addi gr15,12,gr0
- 348: 80 fc 00 0c setlos 0xc,gr0
- 34c: 80 f4 00 0c setlo 0xc,gr0
- 350: 80 f8 00 00 sethi hi\(0x0\),gr0
- 354: 80 40 f0 10 addi gr15,16,gr0
- 358: 80 fc 00 10 setlos 0x10,gr0
- 35c: 80 f4 00 10 setlo 0x10,gr0
- 360: 80 f8 00 00 sethi hi\(0x0\),gr0
- 364: 80 40 ff f8 addi gr15,-8,gr0
- 368: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 36c: 80 f4 ff f8 setlo 0xfff8,gr0
- 370: 80 f8 ff ff sethi 0xffff,gr0
- 374: 80 40 ff ec addi gr15,-20,gr0
- 378: 80 fc ff ec setlos 0xf*ffffffec,gr0
- 37c: 80 f4 ff ec setlo 0xffec,gr0
- 380: 80 f8 ff ff sethi 0xffff,gr0
- 384: 80 f4 00 14 setlo 0x14,gr0
- 388: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+ <F1>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <\.F0>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf+ff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff ec addi gr15,-20,gr0
+[0-9a-f ]+: 80 fc ff ec setlos 0xf+fec,gr0
+[0-9a-f ]+: 80 f4 ff ec setlo 0xffec,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.data:
-00004408 <D1>:
- 4408: 00 00 00 04 add\.p gr0,gr4,gr0
- 4408: R_FRV_32 \.data
+[0-9a-f ]+<D1>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-0000440c <\.D0>:
- 440c: 00 00 00 00 add\.p gr0,gr0,gr0
- 440c: R_FRV_32 \.got
- 4410: 00 00 00 04 add\.p gr0,gr4,gr0
- 4410: R_FRV_32 \.text
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004418 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 4418: 00 00 00 04 add\.p gr0,gr4,gr0
- 4418: R_FRV_FUNCDESC_VALUE \.text
- 441c: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
-00004420 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 442c: 00 00 00 04 add\.p gr0,gr4,gr0
- 442c: R_FRV_32 \.text
- 4430: 00 00 00 00 add\.p gr0,gr0,gr0
- 4430: R_FRV_32 \.got
- 4434: 00 00 00 04 add\.p gr0,gr4,gr0
- 4434: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
diff --git a/ld/testsuite/ld-frv/fdpic-pie-2.d b/ld/testsuite/ld-frv/fdpic-pie-2.d
index 2af0deb..3583a3b 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-2.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-2.d
@@ -7,65 +7,65 @@
Disassembly of section \.text:
-000004f0 <F2>:
- 4f0: 80 3c 00 01 call 4f4 <GF0>
+[0-9a-f ]+<F2>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <GF0>
-000004f4 <GF0>:
- 4f4: 80 40 f0 10 addi gr15,16,gr0
- 4f8: 80 fc 00 24 setlos 0x24,gr0
- 4fc: 80 f4 00 20 setlo 0x20,gr0
- 500: 80 f8 00 00 sethi hi\(0x0\),gr0
- 504: 80 40 f0 0c addi gr15,12,gr0
- 508: 80 fc 00 18 setlos 0x18,gr0
- 50c: 80 f4 00 14 setlo 0x14,gr0
- 510: 80 f8 00 00 sethi hi\(0x0\),gr0
- 514: 80 40 ff f8 addi gr15,-8,gr0
- 518: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 51c: 80 f4 ff e8 setlo 0xffe8,gr0
- 520: 80 f8 ff ff sethi 0xffff,gr0
- 524: 80 40 ff dc addi gr15,-36,gr0
- 528: 80 fc ff dc setlos 0xf*ffffffdc,gr0
- 52c: 80 f4 ff dc setlo 0xffdc,gr0
- 530: 80 f8 ff ff sethi 0xffff,gr0
- 534: 80 f4 00 1c setlo 0x1c,gr0
- 538: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff e8 setlo 0xffe8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff dc addi gr15,-36,gr0
+[0-9a-f ]+: 80 fc ff dc setlos 0xf+fdc,gr0
+[0-9a-f ]+: 80 f4 ff dc setlo 0xffdc,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000045b8 <D2>:
- 45b8: 00 00 00 04 add\.p gr0,gr4,gr0
- 45b8: R_FRV_32 \.data
+[0-9a-f ]+<D2>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-000045bc <GD0>:
- 45bc: 00 00 00 04 add\.p gr0,gr4,gr0
- 45bc: R_FRV_FUNCDESC \.text
- 45c0: 00 00 00 04 add\.p gr0,gr4,gr0
- 45c0: R_FRV_32 \.text
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-000045c8 <_GLOBAL_OFFSET_TABLE_-0x18>:
- 45c8: 00 00 00 04 add\.p gr0,gr4,gr0
- 45c8: R_FRV_FUNCDESC_VALUE \.text
- 45cc: 00 00 00 02 add\.p gr0,fp,gr0
- 45d0: 00 00 00 04 add\.p gr0,gr4,gr0
- 45d0: R_FRV_FUNCDESC_VALUE \.text
- 45d4: 00 00 00 02 add\.p gr0,fp,gr0
- 45d8: 00 00 00 04 add\.p gr0,gr4,gr0
- 45d8: R_FRV_FUNCDESC_VALUE \.text
- 45dc: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
-000045e0 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 45ec: 00 00 00 04 add\.p gr0,gr4,gr0
- 45ec: R_FRV_FUNCDESC \.text
- 45f0: 00 00 00 04 add\.p gr0,gr4,gr0
- 45f0: R_FRV_32 \.text
- 45f4: 00 00 00 04 add\.p gr0,gr4,gr0
- 45f4: R_FRV_FUNCDESC \.text
- 45f8: 00 00 00 04 add\.p gr0,gr4,gr0
- 45f8: R_FRV_FUNCDESC \.text
- 45fc: 00 00 00 04 add\.p gr0,gr4,gr0
- 45fc: R_FRV_32 \.data
- 4600: 00 00 00 04 add\.p gr0,gr4,gr0
- 4600: R_FRV_32 \.text
- 4604: 00 00 00 04 add\.p gr0,gr4,gr0
- 4604: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
diff --git a/ld/testsuite/ld-frv/fdpic-pie-6.d b/ld/testsuite/ld-frv/fdpic-pie-6.d
index 3ddcb34..7bdda5d 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-6.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-6.d
@@ -7,67 +7,67 @@
Disassembly of section \.plt:
-000004c8 <\.plt>:
- 4c8: 00 00 00 08 add\.p gr0,gr8,gr0
- 4cc: c0 1a 00 06 bra 4e4 <F6-0x10>
- 4d0: 00 00 00 00 add\.p gr0,gr0,gr0
- 4d4: c0 1a 00 04 bra 4e4 <F6-0x10>
- 4d8: 00 00 00 10 add\.p gr0,gr16,gr0
- 4dc: c0 1a 00 02 bra 4e4 <F6-0x10>
- 4e0: 00 00 00 18 add\.p gr0,gr24,gr0
- 4e4: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
- 4e8: 80 30 40 00 jmpl @\(gr4,gr0\)
- 4ec: 9c cc ff f0 lddi @\(gr15,-16\),gr14
- 4f0: 80 30 e0 00 jmpl @\(gr14,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: c0 1a 00 06 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: c0 1a 00 04 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: c0 1a 00 02 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
+[0-9a-f ]+: 80 30 40 00 jmpl @\(gr4,gr0\)
+[0-9a-f ]+: 9c cc ff f0 lddi @\(gr15,-16\),gr14
+[0-9a-f ]+: 80 30 e0 00 jmpl @\(gr14,gr0\)
Disassembly of section \.text:
-000004f4 <F6>:
- 4f4: fe 3f ff fe call 4ec <F6-0x8>
- 4f8: 80 40 f0 0c addi gr15,12,gr0
- 4fc: 80 fc 00 24 setlos 0x24,gr0
- 500: 80 f4 00 20 setlo 0x20,gr0
- 504: 80 f8 00 00 sethi hi\(0x0\),gr0
- 508: 80 40 f0 10 addi gr15,16,gr0
- 50c: 80 fc 00 18 setlos 0x18,gr0
- 510: 80 f4 00 1c setlo 0x1c,gr0
- 514: 80 f8 00 00 sethi hi\(0x0\),gr0
- 518: 80 40 ff f8 addi gr15,-8,gr0
- 51c: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
- 520: 80 f4 ff e0 setlo 0xffe0,gr0
- 524: 80 f8 ff ff sethi 0xffff,gr0
- 528: 80 f4 ff d4 setlo 0xffd4,gr0
- 52c: 80 f8 ff ff sethi 0xffff,gr0
- 530: 80 f4 00 14 setlo 0x14,gr0
- 534: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<F6>:
+[0-9a-f ]+: fe 3f ff fe call [0-9a-f]+ <F6-0x8>
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
+[0-9a-f ]+: 80 f4 ff e0 setlo 0xffe0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 ff d0 setlo 0xffd0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000045cc <D6>:
+[0-9a-f ]+<D6>:
\.\.\.
- 45cc: R_FRV_32 WD0
- 45d0: R_FRV_FUNCDESC WFb
- 45d4: R_FRV_32 WFb
+[0-9a-f ]+: R_FRV_32 WD0
+[0-9a-f ]+: R_FRV_FUNCDESC WFb
+[0-9a-f ]+: R_FRV_32 WFb
Disassembly of section \.got:
-000045d8 <_GLOBAL_OFFSET_TABLE_-0x20>:
- 45d8: 00 00 04 e4 addxcc\.p gr0,gr36,gr0,icc1
- 45d8: R_FRV_FUNCDESC_VALUE WF9
- 45dc: 00 00 00 02 add\.p gr0,fp,gr0
- 45e0: 00 00 04 dc addxcc\.p gr0,gr28,gr0,icc1
- 45e0: R_FRV_FUNCDESC_VALUE WF8
- 45e4: 00 00 00 02 add\.p gr0,fp,gr0
- 45e8: 00 00 04 d4 addxcc\.p gr0,gr20,gr0,icc1
- 45e8: R_FRV_FUNCDESC_VALUE WF0
- 45ec: 00 00 00 02 add\.p gr0,fp,gr0
- 45f0: 00 00 04 cc addxcc\.p gr0,gr12,gr0,icc1
- 45f0: R_FRV_FUNCDESC_VALUE WF7
- 45f4: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+: 00 00 04 b8 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF9
+[0-9a-f ]+: 00 00 00 02 .*
+[0-9a-f ]+: 00 00 04 b0 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF8
+[0-9a-f ]+: 00 00 00 02 .*
+[0-9a-f ]+: 00 00 04 a8 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF0
+[0-9a-f ]+: 00 00 00 02 .*
+[0-9a-f ]+: 00 00 04 a0 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF7
+[0-9a-f ]+: 00 00 00 02 .*
-000045f8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4604: R_FRV_32 WF1
- 4608: R_FRV_FUNCDESC WF4
- 460c: R_FRV_32 WD2
- 4610: R_FRV_FUNCDESC WF5
- 4614: R_FRV_FUNCDESC WF6
- 4618: R_FRV_32 WF3
- 461c: R_FRV_32 WF2
+[0-9a-f ]+: R_FRV_32 WF1
+[0-9a-f ]+: R_FRV_FUNCDESC WF4
+[0-9a-f ]+: R_FRV_32 WD2
+[0-9a-f ]+: R_FRV_FUNCDESC WF5
+[0-9a-f ]+: R_FRV_FUNCDESC WF6
+[0-9a-f ]+: R_FRV_32 WF3
+[0-9a-f ]+: R_FRV_32 WF2
diff --git a/ld/testsuite/ld-frv/fdpic-pie-7.d b/ld/testsuite/ld-frv/fdpic-pie-7.d
index 8a6cea0..7ebd0b7 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-7.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-7.d
@@ -7,51 +7,51 @@
Disassembly of section \.text:
-00000340 <F7>:
- 340: 80 3c 00 02 call 348 <\.F0\+0x4>
-
-00000344 <\.F0>:
- 344: 80 40 f0 0c addi gr15,12,gr0
- 348: 80 fc 00 0c setlos 0xc,gr0
- 34c: 80 f4 00 0c setlo 0xc,gr0
- 350: 80 f8 00 00 sethi hi\(0x0\),gr0
- 354: 80 40 f0 10 addi gr15,16,gr0
- 358: 80 fc 00 10 setlos 0x10,gr0
- 35c: 80 f4 00 10 setlo 0x10,gr0
- 360: 80 f8 00 00 sethi hi\(0x0\),gr0
- 364: 80 40 ff f8 addi gr15,-8,gr0
- 368: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 36c: 80 f4 ff f8 setlo 0xfff8,gr0
- 370: 80 f8 ff ff sethi 0xffff,gr0
- 374: 80 40 ff f0 addi gr15,-16,gr0
- 378: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 37c: 80 f4 ff f0 setlo 0xfff0,gr0
- 380: 80 f8 ff ff sethi 0xffff,gr0
- 384: 80 f4 00 14 setlo 0x14,gr0
- 388: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
-
-00004408 <D7>:
- 4408: 00 00 00 08 add\.p gr0,gr8,gr0
- 4408: R_FRV_32 \.data
-
-0000440c <\.D0>:
- 440c: 00 00 00 00 add\.p gr0,gr0,gr0
- 440c: R_FRV_32 \.got
- 4410: 00 00 00 08 add\.p gr0,gr8,gr0
- 4410: R_FRV_32 \.text
+[0-9a-f ]+<F7>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <\.F0\+0x4>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf*fffffff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff f0 addi gr15,-16,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff f0 setlo 0xfff0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
+
+[0-9a-f ]+<D7>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004418 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 4418: 00 00 00 08 add\.p gr0,gr8,gr0
- 4418: R_FRV_FUNCDESC_VALUE \.text
- 441c: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
-00004420 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 442c: 00 00 00 08 add\.p gr0,gr8,gr0
- 442c: R_FRV_32 \.text
- 4430: 00 00 00 00 add\.p gr0,gr0,gr0
- 4430: R_FRV_32 \.got
- 4434: 00 00 00 08 add\.p gr0,gr8,gr0
- 4434: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
diff --git a/ld/testsuite/ld-frv/fdpic-pie-8.d b/ld/testsuite/ld-frv/fdpic-pie-8.d
index b20a1ac..0de4a81 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-8.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-8.d
@@ -7,65 +7,65 @@
Disassembly of section \.text:
-000004f0 <F8>:
- 4f0: 80 3c 00 02 call 4f8 <GF0\+0x4>
+[0-9a-f ]+<F8>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <GF0\+0x4>
-000004f4 <GF0>:
- 4f4: 80 40 f0 10 addi gr15,16,gr0
- 4f8: 80 fc 00 14 setlos 0x14,gr0
- 4fc: 80 f4 00 24 setlo 0x24,gr0
- 500: 80 f8 00 00 sethi hi\(0x0\),gr0
- 504: 80 40 f0 0c addi gr15,12,gr0
- 508: 80 fc 00 1c setlos 0x1c,gr0
- 50c: 80 f4 00 18 setlo 0x18,gr0
- 510: 80 f8 00 00 sethi hi\(0x0\),gr0
- 514: 80 40 ff f8 addi gr15,-8,gr0
- 518: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 51c: 80 f4 ff e8 setlo 0xffe8,gr0
- 520: 80 f8 ff ff sethi 0xffff,gr0
- 524: 80 40 ff e0 addi gr15,-32,gr0
- 528: 80 fc ff e0 setlos 0xf*ffffffe0,gr0
- 52c: 80 f4 ff e0 setlo 0xffe0,gr0
- 530: 80 f8 ff ff sethi 0xffff,gr0
- 534: 80 f4 00 20 setlo 0x20,gr0
- 538: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 14 setlos 0x14,gr0
+[0-9a-f ]+: 80 f4 00 24 setlo 0x24,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 1c setlos 0x1c,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff e8 setlo 0xffe8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff e0 addi gr15,-32,gr0
+[0-9a-f ]+: 80 fc ff e0 setlos 0xf+fe0,gr0
+[0-9a-f ]+: 80 f4 ff e0 setlo 0xffe0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000045b8 <D8>:
- 45b8: 00 00 00 08 add\.p gr0,gr8,gr0
- 45b8: R_FRV_32 \.data
+[0-9a-f ]+<D8>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-000045bc <GD0>:
- 45bc: 00 00 00 08 add\.p gr0,gr8,gr0
- 45bc: R_FRV_FUNCDESC \.text
- 45c0: 00 00 00 08 add\.p gr0,gr8,gr0
- 45c0: R_FRV_32 \.text
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-000045c8 <_GLOBAL_OFFSET_TABLE_-0x18>:
- 45c8: 00 00 00 08 add\.p gr0,gr8,gr0
- 45c8: R_FRV_FUNCDESC_VALUE \.text
- 45cc: 00 00 00 02 add\.p gr0,fp,gr0
- 45d0: 00 00 00 08 add\.p gr0,gr8,gr0
- 45d0: R_FRV_FUNCDESC_VALUE \.text
- 45d4: 00 00 00 02 add\.p gr0,fp,gr0
- 45d8: 00 00 00 08 add\.p gr0,gr8,gr0
- 45d8: R_FRV_FUNCDESC_VALUE \.text
- 45dc: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
-000045e0 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 45ec: 00 00 00 04 add\.p gr0,gr4,gr0
- 45ec: R_FRV_FUNCDESC \.text
- 45f0: 00 00 00 08 add\.p gr0,gr8,gr0
- 45f0: R_FRV_32 \.text
- 45f4: 00 00 00 08 add\.p gr0,gr8,gr0
- 45f4: R_FRV_32 \.text
- 45f8: 00 00 00 04 add\.p gr0,gr4,gr0
- 45f8: R_FRV_FUNCDESC \.text
- 45fc: 00 00 00 04 add\.p gr0,gr4,gr0
- 45fc: R_FRV_FUNCDESC \.text
- 4600: 00 00 00 08 add\.p gr0,gr8,gr0
- 4600: R_FRV_32 \.data
- 4604: 00 00 00 08 add\.p gr0,gr8,gr0
- 4604: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-1.d b/ld/testsuite/ld-frv/fdpic-shared-1.d
index 098febd..7f88e18 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-1.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-1.d
@@ -7,51 +7,51 @@
Disassembly of section \.text:
-0000033c <F1>:
- 33c: 80 3c 00 01 call 340 <\.F0>
-
-00000340 <\.F0>:
- 340: 80 40 f0 0c addi gr15,12,gr0
- 344: 80 fc 00 0c setlos 0xc,gr0
- 348: 80 f4 00 0c setlo 0xc,gr0
- 34c: 80 f8 00 00 sethi hi\(0x0\),gr0
- 350: 80 40 f0 10 addi gr15,16,gr0
- 354: 80 fc 00 10 setlos 0x10,gr0
- 358: 80 f4 00 10 setlo 0x10,gr0
- 35c: 80 f8 00 00 sethi hi\(0x0\),gr0
- 360: 80 40 ff f8 addi gr15,-8,gr0
- 364: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 368: 80 f4 ff f8 setlo 0xfff8,gr0
- 36c: 80 f8 ff ff sethi 0xffff,gr0
- 370: 80 40 ff f0 addi gr15,-16,gr0
- 374: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 378: 80 f4 ff f0 setlo 0xfff0,gr0
- 37c: 80 f8 ff ff sethi 0xffff,gr0
- 380: 80 f4 00 14 setlo 0x14,gr0
- 384: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
-
-00004404 <D1>:
- 4404: 00 00 00 04 add\.p gr0,gr4,gr0
- 4404: R_FRV_32 \.data
-
-00004408 <\.D0>:
- 4408: 00 00 00 00 add\.p gr0,gr0,gr0
- 4408: R_FRV_32 \.got
- 440c: 00 00 00 04 add\.p gr0,gr4,gr0
- 440c: R_FRV_32 \.text
+[0-9a-f ]+<F1>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <\.F0>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf+ff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff ec addi gr15,-20,gr0
+[0-9a-f ]+: 80 fc ff ec setlos 0xf+fec,gr0
+[0-9a-f ]+: 80 f4 ff ec setlo 0xffec,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
+
+[0-9a-f ]+<D1>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004410 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 4410: 00 00 00 04 add\.p gr0,gr4,gr0
- 4410: R_FRV_FUNCDESC_VALUE \.text
- 4414: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004418 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4424: 00 00 00 04 add\.p gr0,gr4,gr0
- 4424: R_FRV_32 \.text
- 4428: 00 00 00 00 add\.p gr0,gr0,gr0
- 4428: R_FRV_32 \.got
- 442c: 00 00 00 04 add\.p gr0,gr4,gr0
- 442c: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-2.d b/ld/testsuite/ld-frv/fdpic-shared-2.d
index f6179c5..cb4b68d 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-2.d
@@ -7,74 +7,74 @@
Disassembly of section \.plt:
-000004d8 <\.plt>:
- 4d8: 00 00 00 00 add\.p gr0,gr0,gr0
- 4dc: c0 1a 00 06 bra 4f4 <F2-0x10>
- 4e0: 00 00 00 10 add\.p gr0,gr16,gr0
- 4e4: c0 1a 00 04 bra 4f4 <F2-0x10>
- 4e8: 00 00 00 18 add\.p gr0,gr24,gr0
- 4ec: c0 1a 00 02 bra 4f4 <F2-0x10>
- 4f0: 00 00 00 08 add\.p gr0,gr8,gr0
- 4f4: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
- 4f8: 80 30 40 00 jmpl @\(gr4,gr0\)
- 4fc: 9c cc ff f8 lddi @\(gr15,-8\),gr14
- 500: 80 30 e0 00 jmpl @\(gr14,gr0\)
+[0-9a-f ]+ <\.plt>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: c0 1a 00 06 bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: c0 1a 00 04 bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: c0 1a 00 02 bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
+[0-9a-f ]+: 80 30 40 00 jmpl @\(gr4,gr0\)
+[0-9a-f ]+: 9c cc ff f8 lddi @\(gr15,-8\),gr14
+[0-9a-f ]+: 80 30 e0 00 jmpl @\(gr14,gr0\)
Disassembly of section \.text:
-00000504 <F2>:
- 504: fe 3f ff fe call 4fc <F2-0x8>
+[0-9a-f ]+<F2>:
+[0-9a-f ]+: fe 3f ff fe call [0-9a-f]+ <F2-0x8>
-00000508 <GF0>:
- 508: 80 40 f0 10 addi gr15,16,gr0
- 50c: 80 fc 00 24 setlos 0x24,gr0
- 510: 80 f4 00 20 setlo 0x20,gr0
- 514: 80 f8 00 00 sethi hi\(0x0\),gr0
- 518: 80 40 f0 0c addi gr15,12,gr0
- 51c: 80 fc 00 18 setlos 0x18,gr0
- 520: 80 f4 00 14 setlo 0x14,gr0
- 524: 80 f8 00 00 sethi hi\(0x0\),gr0
- 528: 80 40 ff f0 addi gr15,-16,gr0
- 52c: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
- 530: 80 f4 ff e0 setlo 0xffe0,gr0
- 534: 80 f8 ff ff sethi 0xffff,gr0
- 538: 80 40 ff d8 addi gr15,-40,gr0
- 53c: 80 fc ff d8 setlos 0xf*ffffffd8,gr0
- 540: 80 f4 ff d8 setlo 0xffd8,gr0
- 544: 80 f8 ff ff sethi 0xffff,gr0
- 548: 80 f4 00 1c setlo 0x1c,gr0
- 54c: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f0 addi gr15,-16,gr0
+[0-9a-f ]+: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
+[0-9a-f ]+: 80 f4 ff e0 setlo 0xffe0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff d8 addi gr15,-40,gr0
+[0-9a-f ]+: 80 fc ff d8 setlos 0xf+fd8,gr0
+[0-9a-f ]+: 80 f4 ff d8 setlo 0xffd8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000045e4 <D2>:
- 45e4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45e4: R_FRV_32 GD0
+[0-9a-f ]+<D2>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 GD0
-000045e8 <GD0>:
+[0-9a-f ]+<GD0>:
\.\.\.
- 45e8: R_FRV_FUNCDESC GFb
- 45ec: R_FRV_32 GFb
-Disassembly of section \.got:
+[0-9a-f ]+: R_FRV_FUNCDESC GFb
+[0-9a-f ]+: R_FRV_32 GFb
+[0-9A-F ]+isassembly of section \.got:
-000045f0 <_GLOBAL_OFFSET_TABLE_-0x20>:
- 45f0: 00 00 04 ec addxcc\.p gr0,gr44,gr0,icc1
- 45f0: R_FRV_FUNCDESC_VALUE GF9
- 45f4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45f8: 00 00 04 e4 addxcc\.p gr0,gr36,gr0,icc1
- 45f8: R_FRV_FUNCDESC_VALUE GF8
- 45fc: 00 00 00 00 add\.p gr0,gr0,gr0
- 4600: 00 00 04 f4 addxcc\.p gr0,gr52,gr0,icc1
- 4600: R_FRV_FUNCDESC_VALUE GF7
- 4604: 00 00 00 00 add\.p gr0,gr0,gr0
- 4608: 00 00 04 dc addxcc\.p gr0,gr28,gr0,icc1
- 4608: R_FRV_FUNCDESC_VALUE GF0
- 460c: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+: 00 00 04 a4 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE GF9
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 9c .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE GF8
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 ac .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE GF7
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 94 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE GF0
+[0-9a-f ]+: 00 00 00 00 .*
-00004610 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 461c: R_FRV_FUNCDESC GF4
- 4620: R_FRV_32 GF1
- 4624: R_FRV_FUNCDESC GF6
- 4628: R_FRV_FUNCDESC GF5
- 462c: R_FRV_32 GD4
- 4630: R_FRV_32 GF3
- 4634: R_FRV_32 GF2
+[0-9a-f ]+: R_FRV_FUNCDESC GF4
+[0-9a-f ]+: R_FRV_32 GF1
+[0-9a-f ]+: R_FRV_FUNCDESC GF6
+[0-9a-f ]+: R_FRV_FUNCDESC GF5
+[0-9a-f ]+: R_FRV_32 GD4
+[0-9a-f ]+: R_FRV_32 GF3
+[0-9a-f ]+: R_FRV_32 GF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-3.d b/ld/testsuite/ld-frv/fdpic-shared-3.d
index 1197fa6..fceb16a 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-3.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-3.d
@@ -5,79 +5,79 @@
.*: file format elf.*frv.*
-Disassembly of section \.text:
+[0-9A-F ]+isassembly of section \.text:
-0000038c <F3>:
- 38c: 80 3c 00 01 call 390 <HF0>
+[0-9a-f ]+<F3>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <HF0>
-00000390 <HF0>:
- 390: 80 40 f0 0c addi gr15,12,gr0
- 394: 80 fc 00 18 setlos 0x18,gr0
- 398: 80 f4 00 1c setlo 0x1c,gr0
- 39c: 80 f8 00 00 sethi hi\(0x0\),gr0
- 3a0: 80 40 f0 10 addi gr15,16,gr0
- 3a4: 80 fc 00 20 setlos 0x20,gr0
- 3a8: 80 f4 00 14 setlo 0x14,gr0
- 3ac: 80 f8 00 00 sethi hi\(0x0\),gr0
- 3b0: 80 40 ff f8 addi gr15,-8,gr0
- 3b4: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
- 3b8: 80 f4 ff d8 setlo 0xffd8,gr0
- 3bc: 80 f8 ff ff sethi 0xffff,gr0
- 3c0: 80 40 ff c0 addi gr15,-64,gr0
- 3c4: 80 fc ff c0 setlos 0xf*ffffffc0,gr0
- 3c8: 80 f4 ff c0 setlo 0xffc0,gr0
- 3cc: 80 f8 ff ff sethi 0xffff,gr0
- 3d0: 80 f4 00 24 setlo 0x24,gr0
- 3d4: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<HF0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 20 setlos 0x20,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
+[0-9a-f ]+: 80 f4 ff d8 setlo 0xffd8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff bc addi gr15,-68,gr0
+[0-9a-f ]+: 80 fc ff bc setlos 0xf+fbc,gr0
+[0-9a-f ]+: 80 f4 ff bc setlo 0xffbc,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 24 setlo 0x24,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-00004454 <D3>:
- 4454: 00 00 00 04 add\.p gr0,gr4,gr0
- 4454: R_FRV_32 \.data
+[0-9a-f ]+<D3>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-00004458 <HD0>:
- 4458: 00 00 00 08 add\.p gr0,gr8,gr0
- 4458: R_FRV_32 \.got
- 445c: 00 00 00 04 add\.p gr0,gr4,gr0
- 445c: R_FRV_32 \.text
+[0-9a-f ]+<HD0>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004460 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 4460: 00 00 00 04 add\.p gr0,gr4,gr0
- 4460: R_FRV_FUNCDESC_VALUE \.text
- 4464: 00 00 00 00 add\.p gr0,gr0,gr0
- 4468: 00 00 00 04 add\.p gr0,gr4,gr0
- 4468: R_FRV_FUNCDESC_VALUE \.text
- 446c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4470: 00 00 00 04 add\.p gr0,gr4,gr0
- 4470: R_FRV_FUNCDESC_VALUE \.text
- 4474: 00 00 00 00 add\.p gr0,gr0,gr0
- 4478: 00 00 00 04 add\.p gr0,gr4,gr0
- 4478: R_FRV_FUNCDESC_VALUE \.text
- 447c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4480: 00 00 00 04 add\.p gr0,gr4,gr0
- 4480: R_FRV_FUNCDESC_VALUE \.text
- 4484: 00 00 00 00 add\.p gr0,gr0,gr0
- 4488: 00 00 00 04 add\.p gr0,gr4,gr0
- 4488: R_FRV_FUNCDESC_VALUE \.text
- 448c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4490: 00 00 00 04 add\.p gr0,gr4,gr0
- 4490: R_FRV_FUNCDESC_VALUE \.text
- 4494: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004498 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 44a4: 00 00 00 04 add\.p gr0,gr4,gr0
- 44a4: R_FRV_32 \.text
- 44a8: 00 00 00 00 add\.p gr0,gr0,gr0
- 44a8: R_FRV_32 \.got
- 44ac: 00 00 00 28 add\.p gr0,gr40,gr0
- 44ac: R_FRV_32 \.got
- 44b0: 00 00 00 04 add\.p gr0,gr4,gr0
- 44b0: R_FRV_32 \.text
- 44b4: 00 00 00 04 add\.p gr0,gr4,gr0
- 44b4: R_FRV_32 \.text
- 44b8: 00 00 00 18 add\.p gr0,gr24,gr0
- 44b8: R_FRV_32 \.got
- 44bc: 00 00 00 04 add\.p gr0,gr4,gr0
- 44bc: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 28 add\.p gr0,gr40,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-4.d b/ld/testsuite/ld-frv/fdpic-shared-4.d
index 3be724a..4045562 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-4.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-4.d
@@ -7,65 +7,65 @@
Disassembly of section \.text:
-00000564 <F4>:
- 564: 80 3c 00 01 call 568 <PF0>
+[0-9a-f ]+<F4>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <PF0>
-00000568 <PF0>:
- 568: 80 40 f0 10 addi gr15,16,gr0
- 56c: 80 fc 00 20 setlos 0x20,gr0
- 570: 80 f4 00 1c setlo 0x1c,gr0
- 574: 80 f8 00 00 sethi hi\(0x0\),gr0
- 578: 80 40 f0 0c addi gr15,12,gr0
- 57c: 80 fc 00 24 setlos 0x24,gr0
- 580: 80 f4 00 18 setlo 0x18,gr0
- 584: 80 f8 00 00 sethi hi\(0x0\),gr0
- 588: 80 40 ff f8 addi gr15,-8,gr0
- 58c: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 590: 80 f4 ff e8 setlo 0xffe8,gr0
- 594: 80 f8 ff ff sethi 0xffff,gr0
- 598: 80 40 ff e0 addi gr15,-32,gr0
- 59c: 80 fc ff e0 setlos 0xf*ffffffe0,gr0
- 5a0: 80 f4 ff e0 setlo 0xffe0,gr0
- 5a4: 80 f8 ff ff sethi 0xffff,gr0
- 5a8: 80 f4 00 14 setlo 0x14,gr0
- 5ac: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<PF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 20 setlos 0x20,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff e8 setlo 0xffe8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff dc addi gr15,-36,gr0
+[0-9a-f ]+: 80 fc ff dc setlos 0xf+fdc,gr0
+[0-9a-f ]+: 80 f4 ff dc setlo 0xffdc,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-0000462c <D4>:
- 462c: 00 00 00 04 add\.p gr0,gr4,gr0
- 462c: R_FRV_32 \.data
+[0-9a-f ]+<D4>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-00004630 <PD0>:
- 4630: 00 00 00 04 add\.p gr0,gr4,gr0
- 4630: R_FRV_FUNCDESC \.text
- 4634: 00 00 00 04 add\.p gr0,gr4,gr0
- 4634: R_FRV_32 \.text
+[0-9a-f ]+<PD0>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004638 <_GLOBAL_OFFSET_TABLE_-0x18>:
- 4638: 00 00 00 04 add\.p gr0,gr4,gr0
- 4638: R_FRV_FUNCDESC_VALUE \.text
- 463c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4640: 00 00 00 04 add\.p gr0,gr4,gr0
- 4640: R_FRV_FUNCDESC_VALUE \.text
- 4644: 00 00 00 00 add\.p gr0,gr0,gr0
- 4648: 00 00 00 04 add\.p gr0,gr4,gr0
- 4648: R_FRV_FUNCDESC_VALUE \.text
- 464c: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004650 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 465c: 00 00 00 04 add\.p gr0,gr4,gr0
- 465c: R_FRV_FUNCDESC \.text
- 4660: 00 00 00 04 add\.p gr0,gr4,gr0
- 4660: R_FRV_32 \.text
- 4664: 00 00 00 04 add\.p gr0,gr4,gr0
- 4664: R_FRV_32 \.data
- 4668: 00 00 00 04 add\.p gr0,gr4,gr0
- 4668: R_FRV_FUNCDESC \.text
- 466c: 00 00 00 04 add\.p gr0,gr4,gr0
- 466c: R_FRV_32 \.text
- 4670: 00 00 00 04 add\.p gr0,gr4,gr0
- 4670: R_FRV_32 \.text
- 4674: 00 00 00 04 add\.p gr0,gr4,gr0
- 4674: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC \.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-5.d b/ld/testsuite/ld-frv/fdpic-shared-5.d
index b5ca50e..009c62c 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-5.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-5.d
@@ -7,76 +7,76 @@
Disassembly of section \.plt:
-000004a8 <\.plt>:
- 4a8: 00 00 00 10 add\.p gr0,gr16,gr0
- 4ac: c0 1a 00 06 bra 4c4 <F5-0x10>
- 4b0: 00 00 00 08 add\.p gr0,gr8,gr0
- 4b4: c0 1a 00 04 bra 4c4 <F5-0x10>
- 4b8: 00 00 00 00 add\.p gr0,gr0,gr0
- 4bc: c0 1a 00 02 bra 4c4 <F5-0x10>
- 4c0: 00 00 00 18 add\.p gr0,gr24,gr0
- 4c4: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
- 4c8: 80 30 40 00 jmpl @\(gr4,gr0\)
- 4cc: 9c cc ff f0 lddi @\(gr15,-16\),gr14
- 4d0: 80 30 e0 00 jmpl @\(gr14,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: c0 1a 00 06 bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: c0 1a 00 04 bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: c0 1a 00 02 bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
+[0-9a-f ]+: 80 30 40 00 jmpl @\(gr4,gr0\)
+[0-9a-f ]+: 9c cc ff f0 lddi @\(gr15,-16\),gr14
+[0-9a-f ]+: 80 30 e0 00 jmpl @\(gr14,gr0\)
Disassembly of section \.text:
-000004d4 <F5>:
- 4d4: fe 3f ff fe call 4cc <F5-0x8>
- 4d8: 80 40 f0 0c addi gr15,12,gr0
- 4dc: 80 fc 00 24 setlos 0x24,gr0
- 4e0: 80 f4 00 20 setlo 0x20,gr0
- 4e4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 4e8: 80 40 f0 10 addi gr15,16,gr0
- 4ec: 80 fc 00 1c setlos 0x1c,gr0
- 4f0: 80 f4 00 18 setlo 0x18,gr0
- 4f4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 4f8: 80 40 ff f8 addi gr15,-8,gr0
- 4fc: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
- 500: 80 f4 ff e0 setlo 0xffe0,gr0
- 504: 80 f8 ff ff sethi 0xffff,gr0
- 508: 80 f4 00 14 setlo 0x14,gr0
- 50c: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<F5>:
+[0-9a-f ]+: fe 3f ff fe call [0-9a-f]+ <F5-0x8>
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 1c setlos 0x1c,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
+[0-9a-f ]+: 80 f4 ff e0 setlo 0xffe0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000045a4 <D5>:
- 45a4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45a4: R_FRV_32 UD0
- 45a8: 00 00 00 00 add\.p gr0,gr0,gr0
- 45a8: R_FRV_FUNCDESC UFb
- 45ac: 00 00 00 00 add\.p gr0,gr0,gr0
- 45ac: R_FRV_32 UFb
+[0-9a-f ]+<D5>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 UD0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC UFb
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 UFb
Disassembly of section \.got:
-000045b0 <_GLOBAL_OFFSET_TABLE_-0x20>:
- 45b0: 00 00 04 c4 addxcc\.p gr0,gr4,gr0,icc1
- 45b0: R_FRV_FUNCDESC_VALUE UF9
- 45b4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45b8: 00 00 04 ac addx\.p gr0,gr44,gr0,icc1
- 45b8: R_FRV_FUNCDESC_VALUE UF8
- 45bc: 00 00 00 00 add\.p gr0,gr0,gr0
- 45c0: 00 00 04 bc addx\.p gr0,gr60,gr0,icc1
- 45c0: R_FRV_FUNCDESC_VALUE UF0
- 45c4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45c8: 00 00 04 b4 addx\.p gr0,gr52,gr0,icc1
- 45c8: R_FRV_FUNCDESC_VALUE UF7
- 45cc: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+: 00 00 04 7c .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE UF9
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 64 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE UF8
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 74 .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE UF0
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 04 6c .*
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE UF7
+[0-9a-f ]+: 00 00 00 00 .*
-000045d0 <_GLOBAL_OFFSET_TABLE_>:
- 45d0: 00 00 00 00 add\.p gr0,gr0,gr0
- 45d4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45d8: 00 00 00 00 add\.p gr0,gr0,gr0
- 45dc: 00 00 00 00 add\.p gr0,gr0,gr0
- 45dc: R_FRV_32 UF1
- 45e0: 00 00 00 00 add\.p gr0,gr0,gr0
- 45e0: R_FRV_FUNCDESC UF4
- 45e4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45e4: R_FRV_32 UD1
- 45e8: 00 00 00 00 add\.p gr0,gr0,gr0
- 45e8: R_FRV_FUNCDESC UF6
- 45ec: 00 00 00 00 add\.p gr0,gr0,gr0
- 45ec: R_FRV_FUNCDESC UF5
- 45f0: 00 00 00 00 add\.p gr0,gr0,gr0
- 45f0: R_FRV_32 UF3
- 45f4: 00 00 00 00 add\.p gr0,gr0,gr0
- 45f4: R_FRV_32 UF2
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_32 UF1
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_FUNCDESC UF4
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_32 UD1
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_FUNCDESC UF6
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_FUNCDESC UF5
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_32 UF3
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_32 UF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-6.d b/ld/testsuite/ld-frv/fdpic-shared-6.d
index 4d1789a..aefa4d2 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-6.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-6.d
@@ -7,67 +7,67 @@
Disassembly of section \.plt:
-0000037c <\.plt>:
- 37c: 00 00 00 08 add\.p gr0,gr8,gr0
- 380: c0 1a 00 06 bra 398 <F6-0x10>
- 384: 00 00 00 00 add\.p gr0,gr0,gr0
- 388: c0 1a 00 04 bra 398 <F6-0x10>
- 38c: 00 00 00 10 add\.p gr0,gr16,gr0
- 390: c0 1a 00 02 bra 398 <F6-0x10>
- 394: 00 00 00 18 add\.p gr0,gr24,gr0
- 398: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
- 39c: 80 30 40 00 jmpl @\(gr4,gr0\)
- 3a0: 9c cc ff f0 lddi @\(gr15,-16\),gr14
- 3a4: 80 30 e0 00 jmpl @\(gr14,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: c0 1a 00 06 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: c0 1a 00 04 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: c0 1a 00 02 bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: 88 08 f1 40 ldd @\(gr15,gr0\),gr4
+[0-9a-f ]+: 80 30 40 00 jmpl @\(gr4,gr0\)
+[0-9a-f ]+: 9c cc ff f0 lddi @\(gr15,-16\),gr14
+[0-9a-f ]+: 80 30 e0 00 jmpl @\(gr14,gr0\)
Disassembly of section \.text:
-000003a8 <F6>:
- 3a8: fe 3f ff fe call 3a0 <F6-0x8>
- 3ac: 80 40 f0 0c addi gr15,12,gr0
- 3b0: 80 fc 00 24 setlos 0x24,gr0
- 3b4: 80 f4 00 20 setlo 0x20,gr0
- 3b8: 80 f8 00 00 sethi hi\(0x0\),gr0
- 3bc: 80 40 f0 10 addi gr15,16,gr0
- 3c0: 80 fc 00 18 setlos 0x18,gr0
- 3c4: 80 f4 00 1c setlo 0x1c,gr0
- 3c8: 80 f8 00 00 sethi hi\(0x0\),gr0
- 3cc: 80 40 ff f8 addi gr15,-8,gr0
- 3d0: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
- 3d4: 80 f4 ff e0 setlo 0xffe0,gr0
- 3d8: 80 f8 ff ff sethi 0xffff,gr0
- 3dc: 80 f4 ff d0 setlo 0xffd0,gr0
- 3e0: 80 f8 ff ff sethi 0xffff,gr0
- 3e4: 80 f4 00 14 setlo 0x14,gr0
- 3e8: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<F6>:
+[0-9a-f ]+: fe 3f ff fe call [0-9a-f]+ <F6-0x8>
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff e8 setlos 0xf*ffffffe8,gr0
+[0-9a-f ]+: 80 f4 ff e0 setlo 0xffe0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 ff d0 setlo 0xffd0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-00004480 <D6>:
+[0-9a-f ]+<D6>:
\.\.\.
- 4480: R_FRV_32 WD0
- 4484: R_FRV_FUNCDESC WFb
- 4488: R_FRV_32 WFb
+[0-9a-f ]+: R_FRV_32 WD0
+[0-9a-f ]+: R_FRV_FUNCDESC WFb
+[0-9a-f ]+: R_FRV_32 WFb
Disassembly of section \.got:
-00004490 <_GLOBAL_OFFSET_TABLE_-0x20>:
- 4490: 00 00 03 98 sdiv\.p gr0,gr24,gr0
- 4490: R_FRV_FUNCDESC_VALUE WF9
- 4494: 00 00 00 00 add\.p gr0,gr0,gr0
- 4498: 00 00 03 90 sdiv\.p gr0,gr16,gr0
- 4498: R_FRV_FUNCDESC_VALUE WF8
- 449c: 00 00 00 00 add\.p gr0,gr0,gr0
- 44a0: 00 00 03 88 sdiv\.p gr0,gr8,gr0
- 44a0: R_FRV_FUNCDESC_VALUE WF0
- 44a4: 00 00 00 00 add\.p gr0,gr0,gr0
- 44a8: 00 00 03 80 sdiv\.p gr0,gr0,gr0
- 44a8: R_FRV_FUNCDESC_VALUE WF7
- 44ac: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+: 00 00 03 98 sdiv\.p gr0,gr24,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF9
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 03 90 sdiv\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF8
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 03 88 sdiv\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 03 80 sdiv\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE WF7
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-000044b0 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 44bc: R_FRV_32 WF1
- 44c0: R_FRV_FUNCDESC WF4
- 44c4: R_FRV_32 WD2
- 44c8: R_FRV_FUNCDESC WF5
- 44cc: R_FRV_FUNCDESC WF6
- 44d0: R_FRV_32 WF3
- 44d4: R_FRV_32 WF2
+[0-9a-f ]+: R_FRV_32 WF1
+[0-9a-f ]+: R_FRV_FUNCDESC WF4
+[0-9a-f ]+: R_FRV_32 WD2
+[0-9a-f ]+: R_FRV_FUNCDESC WF5
+[0-9a-f ]+: R_FRV_FUNCDESC WF6
+[0-9a-f ]+: R_FRV_32 WF3
+[0-9a-f ]+: R_FRV_32 WF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-7.d b/ld/testsuite/ld-frv/fdpic-shared-7.d
index 59d50e8..2004a84 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-7.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-7.d
@@ -7,51 +7,51 @@
Disassembly of section \.text:
-0000033c <F7>:
- 33c: 80 3c 00 02 call 344 <\.F0\+0x4>
-
-00000340 <\.F0>:
- 340: 80 40 f0 0c addi gr15,12,gr0
- 344: 80 fc 00 0c setlos 0xc,gr0
- 348: 80 f4 00 0c setlo 0xc,gr0
- 34c: 80 f8 00 00 sethi hi\(0x0\),gr0
- 350: 80 40 f0 10 addi gr15,16,gr0
- 354: 80 fc 00 10 setlos 0x10,gr0
- 358: 80 f4 00 10 setlo 0x10,gr0
- 35c: 80 f8 00 00 sethi hi\(0x0\),gr0
- 360: 80 40 ff f8 addi gr15,-8,gr0
- 364: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 368: 80 f4 ff f8 setlo 0xfff8,gr0
- 36c: 80 f8 ff ff sethi 0xffff,gr0
- 370: 80 40 ff f4 addi gr15,-12,gr0
- 374: 80 fc ff f4 setlos 0xf*fffffff4,gr0
- 378: 80 f4 ff f4 setlo 0xfff4,gr0
- 37c: 80 f8 ff ff sethi 0xffff,gr0
- 380: 80 f4 00 14 setlo 0x14,gr0
- 384: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
-
-00004404 <D7>:
- 4404: 00 00 00 08 add\.p gr0,gr8,gr0
- 4404: R_FRV_32 \.data
-
-00004408 <\.D0>:
- 4408: 00 00 00 00 add\.p gr0,gr0,gr0
- 4408: R_FRV_32 \.got
- 440c: 00 00 00 08 add\.p gr0,gr8,gr0
- 440c: R_FRV_32 \.text
+[0-9a-f ]+<F7>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <\.F0\+0x4>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf*fffffff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff f0 addi gr15,-16,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff f0 setlo 0xfff0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
+
+[0-9a-f ]+<D7>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004410 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 4410: 00 00 00 08 add\.p gr0,gr8,gr0
- 4410: R_FRV_FUNCDESC_VALUE \.text
- 4414: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004418 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4424: 00 00 00 08 add\.p gr0,gr8,gr0
- 4424: R_FRV_32 \.text
- 4428: 00 00 00 00 add\.p gr0,gr0,gr0
- 4428: R_FRV_32 \.got
- 442c: 00 00 00 08 add\.p gr0,gr8,gr0
- 442c: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-8.d b/ld/testsuite/ld-frv/fdpic-shared-8.d
index c36bcad..543d313 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-8.d
@@ -7,77 +7,77 @@
Disassembly of section \.text:
-00000434 <F8>:
- 434: 80 3c 00 02 call 43c <GF1\+0x4>
+[0-9a-f ]+<F8>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <GF1\+0x4>
-00000438 <GF1>:
- 438: 80 40 f0 10 addi gr15,16,gr0
- 43c: 80 fc 00 14 setlos 0x14,gr0
- 440: 80 f4 00 24 setlo 0x24,gr0
- 444: 80 f8 00 00 sethi hi\(0x0\),gr0
- 448: 80 40 f0 0c addi gr15,12,gr0
- 44c: 80 fc 00 1c setlos 0x1c,gr0
- 450: 80 f4 00 18 setlo 0x18,gr0
- 454: 80 f8 00 00 sethi hi\(0x0\),gr0
- 458: 80 40 ff f8 addi gr15,-8,gr0
- 45c: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 460: 80 f4 ff c8 setlo 0xffc8,gr0
- 464: 80 f8 ff ff sethi 0xffff,gr0
- 468: 80 40 ff c4 addi gr15,-60,gr0
- 46c: 80 fc ff c4 setlos 0xf*ffffffc4,gr0
- 470: 80 f4 ff c4 setlo 0xffc4,gr0
- 474: 80 f8 ff ff sethi 0xffff,gr0
- 478: 80 f4 00 20 setlo 0x20,gr0
- 47c: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF1>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 14 setlos 0x14,gr0
+[0-9a-f ]+: 80 f4 00 24 setlo 0x24,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 1c setlos 0x1c,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff c8 setlo 0xffc8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff c0 addi gr15,-64,gr0
+[0-9a-f ]+: 80 fc ff c0 setlos 0xf+fc0,gr0
+[0-9a-f ]+: 80 f4 ff c0 setlo 0xffc0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9A-F ]+isassembly of section \.dat[0-9a-f ]+:
-000044fc <D8>:
- 44fc: 00 00 00 04 add\.p gr0,gr4,gr0
- 44fc: R_FRV_32 GD0
+[0-9a-f ]+<D8>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 GD0
-00004500 <GD0>:
- 4500: 00 00 00 10 add\.p gr0,gr16,gr0
- 4500: R_FRV_32 \.got
- 4504: 00 00 00 08 add\.p gr0,gr8,gr0
- 4504: R_FRV_32 \.text
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004508 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 4508: 00 00 00 08 add\.p gr0,gr8,gr0
- 4508: R_FRV_FUNCDESC_VALUE \.text
- 450c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4510: 00 00 00 08 add\.p gr0,gr8,gr0
- 4510: R_FRV_FUNCDESC_VALUE \.text
- 4514: 00 00 00 00 add\.p gr0,gr0,gr0
- 4518: 00 00 00 08 add\.p gr0,gr8,gr0
- 4518: R_FRV_FUNCDESC_VALUE \.text
- 451c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4520: 00 00 00 08 add\.p gr0,gr8,gr0
- 4520: R_FRV_FUNCDESC_VALUE \.text
- 4524: 00 00 00 00 add\.p gr0,gr0,gr0
- 4528: 00 00 00 08 add\.p gr0,gr8,gr0
- 4528: R_FRV_FUNCDESC_VALUE \.text
- 452c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4530: 00 00 00 08 add\.p gr0,gr8,gr0
- 4530: R_FRV_FUNCDESC_VALUE \.text
- 4534: 00 00 00 00 add\.p gr0,gr0,gr0
- 4538: 00 00 00 08 add\.p gr0,gr8,gr0
- 4538: R_FRV_FUNCDESC_VALUE \.text
- 453c: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004540 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 454c: 00 00 00 08 add\.p gr0,gr8,gr0
- 454c: R_FRV_32 \.got
- 4550: 00 00 00 04 add\.p gr0,gr4,gr0
- 4550: R_FRV_32 GF1
- 4554: 00 00 00 04 add\.p gr0,gr4,gr0
- 4554: R_FRV_32 GF2
- 4558: 00 00 00 20 add\.p gr0,gr32,gr0
- 4558: R_FRV_32 \.got
- 455c: 00 00 00 18 add\.p gr0,gr24,gr0
- 455c: R_FRV_32 \.got
- 4560: 00 00 00 04 add\.p gr0,gr4,gr0
- 4560: R_FRV_32 GD4
- 4564: 00 00 00 04 add\.p gr0,gr4,gr0
- 4564: R_FRV_32 GF3
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 GF1
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 GF2
+[0-9a-f ]+: 00 00 00 20 add\.p gr0,gr32,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 GD4
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 GF3
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-2.d b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
index eaa93aa..51ca126 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
@@ -7,77 +7,77 @@
Disassembly of section \.text:
-00000228 <F2>:
- 228: 80 3c 00 01 call 22c <GF0>
+[0-9a-f ]+<F2>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <GF0>
-0000022c <GF0>:
- 22c: 80 40 f0 10 addi gr15,16,gr0
- 230: 80 fc 00 24 setlos 0x24,gr0
- 234: 80 f4 00 20 setlo 0x20,gr0
- 238: 80 f8 00 00 sethi hi\(0x0\),gr0
- 23c: 80 40 f0 0c addi gr15,12,gr0
- 240: 80 fc 00 18 setlos 0x18,gr0
- 244: 80 f4 00 14 setlo 0x14,gr0
- 248: 80 f8 00 00 sethi hi\(0x0\),gr0
- 24c: 80 40 ff f8 addi gr15,-8,gr0
- 250: 80 fc ff d0 setlos 0xf*ffffffd0,gr0
- 254: 80 f4 ff c8 setlo 0xffc8,gr0
- 258: 80 f8 ff ff sethi 0xffff,gr0
- 25c: 80 40 ff bc addi gr15,-68,gr0
- 260: 80 fc ff bc setlos 0xf*ffffffbc,gr0
- 264: 80 f4 ff bc setlo 0xffbc,gr0
- 268: 80 f8 ff ff sethi 0xffff,gr0
- 26c: 80 f4 00 1c setlo 0x1c,gr0
- 270: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff d0 setlos 0xf+fd0,gr0
+[0-9a-f ]+: 80 f4 ff c8 setlo 0xffc8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff c0 addi gr15,-64,gr0
+[0-9a-f ]+: 80 fc ff c0 setlos 0xf+fc0,gr0
+[0-9a-f ]+: 80 f4 ff c0 setlo 0xffc0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000042f0 <D2>:
- 42f0: 00 00 00 04 add\.p gr0,gr4,gr0
- 42f0: R_FRV_32 \.data
+[0-9a-f ]+<D2>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-000042f4 <GD0>:
- 42f4: 00 00 00 18 add\.p gr0,gr24,gr0
- 42f4: R_FRV_32 \.got
- 42f8: 00 00 00 04 add\.p gr0,gr4,gr0
- 42f8: R_FRV_32 \.text
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004300 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 4300: 00 00 00 04 add\.p gr0,gr4,gr0
- 4300: R_FRV_FUNCDESC_VALUE \.text
- 4304: 00 00 00 00 add\.p gr0,gr0,gr0
- 4308: 00 00 00 04 add\.p gr0,gr4,gr0
- 4308: R_FRV_FUNCDESC_VALUE \.text
- 430c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4310: 00 00 00 04 add\.p gr0,gr4,gr0
- 4310: R_FRV_FUNCDESC_VALUE \.text
- 4314: 00 00 00 00 add\.p gr0,gr0,gr0
- 4318: 00 00 00 04 add\.p gr0,gr4,gr0
- 4318: R_FRV_FUNCDESC_VALUE \.text
- 431c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4320: 00 00 00 04 add\.p gr0,gr4,gr0
- 4320: R_FRV_FUNCDESC_VALUE \.text
- 4324: 00 00 00 00 add\.p gr0,gr0,gr0
- 4328: 00 00 00 04 add\.p gr0,gr4,gr0
- 4328: R_FRV_FUNCDESC_VALUE \.text
- 432c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4330: 00 00 00 04 add\.p gr0,gr4,gr0
- 4330: R_FRV_FUNCDESC_VALUE \.text
- 4334: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004338 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4344: 00 00 00 10 add\.p gr0,gr16,gr0
- 4344: R_FRV_32 \.got
- 4348: 00 00 00 04 add\.p gr0,gr4,gr0
- 4348: R_FRV_32 \.text
- 434c: 00 00 00 28 add\.p gr0,gr40,gr0
- 434c: R_FRV_32 \.got
- 4350: 00 00 00 20 add\.p gr0,gr32,gr0
- 4350: R_FRV_32 \.got
- 4354: 00 00 00 04 add\.p gr0,gr4,gr0
- 4354: R_FRV_32 \.data
- 4358: 00 00 00 04 add\.p gr0,gr4,gr0
- 4358: R_FRV_32 \.text
- 435c: 00 00 00 04 add\.p gr0,gr4,gr0
- 435c: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 28 add\.p gr0,gr40,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 20 add\.p gr0,gr32,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 04 add\.p gr0,gr4,gr0
+[0-9a-f ]+: R_FRV_32 \.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-8.d b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
index 5b4995f..8d2c67e 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
@@ -7,77 +7,77 @@
Disassembly of section \.text:
-00000228 <F8>:
- 228: 80 3c 00 02 call 230 <GF0\+0x4>
+[0-9a-f ]+<F8>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <GF0\+0x4>
-0000022c <GF0>:
- 22c: 80 40 f0 10 addi gr15,16,gr0
- 230: 80 fc 00 14 setlos 0x14,gr0
- 234: 80 f4 00 24 setlo 0x24,gr0
- 238: 80 f8 00 00 sethi hi\(0x0\),gr0
- 23c: 80 40 f0 0c addi gr15,12,gr0
- 240: 80 fc 00 1c setlos 0x1c,gr0
- 244: 80 f4 00 18 setlo 0x18,gr0
- 248: 80 f8 00 00 sethi hi\(0x0\),gr0
- 24c: 80 40 ff f8 addi gr15,-8,gr0
- 250: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 254: 80 f4 ff c8 setlo 0xffc8,gr0
- 258: 80 f8 ff ff sethi 0xffff,gr0
- 25c: 80 40 ff c0 addi gr15,-64,gr0
- 260: 80 fc ff c0 setlos 0xf*ffffffc0,gr0
- 264: 80 f4 ff c0 setlo 0xffc0,gr0
- 268: 80 f8 ff ff sethi 0xffff,gr0
- 26c: 80 f4 00 20 setlo 0x20,gr0
- 270: 80 f8 00 00 sethi hi\(0x0\),gr0
-Disassembly of section \.data:
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 14 setlos 0x14,gr0
+[0-9a-f ]+: 80 f4 00 24 setlo 0x24,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 1c setlos 0x1c,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf+ff0,gr0
+[0-9a-f ]+: 80 f4 ff c8 setlo 0xffc8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff c4 addi gr15,-60,gr0
+[0-9a-f ]+: 80 fc ff c4 setlos 0xf+fc4,gr0
+[0-9a-f ]+: 80 f4 ff c4 setlo 0xffc4,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000042f0 <D8>:
- 42f0: 00 00 00 08 add\.p gr0,gr8,gr0
- 42f0: R_FRV_32 \.data
+[0-9a-f ]+<D8>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
-000042f4 <GD0>:
- 42f4: 00 00 00 10 add\.p gr0,gr16,gr0
- 42f4: R_FRV_32 \.got
- 42f8: 00 00 00 08 add\.p gr0,gr8,gr0
- 42f8: R_FRV_32 \.text
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
Disassembly of section \.got:
-00004300 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 4300: 00 00 00 08 add\.p gr0,gr8,gr0
- 4300: R_FRV_FUNCDESC_VALUE \.text
- 4304: 00 00 00 00 add\.p gr0,gr0,gr0
- 4308: 00 00 00 08 add\.p gr0,gr8,gr0
- 4308: R_FRV_FUNCDESC_VALUE \.text
- 430c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4310: 00 00 00 08 add\.p gr0,gr8,gr0
- 4310: R_FRV_FUNCDESC_VALUE \.text
- 4314: 00 00 00 00 add\.p gr0,gr0,gr0
- 4318: 00 00 00 08 add\.p gr0,gr8,gr0
- 4318: R_FRV_FUNCDESC_VALUE \.text
- 431c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4320: 00 00 00 08 add\.p gr0,gr8,gr0
- 4320: R_FRV_FUNCDESC_VALUE \.text
- 4324: 00 00 00 00 add\.p gr0,gr0,gr0
- 4328: 00 00 00 08 add\.p gr0,gr8,gr0
- 4328: R_FRV_FUNCDESC_VALUE \.text
- 432c: 00 00 00 00 add\.p gr0,gr0,gr0
- 4330: 00 00 00 08 add\.p gr0,gr8,gr0
- 4330: R_FRV_FUNCDESC_VALUE \.text
- 4334: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_FUNCDESC_VALUE \.text
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
-00004338 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4344: 00 00 00 08 add\.p gr0,gr8,gr0
- 4344: R_FRV_32 \.got
- 4348: 00 00 00 08 add\.p gr0,gr8,gr0
- 4348: R_FRV_32 \.text
- 434c: 00 00 00 08 add\.p gr0,gr8,gr0
- 434c: R_FRV_32 \.text
- 4350: 00 00 00 20 add\.p gr0,gr32,gr0
- 4350: R_FRV_32 \.got
- 4354: 00 00 00 18 add\.p gr0,gr24,gr0
- 4354: R_FRV_32 \.got
- 4358: 00 00 00 08 add\.p gr0,gr8,gr0
- 4358: R_FRV_32 \.data
- 435c: 00 00 00 08 add\.p gr0,gr8,gr0
- 435c: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
+[0-9a-f ]+: 00 00 00 20 add\.p gr0,gr32,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 18 add\.p gr0,gr24,gr0
+[0-9a-f ]+: R_FRV_32 \.got
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.data
+[0-9a-f ]+: 00 00 00 08 add\.p gr0,gr8,gr0
+[0-9a-f ]+: R_FRV_32 \.text
diff --git a/ld/testsuite/ld-frv/fdpic-static-1.d b/ld/testsuite/ld-frv/fdpic-static-1.d
index 1973f5e..1c4dce1 100644
--- a/ld/testsuite/ld-frv/fdpic-static-1.d
+++ b/ld/testsuite/ld-frv/fdpic-static-1.d
@@ -7,56 +7,56 @@
Disassembly of section \.text:
-00010094 <F1>:
- 10094: 80 3c 00 01 call 10098 <\.F0>
-
-00010098 <\.F0>:
- 10098: 80 40 f0 0c addi gr15,12,gr0
- 1009c: 80 fc 00 0c setlos 0xc,gr0
- 100a0: 80 f4 00 0c setlo 0xc,gr0
- 100a4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100a8: 80 40 f0 10 addi gr15,16,gr0
- 100ac: 80 fc 00 10 setlos 0x10,gr0
- 100b0: 80 f4 00 10 setlo 0x10,gr0
- 100b4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100b8: 80 40 ff f8 addi gr15,-8,gr0
- 100bc: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 100c0: 80 f4 ff f8 setlo 0xfff8,gr0
- 100c4: 80 f8 ff ff sethi 0xffff,gr0
- 100c8: 80 40 ff f0 addi gr15,-16,gr0
- 100cc: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 100d0: 80 f4 ff f0 setlo 0xfff0,gr0
- 100d4: 80 f8 ff ff sethi 0xffff,gr0
- 100d8: 80 f4 00 14 setlo 0x14,gr0
- 100dc: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+<F1>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <\.F0>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf*fffffff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff f0 addi gr15,-16,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf*fffffff0,gr0
+[0-9a-f ]+: 80 f4 ff f0 setlo 0xfff0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.rofixup:
-000100e0 <__ROFIXUP_LIST__>:
- 100e0: 00 01 41 24 sub\.p gr20,gr36,gr0
- 100e4: 00 01 41 28 sub\.p gr20,gr40,gr0
- 100e8: 00 01 41 10 sub\.p gr20,gr16,gr0
- 100ec: 00 01 41 14 sub\.p gr20,gr20,gr0
- 100f0: 00 01 41 2c sub\.p gr20,gr44,gr0
- 100f4: 00 01 41 04 sub\.p gr20,gr4,gr0
- 100f8: 00 01 41 08 sub\.p gr20,gr8,gr0
- 100fc: 00 01 41 0c sub\.p gr20,gr12,gr0
- 10100: 00 01 41 18 sub\.p gr20,gr24,gr0
-Disassembly of section \.data:
-
-00014104 <D1>:
- 14104: 00 01 41 08 sub\.p gr20,gr8,gr0
-
-00014108 <\.D0>:
- 14108: 00 01 41 10 sub\.p gr20,gr16,gr0
- 1410c: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+<__ROFIXUP_LIST__>:
+[0-9a-f ]+: 00 01 41 24 sub\.p gr20,gr36,gr0
+[0-9a-f ]+: 00 01 41 28 sub\.p gr20,gr40,gr0
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 41 14 sub\.p gr20,gr20,gr0
+[0-9a-f ]+: 00 01 41 2c sub\.p gr20,gr44,gr0
+[0-9a-f ]+: 00 01 41 04 sub\.p gr20,gr4,gr0
+[0-9a-f ]+: 00 01 41 08 sub\.p gr20,gr8,gr0
+[0-9a-f ]+: 00 01 41 0c sub\.p gr20,gr12,gr0
+[0-9a-f ]+: 00 01 41 18 sub\.p gr20,gr24,gr0
+Disassembly of section \.dat[0-9a-f ]+:
+
+[0-9a-f ]+<D1>:
+[0-9a-f ]+: 00 01 41 08 sub\.p gr20,gr8,gr0
+
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
Disassembly of section \.got:
-00014110 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 14110: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14114: 00 01 41 18 sub\.p gr20,gr24,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 18 sub\.p gr20,gr24,gr0
-00014118 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14124: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14128: 00 01 41 10 sub\.p gr20,gr16,gr0
- 1412c: 00 01 41 08 sub\.p gr20,gr8,gr0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 41 08 sub\.p gr20,gr8,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-static-2.d b/ld/testsuite/ld-frv/fdpic-static-2.d
index e01cdfd..d2b794f 100644
--- a/ld/testsuite/ld-frv/fdpic-static-2.d
+++ b/ld/testsuite/ld-frv/fdpic-static-2.d
@@ -7,88 +7,88 @@
Disassembly of section \.text:
-00010094 <F2>:
- 10094: 80 3c 00 01 call 10098 <GF0>
+[0-9a-f ]+<F2>:
+[0-9a-f ]+: 80 3c 00 01 call [0-9a-f]+ <GF0>
-00010098 <GF0>:
- 10098: 80 40 f0 10 addi gr15,16,gr0
- 1009c: 80 fc 00 24 setlos 0x24,gr0
- 100a0: 80 f4 00 20 setlo 0x20,gr0
- 100a4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100a8: 80 40 f0 0c addi gr15,12,gr0
- 100ac: 80 fc 00 18 setlos 0x18,gr0
- 100b0: 80 f4 00 14 setlo 0x14,gr0
- 100b4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100b8: 80 40 ff f8 addi gr15,-8,gr0
- 100bc: 80 fc ff d0 setlos 0xf*ffffffd0,gr0
- 100c0: 80 f4 ff c8 setlo 0xffc8,gr0
- 100c4: 80 f8 ff ff sethi 0xffff,gr0
- 100c8: 80 40 ff c0 addi gr15,-64,gr0
- 100cc: 80 fc ff c0 setlos 0xf*ffffffc0,gr0
- 100d0: 80 f4 ff c0 setlo 0xffc0,gr0
- 100d4: 80 f8 ff ff sethi 0xffff,gr0
- 100d8: 80 f4 00 1c setlo 0x1c,gr0
- 100dc: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff d0 setlos 0xf*ffffffd0,gr0
+[0-9a-f ]+: 80 f4 ff c8 setlo 0xffc8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff c0 addi gr15,-64,gr0
+[0-9a-f ]+: 80 fc ff c0 setlos 0xf*ffffffc0,gr0
+[0-9a-f ]+: 80 f4 ff c0 setlo 0xffc0,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.rofixup:
-000100e0 <__ROFIXUP_LIST__>:
- 100e0: 00 01 41 98 subx\.p gr20,gr24,gr0,icc0
- 100e4: 00 01 41 ac subx\.p gr20,gr44,gr0,icc0
- 100e8: 00 01 41 a8 subx\.p gr20,gr40,gr0,icc0
- 100ec: 00 01 41 94 subx\.p gr20,gr20,gr0,icc0
- 100f0: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
- 100f4: 00 01 41 64 subcc\.p gr20,gr36,gr0,icc0
- 100f8: 00 01 41 a0 subx\.p gr20,gr32,gr0,icc0
- 100fc: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
- 10100: 00 01 41 74 subcc\.p gr20,gr52,gr0,icc0
- 10104: 00 01 41 9c subx\.p gr20,gr28,gr0,icc0
- 10108: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
- 1010c: 00 01 41 7c subcc\.p gr20,gr60,gr0,icc0
- 10110: 00 01 41 80 subx\.p gr20,gr0,gr0,icc0
- 10114: 00 01 41 84 subx\.p gr20,gr4,gr0,icc0
- 10118: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
- 1011c: 00 01 41 5c subcc\.p gr20,gr28,gr0,icc0
- 10120: 00 01 41 50 subcc\.p gr20,gr16,gr0,icc0
- 10124: 00 01 41 54 subcc\.p gr20,gr20,gr0,icc0
- 10128: 00 01 41 a4 subx\.p gr20,gr36,gr0,icc0
- 1012c: 00 01 41 44 subcc\.p gr20,gr4,gr0,icc0
- 10130: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
- 10134: 00 01 41 6c subcc\.p gr20,gr44,gr0,icc0
- 10138: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
- 1013c: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
- 10140: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
-Disassembly of section \.data:
+[0-9a-f ]+<__ROFIXUP_LIST__>:
+[0-9a-f ]+: 00 01 41 98 subx\.p gr20,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 ac subx\.p gr20,gr44,gr0,icc0
+[0-9a-f ]+: 00 01 41 a8 subx\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 41 94 subx\.p gr20,gr20,gr0,icc0
+[0-9a-f ]+: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 41 64 subcc\.p gr20,gr36,gr0,icc0
+[0-9a-f ]+: 00 01 41 a0 subx\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
+[0-9a-f ]+: 00 01 41 74 subcc\.p gr20,gr52,gr0,icc0
+[0-9a-f ]+: 00 01 41 9c subx\.p gr20,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
+[0-9a-f ]+: 00 01 41 7c subcc\.p gr20,gr60,gr0,icc0
+[0-9a-f ]+: 00 01 41 80 subx\.p gr20,gr0,gr0,icc0
+[0-9a-f ]+: 00 01 41 84 subx\.p gr20,gr4,gr0,icc0
+[0-9a-f ]+: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 5c subcc\.p gr20,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 50 subcc\.p gr20,gr16,gr0,icc0
+[0-9a-f ]+: 00 01 41 54 subcc\.p gr20,gr20,gr0,icc0
+[0-9a-f ]+: 00 01 41 a4 subx\.p gr20,gr36,gr0,icc0
+[0-9a-f ]+: 00 01 41 44 subcc\.p gr20,gr4,gr0,icc0
+[0-9a-f ]+: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 41 6c subcc\.p gr20,gr44,gr0,icc0
+[0-9a-f ]+: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+Disassembly of section \.dat[0-9a-f ]+:
-00014144 <D2>:
- 14144: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+<D2>:
+[0-9a-f ]+: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
-00014148 <GD0>:
- 14148: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
- 1414c: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
Disassembly of section \.got:
-00014150 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 14150: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14154: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14158: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 1415c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14160: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14164: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14168: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 1416c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14170: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14174: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14178: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 1417c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14180: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 14184: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
-00014188 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14194: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
- 14198: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 1419c: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
- 141a0: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
- 141a4: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
- 141a8: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
- 141ac: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
+[0-9a-f ]+: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
+[0-9a-f ]+: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 00 98 addx\.p gr16,gr24,gr0,icc0
diff --git a/ld/testsuite/ld-frv/fdpic-static-6.d b/ld/testsuite/ld-frv/fdpic-static-6.d
index fd570db..491b7c7 100644
--- a/ld/testsuite/ld-frv/fdpic-static-6.d
+++ b/ld/testsuite/ld-frv/fdpic-static-6.d
@@ -8,36 +8,36 @@
Disassembly of section \.text:
-00010094 <F6>:
- 10094: fe 3f bf db call 0 <_gp-0xf8d8>
- 10098: 80 40 f0 0c addi gr15,12,gr0
- 1009c: 80 fc 00 24 setlos 0x24,gr0
- 100a0: 80 f4 00 20 setlo 0x20,gr0
- 100a4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100a8: 80 40 f0 10 addi gr15,16,gr0
- 100ac: 80 fc 00 18 setlos 0x18,gr0
- 100b0: 80 f4 00 1c setlo 0x1c,gr0
- 100b4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100b8: 80 40 ff f8 addi gr15,-8,gr0
- 100bc: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 100c0: 80 f4 ff e8 setlo 0xffe8,gr0
- 100c4: 80 f8 ff ff sethi 0xffff,gr0
- 100c8: 80 f4 be e0 setlo 0xbee0,gr0
- 100cc: 80 f8 ff fe sethi 0xfffe,gr0
- 100d0: 80 f4 00 14 setlo 0x14,gr0
- 100d4: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+<F6>:
+[0-9a-f ]+: fe 3f bf db call 0 <_gp-0xf8d8>
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 24 setlos 0x24,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 18 setlos 0x18,gr0
+[0-9a-f ]+: 80 f4 00 1c setlo 0x1c,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf*fffffff0,gr0
+[0-9a-f ]+: 80 f4 ff e8 setlo 0xffe8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 be e0 setlo 0xbee0,gr0
+[0-9a-f ]+: 80 f8 ff fe sethi 0xfffe,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.rofixup:
-000100d8 <__ROFIXUP_LIST__>:
- 100d8: 00 01 41 20 sub\.p gr20,gr32,gr0
-Disassembly of section \.data:
+[0-9a-f ]+<__ROFIXUP_LIST__>:
+[0-9a-f ]+: 00 01 41 20 sub\.p gr20,gr32,gr0
+Disassembly of section \.dat[0-9a-f ]+:
-000140dc <D6>:
+[0-9a-f ]+<D6>:
\.\.\.
Disassembly of section \.got:
-000140e8 <_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
\.\.\.
-00014120 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
diff --git a/ld/testsuite/ld-frv/fdpic-static-7.d b/ld/testsuite/ld-frv/fdpic-static-7.d
index 1fa338e..6f8313c 100644
--- a/ld/testsuite/ld-frv/fdpic-static-7.d
+++ b/ld/testsuite/ld-frv/fdpic-static-7.d
@@ -7,56 +7,56 @@
Disassembly of section \.text:
-00010094 <F7>:
- 10094: 80 3c 00 02 call 1009c <\.F0\+0x4>
-
-00010098 <\.F0>:
- 10098: 80 40 f0 0c addi gr15,12,gr0
- 1009c: 80 fc 00 0c setlos 0xc,gr0
- 100a0: 80 f4 00 0c setlo 0xc,gr0
- 100a4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100a8: 80 40 f0 10 addi gr15,16,gr0
- 100ac: 80 fc 00 10 setlos 0x10,gr0
- 100b0: 80 f4 00 10 setlo 0x10,gr0
- 100b4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100b8: 80 40 ff f8 addi gr15,-8,gr0
- 100bc: 80 fc ff f8 setlos 0xf*fffffff8,gr0
- 100c0: 80 f4 ff f8 setlo 0xfff8,gr0
- 100c4: 80 f8 ff ff sethi 0xffff,gr0
- 100c8: 80 40 ff f4 addi gr15,-12,gr0
- 100cc: 80 fc ff f4 setlos 0xf*fffffff4,gr0
- 100d0: 80 f4 ff f4 setlo 0xfff4,gr0
- 100d4: 80 f8 ff ff sethi 0xffff,gr0
- 100d8: 80 f4 00 14 setlo 0x14,gr0
- 100dc: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+<F7>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <\.F0\+0x4>
+
+[0-9a-f ]+<\.F0>:
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 0c setlos 0xc,gr0
+[0-9a-f ]+: 80 f4 00 0c setlo 0xc,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 10 setlos 0x10,gr0
+[0-9a-f ]+: 80 f4 00 10 setlo 0x10,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f8 setlos 0xf*fffffff8,gr0
+[0-9a-f ]+: 80 f4 ff f8 setlo 0xfff8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff f4 addi gr15,-12,gr0
+[0-9a-f ]+: 80 fc ff f4 setlos 0xf*fffffff4,gr0
+[0-9a-f ]+: 80 f4 ff f4 setlo 0xfff4,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 14 setlo 0x14,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.rofixup:
-000100e0 <__ROFIXUP_LIST__>:
- 100e0: 00 01 41 24 sub\.p gr20,gr36,gr0
- 100e4: 00 01 41 28 sub\.p gr20,gr40,gr0
- 100e8: 00 01 41 10 sub\.p gr20,gr16,gr0
- 100ec: 00 01 41 14 sub\.p gr20,gr20,gr0
- 100f0: 00 01 41 2c sub\.p gr20,gr44,gr0
- 100f4: 00 01 41 04 sub\.p gr20,gr4,gr0
- 100f8: 00 01 41 08 sub\.p gr20,gr8,gr0
- 100fc: 00 01 41 0c sub\.p gr20,gr12,gr0
- 10100: 00 01 41 18 sub\.p gr20,gr24,gr0
-Disassembly of section \.data:
-
-00014104 <D7>:
- 14104: 00 01 41 0c sub\.p gr20,gr12,gr0
-
-00014108 <\.D0>:
- 14108: 00 01 41 10 sub\.p gr20,gr16,gr0
- 1410c: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+<__ROFIXUP_LIST__>:
+[0-9a-f ]+: 00 01 41 24 sub\.p gr20,gr36,gr0
+[0-9a-f ]+: 00 01 41 28 sub\.p gr20,gr40,gr0
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 41 14 sub\.p gr20,gr20,gr0
+[0-9a-f ]+: 00 01 41 2c sub\.p gr20,gr44,gr0
+[0-9a-f ]+: 00 01 41 04 sub\.p gr20,gr4,gr0
+[0-9a-f ]+: 00 01 41 08 sub\.p gr20,gr8,gr0
+[0-9a-f ]+: 00 01 41 0c sub\.p gr20,gr12,gr0
+[0-9a-f ]+: 00 01 41 18 sub\.p gr20,gr24,gr0
+Disassembly of section \.dat[0-9a-f ]+:
+
+[0-9a-f ]+<D7>:
+[0-9a-f ]+: 00 01 41 0c sub\.p gr20,gr12,gr0
+
+[0-9a-f ]+<\.D0>:
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
Disassembly of section \.got:
-00014110 <_GLOBAL_OFFSET_TABLE_-0x8>:
- 14110: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14114: 00 01 41 18 sub\.p gr20,gr24,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 18 sub\.p gr20,gr24,gr0
-00014118 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14124: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14128: 00 01 41 10 sub\.p gr20,gr16,gr0
- 1412c: 00 01 41 0c sub\.p gr20,gr12,gr0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 10 sub\.p gr20,gr16,gr0
+[0-9a-f ]+: 00 01 41 0c sub\.p gr20,gr12,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-static-8.d b/ld/testsuite/ld-frv/fdpic-static-8.d
index 10a5e4f..c0cc732 100644
--- a/ld/testsuite/ld-frv/fdpic-static-8.d
+++ b/ld/testsuite/ld-frv/fdpic-static-8.d
@@ -7,88 +7,88 @@
Disassembly of section \.text:
-00010094 <F8>:
- 10094: 80 3c 00 02 call 1009c <GF0\+0x4>
+[0-9a-f ]+<F8>:
+[0-9a-f ]+: 80 3c 00 02 call [0-9a-f]+ <GF0\+0x4>
-00010098 <GF0>:
- 10098: 80 40 f0 10 addi gr15,16,gr0
- 1009c: 80 fc 00 14 setlos 0x14,gr0
- 100a0: 80 f4 00 24 setlo 0x24,gr0
- 100a4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100a8: 80 40 f0 0c addi gr15,12,gr0
- 100ac: 80 fc 00 1c setlos 0x1c,gr0
- 100b0: 80 f4 00 18 setlo 0x18,gr0
- 100b4: 80 f8 00 00 sethi hi\(0x0\),gr0
- 100b8: 80 40 ff f8 addi gr15,-8,gr0
- 100bc: 80 fc ff f0 setlos 0xf*fffffff0,gr0
- 100c0: 80 f4 ff c8 setlo 0xffc8,gr0
- 100c4: 80 f8 ff ff sethi 0xffff,gr0
- 100c8: 80 40 ff c4 addi gr15,-60,gr0
- 100cc: 80 fc ff c4 setlos 0xf*ffffffc4,gr0
- 100d0: 80 f4 ff c4 setlo 0xffc4,gr0
- 100d4: 80 f8 ff ff sethi 0xffff,gr0
- 100d8: 80 f4 00 20 setlo 0x20,gr0
- 100dc: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+<GF0>:
+[0-9a-f ]+: 80 40 f0 10 addi gr15,16,gr0
+[0-9a-f ]+: 80 fc 00 14 setlos 0x14,gr0
+[0-9a-f ]+: 80 f4 00 24 setlo 0x24,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 f0 0c addi gr15,12,gr0
+[0-9a-f ]+: 80 fc 00 1c setlos 0x1c,gr0
+[0-9a-f ]+: 80 f4 00 18 setlo 0x18,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
+[0-9a-f ]+: 80 40 ff f8 addi gr15,-8,gr0
+[0-9a-f ]+: 80 fc ff f0 setlos 0xf*fffffff0,gr0
+[0-9a-f ]+: 80 f4 ff c8 setlo 0xffc8,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 40 ff c4 addi gr15,-60,gr0
+[0-9a-f ]+: 80 fc ff c4 setlos 0xf*ffffffc4,gr0
+[0-9a-f ]+: 80 f4 ff c4 setlo 0xffc4,gr0
+[0-9a-f ]+: 80 f8 ff ff sethi 0xffff,gr0
+[0-9a-f ]+: 80 f4 00 20 setlo 0x20,gr0
+[0-9a-f ]+: 80 f8 00 00 sethi hi\(0x0\),gr0
Disassembly of section \.rofixup:
-000100e0 <__ROFIXUP_LIST__>:
- 100e0: 00 01 41 98 subx\.p gr20,gr24,gr0,icc0
- 100e4: 00 01 41 9c subx\.p gr20,gr28,gr0,icc0
- 100e8: 00 01 41 ac subx\.p gr20,gr44,gr0,icc0
- 100ec: 00 01 41 94 subx\.p gr20,gr20,gr0,icc0
- 100f0: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
- 100f4: 00 01 41 5c subcc\.p gr20,gr28,gr0,icc0
- 100f8: 00 01 41 a4 subx\.p gr20,gr36,gr0,icc0
- 100fc: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
- 10100: 00 01 41 6c subcc\.p gr20,gr44,gr0,icc0
- 10104: 00 01 41 a0 subx\.p gr20,gr32,gr0,icc0
- 10108: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
- 1010c: 00 01 41 74 subcc\.p gr20,gr52,gr0,icc0
- 10110: 00 01 41 80 subx\.p gr20,gr0,gr0,icc0
- 10114: 00 01 41 84 subx\.p gr20,gr4,gr0,icc0
- 10118: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
- 1011c: 00 01 41 7c subcc\.p gr20,gr60,gr0,icc0
- 10120: 00 01 41 50 subcc\.p gr20,gr16,gr0,icc0
- 10124: 00 01 41 54 subcc\.p gr20,gr20,gr0,icc0
- 10128: 00 01 41 a8 subx\.p gr20,gr40,gr0,icc0
- 1012c: 00 01 41 44 subcc\.p gr20,gr4,gr0,icc0
- 10130: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
- 10134: 00 01 41 64 subcc\.p gr20,gr36,gr0,icc0
- 10138: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
- 1013c: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
- 10140: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
-Disassembly of section \.data:
+[0-9a-f ]+<__ROFIXUP_LIST__>:
+[0-9a-f ]+: 00 01 41 98 subx\.p gr20,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 9c subx\.p gr20,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 ac subx\.p gr20,gr44,gr0,icc0
+[0-9a-f ]+: 00 01 41 94 subx\.p gr20,gr20,gr0,icc0
+[0-9a-f ]+: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 41 5c subcc\.p gr20,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 a4 subx\.p gr20,gr36,gr0,icc0
+[0-9a-f ]+: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 41 6c subcc\.p gr20,gr44,gr0,icc0
+[0-9a-f ]+: 00 01 41 a0 subx\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
+[0-9a-f ]+: 00 01 41 74 subcc\.p gr20,gr52,gr0,icc0
+[0-9a-f ]+: 00 01 41 80 subx\.p gr20,gr0,gr0,icc0
+[0-9a-f ]+: 00 01 41 84 subx\.p gr20,gr4,gr0,icc0
+[0-9a-f ]+: 00 01 41 78 subcc\.p gr20,gr56,gr0,icc0
+[0-9a-f ]+: 00 01 41 7c subcc\.p gr20,gr60,gr0,icc0
+[0-9a-f ]+: 00 01 41 50 subcc\.p gr20,gr16,gr0,icc0
+[0-9a-f ]+: 00 01 41 54 subcc\.p gr20,gr20,gr0,icc0
+[0-9a-f ]+: 00 01 41 a8 subx\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 41 44 subcc\.p gr20,gr4,gr0,icc0
+[0-9a-f ]+: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 41 64 subcc\.p gr20,gr36,gr0,icc0
+[0-9a-f ]+: 00 01 41 48 subcc\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+Disassembly of section \.dat[0-9a-f ]+:
-00014144 <D8>:
- 14144: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
+[0-9a-f ]+<D8>:
+[0-9a-f ]+: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
-00014148 <GD0>:
- 14148: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
- 1414c: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+<GD0>:
+[0-9a-f ]+: 00 01 41 60 subcc\.p gr20,gr32,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
Disassembly of section \.got:
-00014150 <_GLOBAL_OFFSET_TABLE_-0x38>:
- 14150: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14154: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14158: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 1415c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14160: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14164: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14168: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 1416c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14170: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14174: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14178: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 1417c: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
- 14180: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 14184: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 88 subx\.p gr20,gr8,gr0,icc0
-00014188 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14194: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
- 14198: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 1419c: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
- 141a0: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
- 141a4: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
- 141a8: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
- 141ac: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 58 subcc\.p gr20,gr24,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
+[0-9a-f ]+: 00 01 41 70 subcc\.p gr20,gr48,gr0,icc0
+[0-9a-f ]+: 00 01 41 68 subcc\.p gr20,gr40,gr0,icc0
+[0-9a-f ]+: 00 01 41 4c subcc\.p gr20,gr12,gr0,icc0
+[0-9a-f ]+: 00 01 00 9c addx\.p gr16,gr28,gr0,icc0
diff --git a/ld/testsuite/ld-frv/tls-dynamic-1.d b/ld/testsuite/ld-frv/tls-dynamic-1.d
index 27075d5..a3790c9 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-1.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-1.d
@@ -7,65 +7,65 @@
Disassembly of section \.text:
-000102c8 <_start>:
- 102c8: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 102cc: 00 88 00 00 nop\.p
- 102d0: 80 88 00 00 nop
- 102d4: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 102d8: 80 88 00 00 nop
- 102dc: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 102e0: 80 88 00 00 nop
- 102e4: 80 88 00 00 nop
- 102e8: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 102ec: 00 88 00 00 nop\.p
- 102f0: 80 88 00 00 nop
- 102f4: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 102f8: 80 88 00 00 nop
- 102fc: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 10300: 80 88 00 00 nop
- 10304: 80 88 00 00 nop
- 10308: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1030c: 00 88 00 00 nop\.p
- 10310: 80 88 00 00 nop
- 10314: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10318: 80 88 00 00 nop
- 1031c: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 10320: 80 88 00 00 nop
- 10324: 80 88 00 00 nop
- 10328: 92 fc 00 00 setlos lo\(0x0\),gr9
- 1032c: 00 88 00 00 nop\.p
- 10330: 80 88 00 00 nop
- 10334: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10338: 80 88 00 00 nop
- 1033c: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 10340: 80 88 00 00 nop
- 10344: 80 88 00 00 nop
- 10348: 00 88 00 00 nop\.p
- 1034c: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 10350: 00 88 00 00 nop\.p
- 10354: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10358: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 1035c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10360: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10364: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10368: 00 88 00 00 nop\.p
- 1036c: 80 88 00 00 nop
- 10370: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 10374: 00 88 00 00 nop\.p
- 10378: 80 88 00 00 nop
- 1037c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10380: 00 88 00 00 nop\.p
- 10384: 80 88 00 00 nop
- 10388: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1038c: 00 88 00 00 nop\.p
- 10390: 80 88 00 00 nop
- 10394: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-00014428 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14434: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
- 14438: 00 00 00 00 add\.p gr0,gr0,gr0
- 14438: R_FRV_TLSOFF x
- 1443c: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
- 14440: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/tls-dynamic-2.d b/ld/testsuite/ld-frv/tls-dynamic-2.d
index 986789c..6470731 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-2.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-2.d
@@ -7,194 +7,194 @@
Disassembly of section \.plt:
-00010308 <\.plt>:
- 10308: c0 3a 40 00 bralr
- 1030c: 92 fc 08 21 setlos 0x821,gr9
- 10310: c0 3a 40 00 bralr
- 10314: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 10318: 92 f4 f8 21 setlo 0xf821,gr9
- 1031c: c0 3a 40 00 bralr
- 10320: 92 fc 00 01 setlos 0x1,gr9
- 10324: c0 3a 40 00 bralr
- 10328: 92 c8 ff bc ldi @\(gr15,-68\),gr9
- 1032c: c0 3a 40 00 bralr
- 10330: 92 fc f8 11 setlos 0xf*fffff811,gr9
- 10334: c0 3a 40 00 bralr
- 10338: 92 fc 10 01 setlos 0x1001,gr9
- 1033c: c0 3a 40 00 bralr
- 10340: 92 c8 ff d4 ldi @\(gr15,-44\),gr9
- 10344: c0 3a 40 00 bralr
- 10348: 92 fc 08 11 setlos 0x811,gr9
- 1034c: c0 3a 40 00 bralr
- 10350: 12 f8 00 01 sethi\.p 0x1,gr9
- 10354: 92 f4 00 01 setlo 0x1,gr9
- 10358: c0 3a 40 00 bralr
- 1035c: 92 c8 ff ec ldi @\(gr15,-20\),gr9
- 10360: c0 3a 40 00 bralr
- 10364: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 10368: 92 f4 f8 11 setlo 0xf811,gr9
- 1036c: c0 3a 40 00 bralr
- 10370: 92 fc f8 21 setlos 0xf*fffff821,gr9
- 10374: c0 3a 40 00 bralr
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc 08 21 setlos 0x821,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 21 setlo 0xf821,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc 00 01 setlos 0x1,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 c8 ff bc ldi @\(gr15,-68\),gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc f8 11 setlos 0xf*fffff811,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc 10 01 setlos 0x1001,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 c8 ff d4 ldi @\(gr15,-44\),gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc 08 11 setlos 0x811,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 12 f8 00 01 sethi\.p 0x1,gr9
+[0-9a-f ]+: 92 f4 00 01 setlo 0x1,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 c8 ff ec ldi @\(gr15,-20\),gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 11 setlo 0xf811,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 92 fc f8 21 setlos 0xf*fffff821,gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
Disassembly of section \.text:
-00010378 <_start>:
- 10378: 92 fc f8 11 setlos 0xf*fffff811,gr9
- 1037c: 92 fc 08 11 setlos 0x811,gr9
- 10380: 92 c8 ff f4 ldi @\(gr15,-12\),gr9
- 10384: 00 88 00 00 nop\.p
- 10388: 80 88 00 00 nop
- 1038c: 92 fc f8 12 setlos 0xf*fffff812,gr9
- 10390: 80 88 00 00 nop
- 10394: 00 88 00 00 nop\.p
- 10398: 80 88 00 00 nop
- 1039c: 92 fc 08 12 setlos 0x812,gr9
- 103a0: 80 88 00 00 nop
- 103a4: 00 88 00 00 nop\.p
- 103a8: 80 88 00 00 nop
- 103ac: 92 f8 00 00 sethi hi\(0x0\),gr9
- 103b0: 92 f4 f8 12 setlo 0xf812,gr9
- 103b4: 12 fc f8 13 setlos\.p 0xf*fffff813,gr9
- 103b8: 80 88 00 00 nop
- 103bc: 80 88 00 00 nop
- 103c0: 12 fc 08 13 setlos\.p 0x813,gr9
- 103c4: 80 88 00 00 nop
- 103c8: 80 88 00 00 nop
- 103cc: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 103d0: 80 88 00 00 nop
- 103d4: 92 f4 f8 13 setlo 0xf813,gr9
- 103d8: 80 88 00 00 nop
- 103dc: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 103e0: 80 88 00 00 nop
- 103e4: 92 fc 08 14 setlos 0x814,gr9
- 103e8: 92 f8 00 00 sethi hi\(0x0\),gr9
- 103ec: 92 f4 f8 14 setlo 0xf814,gr9
- 103f0: 92 fc f8 21 setlos 0xf*fffff821,gr9
- 103f4: 92 fc 08 21 setlos 0x821,gr9
- 103f8: 92 c8 ff ac ldi @\(gr15,-84\),gr9
- 103fc: 00 88 00 00 nop\.p
- 10400: 80 88 00 00 nop
- 10404: 92 fc f8 22 setlos 0xf*fffff822,gr9
- 10408: 80 88 00 00 nop
- 1040c: 00 88 00 00 nop\.p
- 10410: 80 88 00 00 nop
- 10414: 92 fc 08 22 setlos 0x822,gr9
- 10418: 80 88 00 00 nop
- 1041c: 00 88 00 00 nop\.p
- 10420: 80 88 00 00 nop
- 10424: 92 f8 00 00 sethi hi\(0x0\),gr9
- 10428: 92 f4 f8 22 setlo 0xf822,gr9
- 1042c: 12 fc f8 23 setlos\.p 0xf*fffff823,gr9
- 10430: 80 88 00 00 nop
- 10434: 80 88 00 00 nop
- 10438: 12 fc 08 23 setlos\.p 0x823,gr9
- 1043c: 80 88 00 00 nop
- 10440: 80 88 00 00 nop
- 10444: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 10448: 80 88 00 00 nop
- 1044c: 92 f4 f8 23 setlo 0xf823,gr9
- 10450: 80 88 00 00 nop
- 10454: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 10458: 80 88 00 00 nop
- 1045c: 92 fc 08 24 setlos 0x824,gr9
- 10460: 92 f8 00 00 sethi hi\(0x0\),gr9
- 10464: 92 f4 f8 24 setlo 0xf824,gr9
- 10468: 92 fc 00 01 setlos 0x1,gr9
- 1046c: 92 fc 10 01 setlos 0x1001,gr9
- 10470: 92 c8 ff e4 ldi @\(gr15,-28\),gr9
- 10474: 00 88 00 00 nop\.p
- 10478: 80 88 00 00 nop
- 1047c: 92 fc 00 02 setlos 0x2,gr9
- 10480: 80 88 00 00 nop
- 10484: 00 88 00 00 nop\.p
- 10488: 80 88 00 00 nop
- 1048c: 92 fc 10 02 setlos 0x1002,gr9
- 10490: 80 88 00 00 nop
- 10494: 00 88 00 00 nop\.p
- 10498: 80 88 00 00 nop
- 1049c: 92 f8 00 01 sethi 0x1,gr9
- 104a0: 92 f4 00 02 setlo 0x2,gr9
- 104a4: 12 fc 00 03 setlos\.p 0x3,gr9
- 104a8: 80 88 00 00 nop
- 104ac: 80 88 00 00 nop
- 104b0: 12 fc 10 03 setlos\.p 0x1003,gr9
- 104b4: 80 88 00 00 nop
- 104b8: 80 88 00 00 nop
- 104bc: 12 f8 00 01 sethi\.p 0x1,gr9
- 104c0: 80 88 00 00 nop
- 104c4: 92 f4 00 03 setlo 0x3,gr9
- 104c8: 80 88 00 00 nop
- 104cc: 92 fc 00 04 setlos 0x4,gr9
- 104d0: 80 88 00 00 nop
- 104d4: 92 fc 10 04 setlos 0x1004,gr9
- 104d8: 92 f8 00 01 sethi 0x1,gr9
- 104dc: 92 f4 00 04 setlo 0x4,gr9
- 104e0: 92 c8 ff bc ldi @\(gr15,-68\),gr9
- 104e4: 92 c8 ff d4 ldi @\(gr15,-44\),gr9
- 104e8: 92 c8 ff ec ldi @\(gr15,-20\),gr9
- 104ec: 00 88 00 00 nop\.p
- 104f0: 80 88 00 00 nop
- 104f4: 92 c8 f0 20 ldi @\(gr15,32\),gr9
- 104f8: 80 88 00 00 nop
- 104fc: 00 88 00 00 nop\.p
- 10500: 80 88 00 00 nop
- 10504: 92 c8 f0 1c ldi @\(gr15,28\),gr9
- 10508: 80 88 00 00 nop
- 1050c: 00 88 00 00 nop\.p
- 10510: 80 88 00 00 nop
- 10514: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 10518: 80 88 00 00 nop
- 1051c: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 10520: 80 88 00 00 nop
- 10524: 80 88 00 00 nop
- 10528: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 1052c: 80 88 00 00 nop
- 10530: 80 88 00 00 nop
- 10534: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
- 10538: 80 88 00 00 nop
- 1053c: 80 88 00 00 nop
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 fc f8 11 setlos 0xf*fffff811,gr9
+[0-9a-f ]+: 92 fc 08 11 setlos 0x811,gr9
+[0-9a-f ]+: 92 c8 ff f4 ldi @\(gr15,-12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 12 setlos 0xf*fffff812,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 12 setlos 0x812,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 12 setlo 0xf812,gr9
+[0-9a-f ]+: 12 fc f8 13 setlos\.p 0xf*fffff813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 08 13 setlos\.p 0x813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 f8 13 setlo 0xf813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: 92 fc f8 21 setlos 0xf*fffff821,gr9
+[0-9a-f ]+: 92 fc 08 21 setlos 0x821,gr9
+[0-9a-f ]+: 92 c8 ff ac ldi @\(gr15,-84\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 22 setlos 0xf*fffff822,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 22 setlos 0x822,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 22 setlo 0xf822,gr9
+[0-9a-f ]+: 12 fc f8 23 setlos\.p 0xf*fffff823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 08 23 setlos\.p 0x823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 f8 23 setlo 0xf823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: 92 fc 00 01 setlos 0x1,gr9
+[0-9a-f ]+: 92 fc 10 01 setlos 0x1001,gr9
+[0-9a-f ]+: 92 c8 ff e4 ldi @\(gr15,-28\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 02 setlos 0x2,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 02 setlos 0x1002,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 02 setlo 0x2,gr9
+[0-9a-f ]+: 12 fc 00 03 setlos\.p 0x3,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 10 03 setlos\.p 0x1003,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 01 sethi\.p 0x1,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 00 03 setlo 0x3,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: 92 c8 ff bc ldi @\(gr15,-68\),gr9
+[0-9a-f ]+: 92 c8 ff d4 ldi @\(gr15,-44\),gr9
+[0-9a-f ]+: 92 c8 ff ec ldi @\(gr15,-20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 20 ldi @\(gr15,32\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 1c ldi @\(gr15,28\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
Disassembly of section \.got:
-000145f8 <_GLOBAL_OFFSET_TABLE_-0x60>:
- 145f8: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 145fc: 00 00 08 21 \*unknown\*
- 14600: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 14604: 00 00 f8 21 \*unknown\*
- 14608: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 1460c: 00 00 00 01 add\.p gr0,sp,gr0
- 14610: 00 00 00 00 add\.p gr0,gr0,gr0
- 14610: R_FRV_TLSDESC_VALUE x
- 14614: 00 00 00 01 add\.p gr0,sp,gr0
- 14618: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 1461c: ff ff f8 11 cop2 -32,cpr63,cpr17,cpr63
- 14620: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 14624: 00 00 10 01 add\.p sp,sp,gr0
- 14628: 00 00 00 00 add\.p gr0,gr0,gr0
- 14628: R_FRV_TLSDESC_VALUE x
- 1462c: 00 00 10 01 add\.p sp,sp,gr0
- 14630: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 14634: 00 00 08 11 \*unknown\*
- 14638: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 1463c: 00 01 00 01 add\.p gr16,sp,gr0
- 14640: 00 00 00 00 add\.p gr0,gr0,gr0
- 14640: R_FRV_TLSDESC_VALUE x
- 14644: 00 01 00 01 add\.p gr16,sp,gr0
- 14648: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 1464c: 00 00 f8 11 \*unknown\*
- 14650: 00 01 03 08 cmpb\.p gr16,gr8,icc0
- 14654: ff ff f8 21 cop2 -32,cpr63,cpr33,cpr63
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 08 21 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 f8 21 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 00 01 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 01 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: ff ff f8 11 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 10 01 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 01 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 08 11 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 01 00 01 .*
+[0-9a-f ]+: 00 00 00 00 .*
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 01 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: 00 00 f8 11 .*
+[0-9a-f ]+: 00 01 02 c0 .*
+[0-9a-f ]+: ff ff f8 21 .*
-00014658 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14664: 00 00 00 03 add\.p gr0,gr3,gr0
- 14664: R_FRV_TLSOFF x
- 14668: 00 00 10 03 add\.p sp,gr3,gr0
- 14668: R_FRV_TLSOFF x
- 1466c: 00 01 00 03 add\.p gr16,gr3,gr0
- 1466c: R_FRV_TLSOFF x
- 14670: 00 01 00 02 add\.p gr16,fp,gr0
- 14670: R_FRV_TLSOFF x
- 14674: 00 00 10 02 add\.p sp,fp,gr0
- 14674: R_FRV_TLSOFF x
- 14678: 00 00 00 02 add\.p gr0,fp,gr0
- 14678: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 03 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 03 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 03 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 02 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 02 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 02 .*
+[0-9a-f ]+: R_FRV_TLSOFF x
diff --git a/ld/testsuite/ld-frv/tls-dynamic-3.d b/ld/testsuite/ld-frv/tls-dynamic-3.d
index f4d3337..35be3a9 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-3.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-00010294 <_start>:
- 10294: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 10298: 00 88 00 00 nop\.p
- 1029c: 80 88 00 00 nop
- 102a0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102a4: 80 88 00 00 nop
- 102a8: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 102ac: 80 88 00 00 nop
- 102b0: 80 88 00 00 nop
- 102b4: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102b8: 00 88 00 00 nop\.p
- 102bc: 80 88 00 00 nop
- 102c0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-00014350 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 1435c: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-initial-shared-2.d b/ld/testsuite/ld-frv/tls-initial-shared-2.d
index 3d276db..e221bec 100644
--- a/ld/testsuite/ld-frv/tls-initial-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-initial-shared-2.d
@@ -8,228 +8,228 @@
Disassembly of section \.plt:
-00000464 <\.plt>:
- 464: 92 c8 f0 5c ldi @\(gr15,92\),gr9
- 468: c0 3a 40 00 bralr
- 46c: 90 cc ff e8 lddi @\(gr15,-24\),gr8
- 470: 80 30 80 00 jmpl @\(gr8,gr0\)
- 474: 92 c8 f0 78 ldi @\(gr15,120\),gr9
- 478: c0 3a 40 00 bralr
- 47c: 90 cc ff f8 lddi @\(gr15,-8\),gr8
- 480: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 92 c8 f0 5c ldi @\(gr15,92\),gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 90 cc ff e8 lddi @\(gr15,-24\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 92 c8 f0 78 ldi @\(gr15,120\),gr9
+[0-9a-f ]+: c0 3a 40 00 bralr
+[0-9a-f ]+: 90 cc ff f8 lddi @\(gr15,-8\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
Disassembly of section \.text:
-00000484 <_start>:
- 484: 92 c8 f0 30 ldi @\(gr15,48\),gr9
- 488: 92 c8 f0 78 ldi @\(gr15,120\),gr9
- 48c: 92 c8 f0 4c ldi @\(gr15,76\),gr9
- 490: 00 88 00 00 nop\.p
- 494: 80 88 00 00 nop
- 498: 92 c8 f0 70 ldi @\(gr15,112\),gr9
- 49c: 80 88 00 00 nop
- 4a0: 00 88 00 00 nop\.p
- 4a4: 80 88 00 00 nop
- 4a8: 92 c8 f0 7c ldi @\(gr15,124\),gr9
- 4ac: 80 88 00 00 nop
- 4b0: 00 88 00 00 nop\.p
- 4b4: 80 88 00 00 nop
- 4b8: 92 c8 f0 8c ldi @\(gr15,140\),gr9
- 4bc: 80 88 00 00 nop
- 4c0: 12 c8 f0 34 ldi\.p @\(gr15,52\),gr9
- 4c4: 80 88 00 00 nop
- 4c8: 80 88 00 00 nop
- 4cc: 12 c8 f0 3c ldi\.p @\(gr15,60\),gr9
- 4d0: 80 88 00 00 nop
- 4d4: 80 88 00 00 nop
- 4d8: 12 c8 f0 50 ldi\.p @\(gr15,80\),gr9
- 4dc: 80 88 00 00 nop
- 4e0: 80 88 00 00 nop
- 4e4: 80 88 00 00 nop
- 4e8: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 4ec: 80 88 00 00 nop
- 4f0: 92 fc 08 14 setlos 0x814,gr9
- 4f4: 92 f8 00 00 sethi hi\(0x0\),gr9
- 4f8: 92 f4 f8 14 setlo 0xf814,gr9
- 4fc: 92 c8 f0 54 ldi @\(gr15,84\),gr9
- 500: 92 c8 f0 5c ldi @\(gr15,92\),gr9
- 504: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 508: 00 88 00 00 nop\.p
- 50c: 80 88 00 00 nop
- 510: 92 c8 f0 90 ldi @\(gr15,144\),gr9
- 514: 80 88 00 00 nop
- 518: 00 88 00 00 nop\.p
- 51c: 80 88 00 00 nop
- 520: 92 c8 f0 60 ldi @\(gr15,96\),gr9
- 524: 80 88 00 00 nop
- 528: 00 88 00 00 nop\.p
- 52c: 80 88 00 00 nop
- 530: 92 c8 f0 64 ldi @\(gr15,100\),gr9
- 534: 80 88 00 00 nop
- 538: 12 c8 f0 58 ldi\.p @\(gr15,88\),gr9
- 53c: 80 88 00 00 nop
- 540: 80 88 00 00 nop
- 544: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 548: 80 88 00 00 nop
- 54c: 80 88 00 00 nop
- 550: 12 c8 f0 1c ldi\.p @\(gr15,28\),gr9
- 554: 80 88 00 00 nop
- 558: 80 88 00 00 nop
- 55c: 80 88 00 00 nop
- 560: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 564: 80 88 00 00 nop
- 568: 92 fc 08 24 setlos 0x824,gr9
- 56c: 92 f8 00 00 sethi hi\(0x0\),gr9
- 570: 92 f4 f8 24 setlo 0xf824,gr9
- 574: 92 c8 f0 24 ldi @\(gr15,36\),gr9
- 578: fe 3f ff c1 call 47c <i\+0x46c>
- 57c: 92 c8 f0 40 ldi @\(gr15,64\),gr9
- 580: 00 88 00 00 nop\.p
- 584: 80 88 00 00 nop
- 588: 92 c8 f0 68 ldi @\(gr15,104\),gr9
- 58c: 80 88 00 00 nop
- 590: 00 88 00 00 nop\.p
- 594: 80 88 00 00 nop
- 598: 92 c8 f0 80 ldi @\(gr15,128\),gr9
- 59c: 80 88 00 00 nop
- 5a0: 00 88 00 00 nop\.p
- 5a4: 80 88 00 00 nop
- 5a8: 92 c8 f0 84 ldi @\(gr15,132\),gr9
- 5ac: 80 88 00 00 nop
- 5b0: 12 c8 f0 28 ldi\.p @\(gr15,40\),gr9
- 5b4: 80 88 00 00 nop
- 5b8: 80 88 00 00 nop
- 5bc: 12 c8 f0 38 ldi\.p @\(gr15,56\),gr9
- 5c0: 80 88 00 00 nop
- 5c4: 80 88 00 00 nop
- 5c8: 12 c8 f0 44 ldi\.p @\(gr15,68\),gr9
- 5cc: 80 88 00 00 nop
- 5d0: 80 88 00 00 nop
- 5d4: 80 88 00 00 nop
- 5d8: 92 fc 00 04 setlos 0x4,gr9
- 5dc: 80 88 00 00 nop
- 5e0: 92 fc 10 04 setlos 0x1004,gr9
- 5e4: 92 f8 00 01 sethi 0x1,gr9
- 5e8: 92 f4 00 04 setlo 0x4,gr9
- 5ec: 92 c8 f0 2c ldi @\(gr15,44\),gr9
- 5f0: fe 3f ff 9f call 46c <i\+0x45c>
- 5f4: 92 c8 f0 48 ldi @\(gr15,72\),gr9
- 5f8: 00 88 00 00 nop\.p
- 5fc: 80 88 00 00 nop
- 600: 92 c8 f0 6c ldi @\(gr15,108\),gr9
- 604: 80 88 00 00 nop
- 608: 00 88 00 00 nop\.p
- 60c: 80 88 00 00 nop
- 610: 92 c8 f0 74 ldi @\(gr15,116\),gr9
- 614: 80 88 00 00 nop
- 618: 00 88 00 00 nop\.p
- 61c: 80 88 00 00 nop
- 620: 92 c8 f0 88 ldi @\(gr15,136\),gr9
- 624: 80 88 00 00 nop
- 628: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 62c: 80 88 00 00 nop
- 630: 80 88 00 00 nop
- 634: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
- 638: 80 88 00 00 nop
- 63c: 80 88 00 00 nop
- 640: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
- 644: 80 88 00 00 nop
- 648: 80 88 00 00 nop
- 64c: 92 c8 f0 30 ldi @\(gr15,48\),gr9
- 650: 92 c8 f0 4c ldi @\(gr15,76\),gr9
- 654: 92 c8 f0 54 ldi @\(gr15,84\),gr9
- 658: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 65c: 92 c8 f0 24 ldi @\(gr15,36\),gr9
- 660: 92 c8 f0 40 ldi @\(gr15,64\),gr9
- 664: 92 c8 f0 2c ldi @\(gr15,44\),gr9
- 668: 92 c8 f0 48 ldi @\(gr15,72\),gr9
- 66c: 80 88 00 00 nop
- 670: 92 c8 f0 78 ldi @\(gr15,120\),gr9
- 674: 80 88 00 00 nop
- 678: 80 88 00 00 nop
- 67c: 92 c8 f0 5c ldi @\(gr15,92\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 30 ldi @\(gr15,48\),gr9
+[0-9a-f ]+: 92 c8 f0 78 ldi @\(gr15,120\),gr9
+[0-9a-f ]+: 92 c8 f0 4c ldi @\(gr15,76\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 70 ldi @\(gr15,112\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 7c ldi @\(gr15,124\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 8c ldi @\(gr15,140\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 34 ldi\.p @\(gr15,52\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 3c ldi\.p @\(gr15,60\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 50 ldi\.p @\(gr15,80\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: 92 c8 f0 54 ldi @\(gr15,84\),gr9
+[0-9a-f ]+: 92 c8 f0 5c ldi @\(gr15,92\),gr9
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 90 ldi @\(gr15,144\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 60 ldi @\(gr15,96\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 64 ldi @\(gr15,100\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 58 ldi\.p @\(gr15,88\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 1c ldi\.p @\(gr15,28\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: 92 c8 f0 24 ldi @\(gr15,36\),gr9
+[0-9a-f ]+: fe 3f ff c1 call .*
+[0-9a-f ]+: 92 c8 f0 40 ldi @\(gr15,64\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 68 ldi @\(gr15,104\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 80 ldi @\(gr15,128\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 84 ldi @\(gr15,132\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 28 ldi\.p @\(gr15,40\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 38 ldi\.p @\(gr15,56\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 44 ldi\.p @\(gr15,68\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: 92 c8 f0 2c ldi @\(gr15,44\),gr9
+[0-9a-f ]+: fe 3f ff 9f call .*
+[0-9a-f ]+: 92 c8 f0 48 ldi @\(gr15,72\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 6c ldi @\(gr15,108\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 74 ldi @\(gr15,116\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 88 ldi @\(gr15,136\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 30 ldi @\(gr15,48\),gr9
+[0-9a-f ]+: 92 c8 f0 4c ldi @\(gr15,76\),gr9
+[0-9a-f ]+: 92 c8 f0 54 ldi @\(gr15,84\),gr9
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 92 c8 f0 24 ldi @\(gr15,36\),gr9
+[0-9a-f ]+: 92 c8 f0 40 ldi @\(gr15,64\),gr9
+[0-9a-f ]+: 92 c8 f0 2c ldi @\(gr15,44\),gr9
+[0-9a-f ]+: 92 c8 f0 48 ldi @\(gr15,72\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 78 ldi @\(gr15,120\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 5c ldi @\(gr15,92\),gr9
Disassembly of section \.got:
-00004718 <_GLOBAL_OFFSET_TABLE_-0x20>:
- 4718: 00 00 00 00 add\.p gr0,gr0,gr0
- 4718: R_FRV_TLSDESC_VALUE \.tbss
- 471c: 00 00 10 11 add\.p sp,gr17,gr0
- 4720: 00 00 00 00 add\.p gr0,gr0,gr0
- 4720: R_FRV_TLSDESC_VALUE x
- 4724: 00 00 10 01 add\.p sp,sp,gr0
- 4728: 00 00 00 00 add\.p gr0,gr0,gr0
- 4728: R_FRV_TLSDESC_VALUE \.tbss
- 472c: 00 00 10 01 add\.p sp,sp,gr0
- 4730: 00 00 00 00 add\.p gr0,gr0,gr0
- 4730: R_FRV_TLSDESC_VALUE \.tbss
- 4734: 00 00 17 f1 \*unknown\*
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 11 add\.p sp,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f1 \*unknown\*
-00004738 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4744: 00 00 10 13 add\.p sp,gr19,gr0
- 4744: R_FRV_TLSOFF \.tbss
- 4748: 00 00 00 03 add\.p gr0,gr3,gr0
- 4748: R_FRV_TLSOFF x
- 474c: 00 00 10 03 add\.p sp,gr3,gr0
- 474c: R_FRV_TLSOFF x
- 4750: 00 01 00 11 add\.p gr16,gr17,gr0
- 4750: R_FRV_TLSOFF \.tbss
- 4754: 00 01 00 13 add\.p gr16,gr19,gr0
- 4754: R_FRV_TLSOFF \.tbss
- 4758: 00 01 00 03 add\.p gr16,gr3,gr0
- 4758: R_FRV_TLSOFF x
- 475c: 00 00 07 f1 \*unknown\*
- 475c: R_FRV_TLSOFF \.tbss
- 4760: 00 00 07 f3 \*unknown\*
- 4760: R_FRV_TLSOFF \.tbss
- 4764: 00 00 00 01 add\.p gr0,sp,gr0
- 4764: R_FRV_TLSOFF x
- 4768: 00 00 00 01 add\.p gr0,sp,gr0
- 4768: R_FRV_TLSOFF \.tbss
- 476c: 00 00 00 03 add\.p gr0,gr3,gr0
- 476c: R_FRV_TLSOFF \.tbss
- 4770: 00 00 17 f3 \*unknown\*
- 4770: R_FRV_TLSOFF \.tbss
- 4774: 00 00 10 03 add\.p sp,gr3,gr0
- 4774: R_FRV_TLSOFF \.tbss
- 4778: 00 01 07 f1 \*unknown\*
- 4778: R_FRV_TLSOFF \.tbss
- 477c: 00 01 07 f3 \*unknown\*
- 477c: R_FRV_TLSOFF \.tbss
- 4780: 00 01 00 01 add\.p gr16,sp,gr0
- 4780: R_FRV_TLSOFF x
- 4784: 00 01 00 01 add\.p gr16,sp,gr0
- 4784: R_FRV_TLSOFF \.tbss
- 4788: 00 01 00 03 add\.p gr16,gr3,gr0
- 4788: R_FRV_TLSOFF \.tbss
- 478c: 00 00 00 11 add\.p gr0,gr17,gr0
- 478c: R_FRV_TLSOFF \.tbss
- 4790: 00 00 00 13 add\.p gr0,gr19,gr0
- 4790: R_FRV_TLSOFF \.tbss
- 4794: 00 00 10 11 add\.p sp,gr17,gr0
- 4794: R_FRV_TLSOFF \.tbss
- 4798: 00 00 10 12 add\.p sp,gr18,gr0
- 4798: R_FRV_TLSOFF \.tbss
- 479c: 00 01 00 12 add\.p gr16,gr18,gr0
- 479c: R_FRV_TLSOFF \.tbss
- 47a0: 00 00 07 f2 \*unknown\*
- 47a0: R_FRV_TLSOFF \.tbss
- 47a4: 00 00 00 02 add\.p gr0,fp,gr0
- 47a4: R_FRV_TLSOFF x
- 47a8: 00 00 00 02 add\.p gr0,fp,gr0
- 47a8: R_FRV_TLSOFF \.tbss
- 47ac: 00 00 10 02 add\.p sp,fp,gr0
- 47ac: R_FRV_TLSOFF x
- 47b0: 00 00 10 01 add\.p sp,sp,gr0
- 47b0: R_FRV_TLSOFF \.tbss
- 47b4: 00 00 10 02 add\.p sp,fp,gr0
- 47b4: R_FRV_TLSOFF \.tbss
- 47b8: 00 00 17 f2 \*unknown\*
- 47b8: R_FRV_TLSOFF \.tbss
- 47bc: 00 01 07 f2 \*unknown\*
- 47bc: R_FRV_TLSOFF \.tbss
- 47c0: 00 01 00 02 add\.p gr16,fp,gr0
- 47c0: R_FRV_TLSOFF x
- 47c4: 00 01 00 02 add\.p gr16,fp,gr0
- 47c4: R_FRV_TLSOFF \.tbss
- 47c8: 00 00 00 12 add\.p gr0,gr18,gr0
- 47c8: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 13 add\.p sp,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 11 add\.p gr16,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 13 add\.p gr16,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 07 f1 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 17 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f1 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 11 add\.p gr0,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 13 add\.p gr0,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 11 add\.p sp,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 12 add\.p sp,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 12 add\.p gr16,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 17 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 12 add\.p gr0,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
diff --git a/ld/testsuite/ld-frv/tls-pie-1.d b/ld/testsuite/ld-frv/tls-pie-1.d
index 5e4b6a1..11654fc 100644
--- a/ld/testsuite/ld-frv/tls-pie-1.d
+++ b/ld/testsuite/ld-frv/tls-pie-1.d
@@ -7,65 +7,65 @@
Disassembly of section \.text:
-000003a0 <_start>:
- 3a0: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 3a4: 00 88 00 00 nop\.p
- 3a8: 80 88 00 00 nop
- 3ac: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 3b0: 80 88 00 00 nop
- 3b4: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 3b8: 80 88 00 00 nop
- 3bc: 80 88 00 00 nop
- 3c0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3c4: 00 88 00 00 nop\.p
- 3c8: 80 88 00 00 nop
- 3cc: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3d0: 80 88 00 00 nop
- 3d4: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 3d8: 80 88 00 00 nop
- 3dc: 80 88 00 00 nop
- 3e0: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 3e4: 00 88 00 00 nop\.p
- 3e8: 80 88 00 00 nop
- 3ec: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 3f0: 80 88 00 00 nop
- 3f4: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 3f8: 80 88 00 00 nop
- 3fc: 80 88 00 00 nop
- 400: 92 fc 00 00 setlos lo\(0x0\),gr9
- 404: 00 88 00 00 nop\.p
- 408: 80 88 00 00 nop
- 40c: 92 fc 00 00 setlos lo\(0x0\),gr9
- 410: 80 88 00 00 nop
- 414: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 418: 80 88 00 00 nop
- 41c: 80 88 00 00 nop
- 420: 00 88 00 00 nop\.p
- 424: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 428: 00 88 00 00 nop\.p
- 42c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 430: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 434: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 438: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 43c: 92 fc 00 00 setlos lo\(0x0\),gr9
- 440: 00 88 00 00 nop\.p
- 444: 80 88 00 00 nop
- 448: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 44c: 00 88 00 00 nop\.p
- 450: 80 88 00 00 nop
- 454: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 458: 00 88 00 00 nop\.p
- 45c: 80 88 00 00 nop
- 460: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 464: 00 88 00 00 nop\.p
- 468: 80 88 00 00 nop
- 46c: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-00004508 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4514: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
- 4518: 00 00 00 00 add\.p gr0,gr0,gr0
- 4518: R_FRV_TLSOFF x
- 451c: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
- 4520: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/tls-pie-3.d b/ld/testsuite/ld-frv/tls-pie-3.d
index 440002b..4783ce0 100644
--- a/ld/testsuite/ld-frv/tls-pie-3.d
+++ b/ld/testsuite/ld-frv/tls-pie-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-00000324 <_start>:
- 324: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 328: 00 88 00 00 nop\.p
- 32c: 80 88 00 00 nop
- 330: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 334: 80 88 00 00 nop
- 338: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 33c: 80 88 00 00 nop
- 340: 80 88 00 00 nop
- 344: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 348: 00 88 00 00 nop\.p
- 34c: 80 88 00 00 nop
- 350: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-000043d8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 43e4: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-1.d b/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
index 94fdb1b..7075a28 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
@@ -7,61 +7,61 @@
Disassembly of section \.text:
-000102c8 <_start>:
- 102c8: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102cc: 00 88 00 00 nop\.p
- 102d0: 80 88 00 00 nop
- 102d4: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102d8: 80 88 00 00 nop
- 102dc: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 102e0: 80 88 00 00 nop
- 102e4: 80 88 00 00 nop
- 102e8: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 102ec: 00 88 00 00 nop\.p
- 102f0: 80 88 00 00 nop
- 102f4: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 102f8: 80 88 00 00 nop
- 102fc: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 10300: 80 88 00 00 nop
- 10304: 80 88 00 00 nop
- 10308: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1030c: 00 88 00 00 nop\.p
- 10310: 80 88 00 00 nop
- 10314: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10318: 80 88 00 00 nop
- 1031c: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 10320: 80 88 00 00 nop
- 10324: 80 88 00 00 nop
- 10328: 92 fc 00 00 setlos lo\(0x0\),gr9
- 1032c: 00 88 00 00 nop\.p
- 10330: 80 88 00 00 nop
- 10334: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10338: 80 88 00 00 nop
- 1033c: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 10340: 80 88 00 00 nop
- 10344: 80 88 00 00 nop
- 10348: 00 88 00 00 nop\.p
- 1034c: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 10350: 00 88 00 00 nop\.p
- 10354: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10358: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 1035c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10360: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10364: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10368: 00 88 00 00 nop\.p
- 1036c: 80 88 00 00 nop
- 10370: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 10374: 00 88 00 00 nop\.p
- 10378: 80 88 00 00 nop
- 1037c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10380: 00 88 00 00 nop\.p
- 10384: 80 88 00 00 nop
- 10388: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1038c: 00 88 00 00 nop\.p
- 10390: 80 88 00 00 nop
- 10394: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-00014428 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14434: R_FRV_TLSOFF x
+[0-9a-f ]+: R_FRV_TLSOFF x
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-2.d b/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
index c8b35e0..84f322c 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
@@ -7,143 +7,143 @@
Disassembly of section \.text:
-00010308 <_start>:
- 10308: 92 fc f8 11 setlos 0xf*fffff811,gr9
- 1030c: 92 fc 08 11 setlos 0x811,gr9
- 10310: 92 c8 f0 2c ldi @\(gr15,44\),gr9
- 10314: 00 88 00 00 nop\.p
- 10318: 80 88 00 00 nop
- 1031c: 92 fc f8 12 setlos 0xf*fffff812,gr9
- 10320: 80 88 00 00 nop
- 10324: 00 88 00 00 nop\.p
- 10328: 80 88 00 00 nop
- 1032c: 92 fc 08 12 setlos 0x812,gr9
- 10330: 80 88 00 00 nop
- 10334: 00 88 00 00 nop\.p
- 10338: 80 88 00 00 nop
- 1033c: 92 f8 00 00 sethi hi\(0x0\),gr9
- 10340: 92 f4 f8 12 setlo 0xf812,gr9
- 10344: 12 fc f8 13 setlos\.p 0xf*fffff813,gr9
- 10348: 80 88 00 00 nop
- 1034c: 80 88 00 00 nop
- 10350: 12 fc 08 13 setlos\.p 0x813,gr9
- 10354: 80 88 00 00 nop
- 10358: 80 88 00 00 nop
- 1035c: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 10360: 80 88 00 00 nop
- 10364: 92 f4 f8 13 setlo 0xf813,gr9
- 10368: 80 88 00 00 nop
- 1036c: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 10370: 80 88 00 00 nop
- 10374: 92 fc 08 14 setlos 0x814,gr9
- 10378: 92 f8 00 00 sethi hi\(0x0\),gr9
- 1037c: 92 f4 f8 14 setlo 0xf814,gr9
- 10380: 92 fc f8 21 setlos 0xf*fffff821,gr9
- 10384: 92 fc 08 21 setlos 0x821,gr9
- 10388: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 1038c: 00 88 00 00 nop\.p
- 10390: 80 88 00 00 nop
- 10394: 92 fc f8 22 setlos 0xf*fffff822,gr9
- 10398: 80 88 00 00 nop
- 1039c: 00 88 00 00 nop\.p
- 103a0: 80 88 00 00 nop
- 103a4: 92 fc 08 22 setlos 0x822,gr9
- 103a8: 80 88 00 00 nop
- 103ac: 00 88 00 00 nop\.p
- 103b0: 80 88 00 00 nop
- 103b4: 92 f8 00 00 sethi hi\(0x0\),gr9
- 103b8: 92 f4 f8 22 setlo 0xf822,gr9
- 103bc: 12 fc f8 23 setlos\.p 0xf*fffff823,gr9
- 103c0: 80 88 00 00 nop
- 103c4: 80 88 00 00 nop
- 103c8: 12 fc 08 23 setlos\.p 0x823,gr9
- 103cc: 80 88 00 00 nop
- 103d0: 80 88 00 00 nop
- 103d4: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
- 103d8: 80 88 00 00 nop
- 103dc: 92 f4 f8 23 setlo 0xf823,gr9
- 103e0: 80 88 00 00 nop
- 103e4: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 103e8: 80 88 00 00 nop
- 103ec: 92 fc 08 24 setlos 0x824,gr9
- 103f0: 92 f8 00 00 sethi hi\(0x0\),gr9
- 103f4: 92 f4 f8 24 setlo 0xf824,gr9
- 103f8: 92 fc 00 01 setlos 0x1,gr9
- 103fc: 92 fc 10 01 setlos 0x1001,gr9
- 10400: 92 c8 f0 24 ldi @\(gr15,36\),gr9
- 10404: 00 88 00 00 nop\.p
- 10408: 80 88 00 00 nop
- 1040c: 92 fc 00 02 setlos 0x2,gr9
- 10410: 80 88 00 00 nop
- 10414: 00 88 00 00 nop\.p
- 10418: 80 88 00 00 nop
- 1041c: 92 fc 10 02 setlos 0x1002,gr9
- 10420: 80 88 00 00 nop
- 10424: 00 88 00 00 nop\.p
- 10428: 80 88 00 00 nop
- 1042c: 92 f8 00 01 sethi 0x1,gr9
- 10430: 92 f4 00 02 setlo 0x2,gr9
- 10434: 12 fc 00 03 setlos\.p 0x3,gr9
- 10438: 80 88 00 00 nop
- 1043c: 80 88 00 00 nop
- 10440: 12 fc 10 03 setlos\.p 0x1003,gr9
- 10444: 80 88 00 00 nop
- 10448: 80 88 00 00 nop
- 1044c: 12 f8 00 01 sethi\.p 0x1,gr9
- 10450: 80 88 00 00 nop
- 10454: 92 f4 00 03 setlo 0x3,gr9
- 10458: 80 88 00 00 nop
- 1045c: 92 fc 00 04 setlos 0x4,gr9
- 10460: 80 88 00 00 nop
- 10464: 92 fc 10 04 setlos 0x1004,gr9
- 10468: 92 f8 00 01 sethi 0x1,gr9
- 1046c: 92 f4 00 04 setlo 0x4,gr9
- 10470: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 10474: 92 c8 f0 1c ldi @\(gr15,28\),gr9
- 10478: 92 c8 f0 28 ldi @\(gr15,40\),gr9
- 1047c: 00 88 00 00 nop\.p
- 10480: 80 88 00 00 nop
- 10484: 92 c8 f0 38 ldi @\(gr15,56\),gr9
- 10488: 80 88 00 00 nop
- 1048c: 00 88 00 00 nop\.p
- 10490: 80 88 00 00 nop
- 10494: 92 c8 f0 34 ldi @\(gr15,52\),gr9
- 10498: 80 88 00 00 nop
- 1049c: 00 88 00 00 nop\.p
- 104a0: 80 88 00 00 nop
- 104a4: 92 c8 f0 30 ldi @\(gr15,48\),gr9
- 104a8: 80 88 00 00 nop
- 104ac: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 104b0: 80 88 00 00 nop
- 104b4: 80 88 00 00 nop
- 104b8: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 104bc: 80 88 00 00 nop
- 104c0: 80 88 00 00 nop
- 104c4: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
- 104c8: 80 88 00 00 nop
- 104cc: 80 88 00 00 nop
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 fc f8 11 setlos 0xf*fffff811,gr9
+[0-9a-f ]+: 92 fc 08 11 setlos 0x811,gr9
+[0-9a-f ]+: 92 c8 f0 2c ldi @\(gr15,44\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 12 setlos 0xf*fffff812,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 12 setlos 0x812,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 12 setlo 0xf812,gr9
+[0-9a-f ]+: 12 fc f8 13 setlos\.p 0xf*fffff813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 08 13 setlos\.p 0x813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 f8 13 setlo 0xf813,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: 92 fc f8 21 setlos 0xf*fffff821,gr9
+[0-9a-f ]+: 92 fc 08 21 setlos 0x821,gr9
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 22 setlos 0xf*fffff822,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 22 setlos 0x822,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 22 setlo 0xf822,gr9
+[0-9a-f ]+: 12 fc f8 23 setlos\.p 0xf*fffff823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 08 23 setlos\.p 0x823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 00 sethi\.p hi\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 f8 23 setlo 0xf823,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: 92 fc 00 01 setlos 0x1,gr9
+[0-9a-f ]+: 92 fc 10 01 setlos 0x1001,gr9
+[0-9a-f ]+: 92 c8 f0 24 ldi @\(gr15,36\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 02 setlos 0x2,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 02 setlos 0x1002,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 02 setlo 0x2,gr9
+[0-9a-f ]+: 12 fc 00 03 setlos\.p 0x3,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 10 03 setlos\.p 0x1003,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 f8 00 01 sethi\.p 0x1,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 f4 00 03 setlo 0x3,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 92 c8 f0 1c ldi @\(gr15,28\),gr9
+[0-9a-f ]+: 92 c8 f0 28 ldi @\(gr15,40\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 38 ldi @\(gr15,56\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 34 ldi @\(gr15,52\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 30 ldi @\(gr15,48\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
Disassembly of section \.got:
-00014568 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 14574: 00 00 00 03 add\.p gr0,gr3,gr0
- 14574: R_FRV_TLSOFF x
- 14578: 00 00 10 03 add\.p sp,gr3,gr0
- 14578: R_FRV_TLSOFF x
- 1457c: 00 00 f8 21 \*unknown\*
- 14580: 00 00 00 01 add\.p gr0,sp,gr0
- 14580: R_FRV_TLSOFF x
- 14584: 00 00 10 01 add\.p sp,sp,gr0
- 14584: R_FRV_TLSOFF x
- 14588: 00 01 00 03 add\.p gr16,gr3,gr0
- 14588: R_FRV_TLSOFF x
- 1458c: 00 01 00 01 add\.p gr16,sp,gr0
- 14590: 00 01 00 01 add\.p gr16,sp,gr0
- 14590: R_FRV_TLSOFF x
- 14594: 00 00 f8 11 \*unknown\*
- 14598: 00 01 00 02 add\.p gr16,fp,gr0
- 14598: R_FRV_TLSOFF x
- 1459c: 00 00 10 02 add\.p sp,fp,gr0
- 1459c: R_FRV_TLSOFF x
- 145a0: 00 00 00 02 add\.p gr0,fp,gr0
- 145a0: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 f8 21 \*unknown\*
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 f8 11 \*unknown\*
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-3.d b/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
index 0043319..6aa4fc7 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-00010294 <_start>:
- 10294: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 10298: 00 88 00 00 nop\.p
- 1029c: 80 88 00 00 nop
- 102a0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102a4: 80 88 00 00 nop
- 102a8: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 102ac: 80 88 00 00 nop
- 102b0: 80 88 00 00 nop
- 102b4: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 102b8: 00 88 00 00 nop\.p
- 102bc: 80 88 00 00 nop
- 102c0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-00014350 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 1435c: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d b/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
index 7911890..64ae61f 100644
--- a/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
@@ -8,207 +8,207 @@
Disassembly of section \.text:
-00000454 <_start>:
- 454: 92 c8 f0 34 ldi @\(gr15,52\),gr9
- 458: 92 c8 f0 44 ldi @\(gr15,68\),gr9
- 45c: 92 c8 f0 5c ldi @\(gr15,92\),gr9
- 460: 00 88 00 00 nop\.p
- 464: 80 88 00 00 nop
- 468: 92 c8 f0 7c ldi @\(gr15,124\),gr9
- 46c: 80 88 00 00 nop
- 470: 00 88 00 00 nop\.p
- 474: 80 88 00 00 nop
- 478: 92 c8 f0 84 ldi @\(gr15,132\),gr9
- 47c: 80 88 00 00 nop
- 480: 00 88 00 00 nop\.p
- 484: 80 88 00 00 nop
- 488: 92 c8 f0 94 ldi @\(gr15,148\),gr9
- 48c: 80 88 00 00 nop
- 490: 12 c8 f0 38 ldi\.p @\(gr15,56\),gr9
- 494: 80 88 00 00 nop
- 498: 80 88 00 00 nop
- 49c: 12 c8 f0 48 ldi\.p @\(gr15,72\),gr9
- 4a0: 80 88 00 00 nop
- 4a4: 80 88 00 00 nop
- 4a8: 12 c8 f0 60 ldi\.p @\(gr15,96\),gr9
- 4ac: 80 88 00 00 nop
- 4b0: 80 88 00 00 nop
- 4b4: 80 88 00 00 nop
- 4b8: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 4bc: 80 88 00 00 nop
- 4c0: 92 fc 08 14 setlos 0x814,gr9
- 4c4: 92 f8 00 00 sethi hi\(0x0\),gr9
- 4c8: 92 f4 f8 14 setlo 0xf814,gr9
- 4cc: 92 c8 f0 64 ldi @\(gr15,100\),gr9
- 4d0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 4d4: 92 c8 f0 1c ldi @\(gr15,28\),gr9
- 4d8: 00 88 00 00 nop\.p
- 4dc: 80 88 00 00 nop
- 4e0: 92 c8 f0 98 ldi @\(gr15,152\),gr9
- 4e4: 80 88 00 00 nop
- 4e8: 00 88 00 00 nop\.p
- 4ec: 80 88 00 00 nop
- 4f0: 92 c8 f0 6c ldi @\(gr15,108\),gr9
- 4f4: 80 88 00 00 nop
- 4f8: 00 88 00 00 nop\.p
- 4fc: 80 88 00 00 nop
- 500: 92 c8 f0 70 ldi @\(gr15,112\),gr9
- 504: 80 88 00 00 nop
- 508: 12 c8 f0 68 ldi\.p @\(gr15,104\),gr9
- 50c: 80 88 00 00 nop
- 510: 80 88 00 00 nop
- 514: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 518: 80 88 00 00 nop
- 51c: 80 88 00 00 nop
- 520: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
- 524: 80 88 00 00 nop
- 528: 80 88 00 00 nop
- 52c: 80 88 00 00 nop
- 530: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 534: 80 88 00 00 nop
- 538: 92 fc 08 24 setlos 0x824,gr9
- 53c: 92 f8 00 00 sethi hi\(0x0\),gr9
- 540: 92 f4 f8 24 setlo 0xf824,gr9
- 544: 92 c8 f0 28 ldi @\(gr15,40\),gr9
- 548: 92 c8 f0 4c ldi @\(gr15,76\),gr9
- 54c: 92 c8 f0 50 ldi @\(gr15,80\),gr9
- 550: 00 88 00 00 nop\.p
- 554: 80 88 00 00 nop
- 558: 92 c8 f0 74 ldi @\(gr15,116\),gr9
- 55c: 80 88 00 00 nop
- 560: 00 88 00 00 nop\.p
- 564: 80 88 00 00 nop
- 568: 92 c8 f0 88 ldi @\(gr15,136\),gr9
- 56c: 80 88 00 00 nop
- 570: 00 88 00 00 nop\.p
- 574: 80 88 00 00 nop
- 578: 92 c8 f0 8c ldi @\(gr15,140\),gr9
- 57c: 80 88 00 00 nop
- 580: 12 c8 f0 2c ldi\.p @\(gr15,44\),gr9
- 584: 80 88 00 00 nop
- 588: 80 88 00 00 nop
- 58c: 12 c8 f0 3c ldi\.p @\(gr15,60\),gr9
- 590: 80 88 00 00 nop
- 594: 80 88 00 00 nop
- 598: 12 c8 f0 54 ldi\.p @\(gr15,84\),gr9
- 59c: 80 88 00 00 nop
- 5a0: 80 88 00 00 nop
- 5a4: 80 88 00 00 nop
- 5a8: 92 fc 00 04 setlos 0x4,gr9
- 5ac: 80 88 00 00 nop
- 5b0: 92 fc 10 04 setlos 0x1004,gr9
- 5b4: 92 f8 00 01 sethi 0x1,gr9
- 5b8: 92 f4 00 04 setlo 0x4,gr9
- 5bc: 92 c8 f0 30 ldi @\(gr15,48\),gr9
- 5c0: 92 c8 f0 40 ldi @\(gr15,64\),gr9
- 5c4: 92 c8 f0 58 ldi @\(gr15,88\),gr9
- 5c8: 00 88 00 00 nop\.p
- 5cc: 80 88 00 00 nop
- 5d0: 92 c8 f0 78 ldi @\(gr15,120\),gr9
- 5d4: 80 88 00 00 nop
- 5d8: 00 88 00 00 nop\.p
- 5dc: 80 88 00 00 nop
- 5e0: 92 c8 f0 80 ldi @\(gr15,128\),gr9
- 5e4: 80 88 00 00 nop
- 5e8: 00 88 00 00 nop\.p
- 5ec: 80 88 00 00 nop
- 5f0: 92 c8 f0 90 ldi @\(gr15,144\),gr9
- 5f4: 80 88 00 00 nop
- 5f8: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
- 5fc: 80 88 00 00 nop
- 600: 80 88 00 00 nop
- 604: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
- 608: 80 88 00 00 nop
- 60c: 80 88 00 00 nop
- 610: 12 c8 f0 24 ldi\.p @\(gr15,36\),gr9
- 614: 80 88 00 00 nop
- 618: 80 88 00 00 nop
- 61c: 92 c8 f0 34 ldi @\(gr15,52\),gr9
- 620: 92 c8 f0 5c ldi @\(gr15,92\),gr9
- 624: 92 c8 f0 64 ldi @\(gr15,100\),gr9
- 628: 92 c8 f0 1c ldi @\(gr15,28\),gr9
- 62c: 92 c8 f0 28 ldi @\(gr15,40\),gr9
- 630: 92 c8 f0 50 ldi @\(gr15,80\),gr9
- 634: 92 c8 f0 30 ldi @\(gr15,48\),gr9
- 638: 92 c8 f0 58 ldi @\(gr15,88\),gr9
- 63c: 80 88 00 00 nop
- 640: 92 c8 f0 44 ldi @\(gr15,68\),gr9
- 644: 80 88 00 00 nop
- 648: 80 88 00 00 nop
- 64c: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 34 ldi @\(gr15,52\),gr9
+[0-9a-f ]+: 92 c8 f0 44 ldi @\(gr15,68\),gr9
+[0-9a-f ]+: 92 c8 f0 5c ldi @\(gr15,92\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 7c ldi @\(gr15,124\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 84 ldi @\(gr15,132\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 94 ldi @\(gr15,148\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 38 ldi\.p @\(gr15,56\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 48 ldi\.p @\(gr15,72\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 60 ldi\.p @\(gr15,96\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: 92 c8 f0 64 ldi @\(gr15,100\),gr9
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 92 c8 f0 1c ldi @\(gr15,28\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 98 ldi @\(gr15,152\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 6c ldi @\(gr15,108\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 70 ldi @\(gr15,112\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 68 ldi\.p @\(gr15,104\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 20 ldi\.p @\(gr15,32\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: 92 c8 f0 28 ldi @\(gr15,40\),gr9
+[0-9a-f ]+: 92 c8 f0 4c ldi @\(gr15,76\),gr9
+[0-9a-f ]+: 92 c8 f0 50 ldi @\(gr15,80\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 74 ldi @\(gr15,116\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 88 ldi @\(gr15,136\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 8c ldi @\(gr15,140\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 2c ldi\.p @\(gr15,44\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 3c ldi\.p @\(gr15,60\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 54 ldi\.p @\(gr15,84\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: 92 c8 f0 30 ldi @\(gr15,48\),gr9
+[0-9a-f ]+: 92 c8 f0 40 ldi @\(gr15,64\),gr9
+[0-9a-f ]+: 92 c8 f0 58 ldi @\(gr15,88\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 78 ldi @\(gr15,120\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 80 ldi @\(gr15,128\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 90 ldi @\(gr15,144\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 24 ldi\.p @\(gr15,36\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 34 ldi @\(gr15,52\),gr9
+[0-9a-f ]+: 92 c8 f0 5c ldi @\(gr15,92\),gr9
+[0-9a-f ]+: 92 c8 f0 64 ldi @\(gr15,100\),gr9
+[0-9a-f ]+: 92 c8 f0 1c ldi @\(gr15,28\),gr9
+[0-9a-f ]+: 92 c8 f0 28 ldi @\(gr15,40\),gr9
+[0-9a-f ]+: 92 c8 f0 50 ldi @\(gr15,80\),gr9
+[0-9a-f ]+: 92 c8 f0 30 ldi @\(gr15,48\),gr9
+[0-9a-f ]+: 92 c8 f0 58 ldi @\(gr15,88\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 44 ldi @\(gr15,68\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-000046e8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 46f4: 00 00 10 11 add\.p sp,gr17,gr0
- 46f4: R_FRV_TLSOFF \.tbss
- 46f8: 00 00 10 13 add\.p sp,gr19,gr0
- 46f8: R_FRV_TLSOFF \.tbss
- 46fc: 00 00 00 03 add\.p gr0,gr3,gr0
- 46fc: R_FRV_TLSOFF x
- 4700: 00 00 10 03 add\.p sp,gr3,gr0
- 4700: R_FRV_TLSOFF x
- 4704: 00 01 00 11 add\.p gr16,gr17,gr0
- 4704: R_FRV_TLSOFF \.tbss
- 4708: 00 01 00 13 add\.p gr16,gr19,gr0
- 4708: R_FRV_TLSOFF \.tbss
- 470c: 00 01 00 03 add\.p gr16,gr3,gr0
- 470c: R_FRV_TLSOFF x
- 4710: 00 00 07 f1 \*unknown\*
- 4710: R_FRV_TLSOFF \.tbss
- 4714: 00 00 07 f3 \*unknown\*
- 4714: R_FRV_TLSOFF \.tbss
- 4718: 00 00 00 01 add\.p gr0,sp,gr0
- 4718: R_FRV_TLSOFF x
- 471c: 00 00 00 01 add\.p gr0,sp,gr0
- 471c: R_FRV_TLSOFF \.tbss
- 4720: 00 00 00 03 add\.p gr0,gr3,gr0
- 4720: R_FRV_TLSOFF \.tbss
- 4724: 00 00 17 f3 \*unknown\*
- 4724: R_FRV_TLSOFF \.tbss
- 4728: 00 00 10 01 add\.p sp,sp,gr0
- 4728: R_FRV_TLSOFF x
- 472c: 00 00 10 01 add\.p sp,sp,gr0
- 472c: R_FRV_TLSOFF \.tbss
- 4730: 00 00 10 03 add\.p sp,gr3,gr0
- 4730: R_FRV_TLSOFF \.tbss
- 4734: 00 00 17 f1 \*unknown\*
- 4734: R_FRV_TLSOFF \.tbss
- 4738: 00 01 07 f1 \*unknown\*
- 4738: R_FRV_TLSOFF \.tbss
- 473c: 00 01 07 f3 \*unknown\*
- 473c: R_FRV_TLSOFF \.tbss
- 4740: 00 01 00 01 add\.p gr16,sp,gr0
- 4740: R_FRV_TLSOFF x
- 4744: 00 01 00 01 add\.p gr16,sp,gr0
- 4744: R_FRV_TLSOFF \.tbss
- 4748: 00 01 00 03 add\.p gr16,gr3,gr0
- 4748: R_FRV_TLSOFF \.tbss
- 474c: 00 00 00 11 add\.p gr0,gr17,gr0
- 474c: R_FRV_TLSOFF \.tbss
- 4750: 00 00 00 13 add\.p gr0,gr19,gr0
- 4750: R_FRV_TLSOFF \.tbss
- 4754: 00 00 10 12 add\.p sp,gr18,gr0
- 4754: R_FRV_TLSOFF \.tbss
- 4758: 00 01 00 12 add\.p gr16,gr18,gr0
- 4758: R_FRV_TLSOFF \.tbss
- 475c: 00 00 07 f2 \*unknown\*
- 475c: R_FRV_TLSOFF \.tbss
- 4760: 00 00 00 02 add\.p gr0,fp,gr0
- 4760: R_FRV_TLSOFF x
- 4764: 00 00 00 02 add\.p gr0,fp,gr0
- 4764: R_FRV_TLSOFF \.tbss
- 4768: 00 00 10 02 add\.p sp,fp,gr0
- 4768: R_FRV_TLSOFF x
- 476c: 00 00 10 02 add\.p sp,fp,gr0
- 476c: R_FRV_TLSOFF \.tbss
- 4770: 00 00 17 f2 \*unknown\*
- 4770: R_FRV_TLSOFF \.tbss
- 4774: 00 01 07 f2 \*unknown\*
- 4774: R_FRV_TLSOFF \.tbss
- 4778: 00 01 00 02 add\.p gr16,fp,gr0
- 4778: R_FRV_TLSOFF x
- 477c: 00 01 00 02 add\.p gr16,fp,gr0
- 477c: R_FRV_TLSOFF \.tbss
- 4780: 00 00 00 12 add\.p gr0,gr18,gr0
- 4780: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 11 add\.p sp,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 13 add\.p sp,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 11 add\.p gr16,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 13 add\.p gr16,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 07 f1 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 17 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 17 f1 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f1 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f3 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 11 add\.p gr0,gr17,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 13 add\.p gr0,gr19,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 12 add\.p sp,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 12 add\.p gr16,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 17 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 07 f2 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 12 add\.p gr0,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
diff --git a/ld/testsuite/ld-frv/tls-relax-pie-1.d b/ld/testsuite/ld-frv/tls-relax-pie-1.d
index 3979080..cc11443 100644
--- a/ld/testsuite/ld-frv/tls-relax-pie-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-pie-1.d
@@ -7,61 +7,61 @@
Disassembly of section \.text:
-000003a0 <_start>:
- 3a0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3a4: 00 88 00 00 nop\.p
- 3a8: 80 88 00 00 nop
- 3ac: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3b0: 80 88 00 00 nop
- 3b4: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 3b8: 80 88 00 00 nop
- 3bc: 80 88 00 00 nop
- 3c0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3c4: 00 88 00 00 nop\.p
- 3c8: 80 88 00 00 nop
- 3cc: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3d0: 80 88 00 00 nop
- 3d4: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 3d8: 80 88 00 00 nop
- 3dc: 80 88 00 00 nop
- 3e0: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 3e4: 00 88 00 00 nop\.p
- 3e8: 80 88 00 00 nop
- 3ec: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 3f0: 80 88 00 00 nop
- 3f4: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 3f8: 80 88 00 00 nop
- 3fc: 80 88 00 00 nop
- 400: 92 fc 00 00 setlos lo\(0x0\),gr9
- 404: 00 88 00 00 nop\.p
- 408: 80 88 00 00 nop
- 40c: 92 fc 00 00 setlos lo\(0x0\),gr9
- 410: 80 88 00 00 nop
- 414: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 418: 80 88 00 00 nop
- 41c: 80 88 00 00 nop
- 420: 00 88 00 00 nop\.p
- 424: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 428: 00 88 00 00 nop\.p
- 42c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 430: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 434: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 438: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 43c: 92 fc 00 00 setlos lo\(0x0\),gr9
- 440: 00 88 00 00 nop\.p
- 444: 80 88 00 00 nop
- 448: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 44c: 00 88 00 00 nop\.p
- 450: 80 88 00 00 nop
- 454: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 458: 00 88 00 00 nop\.p
- 45c: 80 88 00 00 nop
- 460: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 464: 00 88 00 00 nop\.p
- 468: 80 88 00 00 nop
- 46c: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-00004508 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4514: R_FRV_TLSOFF x
+[0-9a-f ]+: R_FRV_TLSOFF x
diff --git a/ld/testsuite/ld-frv/tls-relax-pie-3.d b/ld/testsuite/ld-frv/tls-relax-pie-3.d
index e83d317..4bc5291 100644
--- a/ld/testsuite/ld-frv/tls-relax-pie-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-pie-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-00000324 <_start>:
- 324: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 328: 00 88 00 00 nop\.p
- 32c: 80 88 00 00 nop
- 330: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 334: 80 88 00 00 nop
- 338: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 33c: 80 88 00 00 nop
- 340: 80 88 00 00 nop
- 344: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 348: 00 88 00 00 nop\.p
- 34c: 80 88 00 00 nop
- 350: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-000043d8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 43e4: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-1.d b/ld/testsuite/ld-frv/tls-relax-shared-1.d
index 6aafd23..35d5c67 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-1.d
@@ -7,67 +7,67 @@
Disassembly of section \.text:
-00000354 <_start>:
- 354: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 358: 00 88 00 00 nop\.p
- 35c: 80 88 00 00 nop
- 360: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 364: 80 88 00 00 nop
- 368: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 36c: 80 88 00 00 nop
- 370: 80 88 00 00 nop
- 374: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 378: 00 88 00 00 nop\.p
- 37c: 80 88 00 00 nop
- 380: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 384: 80 88 00 00 nop
- 388: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
- 38c: 80 88 00 00 nop
- 390: 80 88 00 00 nop
- 394: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 398: 00 88 00 00 nop\.p
- 39c: 80 88 00 00 nop
- 3a0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3a4: 80 88 00 00 nop
- 3a8: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 3ac: 80 88 00 00 nop
- 3b0: 80 88 00 00 nop
- 3b4: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3b8: 00 88 00 00 nop\.p
- 3bc: 80 88 00 00 nop
- 3c0: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3c4: 80 88 00 00 nop
- 3c8: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
- 3cc: 80 88 00 00 nop
- 3d0: 80 88 00 00 nop
- 3d4: 00 88 00 00 nop\.p
- 3d8: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 3dc: 00 88 00 00 nop\.p
- 3e0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3e4: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 3e8: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 3ec: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3f0: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3f4: 00 88 00 00 nop\.p
- 3f8: 80 88 00 00 nop
- 3fc: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 400: 00 88 00 00 nop\.p
- 404: 80 88 00 00 nop
- 408: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 40c: 00 88 00 00 nop\.p
- 410: 80 88 00 00 nop
- 414: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 418: 00 88 00 00 nop\.p
- 41c: 80 88 00 00 nop
- 420: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
Disassembly of section \.got:
-000044b8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 44c4: 00 00 00 10 add\.p gr0,gr16,gr0
- 44c4: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
\.\.\.
- 44c8: R_FRV_TLSOFF x
- 44cc: R_FRV_TLSOFF \.tbss
- 44d0: 00 00 07 f0 \*unknown\*
- 44d0: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f0 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-2.d b/ld/testsuite/ld-frv/tls-relax-shared-2.d
index 49cfea7..e7ac840 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-2.d
@@ -7,258 +7,258 @@
Disassembly of section \.plt:
-00000454 <\.plt>:
- 454: 90 cc f0 10 lddi @\(gr15,16\),gr8
- 458: 80 30 80 00 jmpl @\(gr8,gr0\)
- 45c: 90 cc f0 30 lddi @\(gr15,48\),gr8
- 460: 80 30 80 00 jmpl @\(gr8,gr0\)
- 464: 90 cc f0 40 lddi @\(gr15,64\),gr8
- 468: 80 30 80 00 jmpl @\(gr8,gr0\)
- 46c: 90 cc f0 50 lddi @\(gr15,80\),gr8
- 470: 80 30 80 00 jmpl @\(gr8,gr0\)
- 474: 90 cc f0 58 lddi @\(gr15,88\),gr8
- 478: 80 30 80 00 jmpl @\(gr8,gr0\)
- 47c: 90 cc f0 68 lddi @\(gr15,104\),gr8
- 480: 80 30 80 00 jmpl @\(gr8,gr0\)
- 484: 90 cc ff a8 lddi @\(gr15,-88\),gr8
- 488: 80 30 80 00 jmpl @\(gr8,gr0\)
- 48c: 90 cc ff b0 lddi @\(gr15,-80\),gr8
- 490: 80 30 80 00 jmpl @\(gr8,gr0\)
- 494: 90 cc ff c8 lddi @\(gr15,-56\),gr8
- 498: 80 30 80 00 jmpl @\(gr8,gr0\)
- 49c: 90 cc ff d8 lddi @\(gr15,-40\),gr8
- 4a0: 80 30 80 00 jmpl @\(gr8,gr0\)
- 4a4: 90 cc ff e0 lddi @\(gr15,-32\),gr8
- 4a8: 80 30 80 00 jmpl @\(gr8,gr0\)
- 4ac: 90 cc ff f0 lddi @\(gr15,-16\),gr8
- 4b0: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 90 cc f0 10 lddi @\(gr15,16\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 30 lddi @\(gr15,48\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 40 lddi @\(gr15,64\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 50 lddi @\(gr15,80\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 58 lddi @\(gr15,88\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 68 lddi @\(gr15,104\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff a8 lddi @\(gr15,-88\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff b0 lddi @\(gr15,-80\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff c8 lddi @\(gr15,-56\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff d8 lddi @\(gr15,-40\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff e0 lddi @\(gr15,-32\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff f0 lddi @\(gr15,-16\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
Disassembly of section \.text:
-000004b4 <_start>:
- 4b4: fe 3f ff f0 call 474 <i\+0x464>
- 4b8: fe 3f ff f5 call 48c <i\+0x47c>
- 4bc: fe 3f ff fa call 4a4 <i\+0x494>
- 4c0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4c4: 9c f4 00 98 setlo 0x98,gr14
- 4c8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4cc: 82 30 80 00 calll @\(gr8,gr0\)
- 4d0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4d4: 9c f4 00 a8 setlo 0xa8,gr14
- 4d8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4dc: 82 30 80 00 calll @\(gr8,gr0\)
- 4e0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4e4: 9c f4 00 c0 setlo 0xc0,gr14
- 4e8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4ec: 82 30 80 00 calll @\(gr8,gr0\)
- 4f0: 10 cc f0 60 lddi\.p @\(gr15,96\),gr8
- 4f4: 9c fc 00 60 setlos 0x60,gr14
- 4f8: 82 30 80 00 calll @\(gr8,gr0\)
- 4fc: 10 cc ff b8 lddi\.p @\(gr15,-72\),gr8
- 500: 9c fc ff b8 setlos 0xf*ffffffb8,gr14
- 504: 82 30 80 00 calll @\(gr8,gr0\)
- 508: 10 cc ff e8 lddi\.p @\(gr15,-24\),gr8
- 50c: 9c fc ff e8 setlos 0xf*ffffffe8,gr14
- 510: 82 30 80 00 calll @\(gr8,gr0\)
- 514: 80 88 00 00 nop
- 518: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 51c: 80 88 00 00 nop
- 520: 92 fc 08 14 setlos 0x814,gr9
- 524: 92 f8 00 00 sethi hi\(0x0\),gr9
- 528: 92 f4 f8 14 setlo 0xf814,gr9
- 52c: fe 3f ff e0 call 4ac <i\+0x49c>
- 530: fe 3f ff c9 call 454 <i\+0x444>
- 534: fe 3f ff ca call 45c <i\+0x44c>
- 538: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 53c: 9c f4 00 c8 setlo 0xc8,gr14
- 540: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 544: 82 30 80 00 calll @\(gr8,gr0\)
- 548: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 54c: 9c f4 00 78 setlo 0x78,gr14
- 550: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 554: 82 30 80 00 calll @\(gr8,gr0\)
- 558: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 55c: 9c f4 00 88 setlo 0x88,gr14
- 560: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 564: 82 30 80 00 calll @\(gr8,gr0\)
- 568: 10 cc ff f8 lddi\.p @\(gr15,-8\),gr8
- 56c: 9c fc ff f8 setlos 0xf*fffffff8,gr14
- 570: 82 30 80 00 calll @\(gr8,gr0\)
- 574: 10 cc f0 18 lddi\.p @\(gr15,24\),gr8
- 578: 9c fc 00 18 setlos 0x18,gr14
- 57c: 82 30 80 00 calll @\(gr8,gr0\)
- 580: 10 cc f0 38 lddi\.p @\(gr15,56\),gr8
- 584: 9c fc 00 38 setlos 0x38,gr14
- 588: 82 30 80 00 calll @\(gr8,gr0\)
- 58c: 80 88 00 00 nop
- 590: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 594: 80 88 00 00 nop
- 598: 92 fc 08 24 setlos 0x824,gr9
- 59c: 92 f8 00 00 sethi hi\(0x0\),gr9
- 5a0: 92 f4 f8 24 setlo 0xf824,gr9
- 5a4: fe 3f ff b0 call 464 <i\+0x454>
- 5a8: fe 3f ff b5 call 47c <i\+0x46c>
- 5ac: fe 3f ff ba call 494 <i\+0x484>
- 5b0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5b4: 9c f4 00 90 setlo 0x90,gr14
- 5b8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5bc: 82 30 80 00 calll @\(gr8,gr0\)
- 5c0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5c4: 9c f4 00 a0 setlo 0xa0,gr14
- 5c8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5cc: 82 30 80 00 calll @\(gr8,gr0\)
- 5d0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5d4: 9c f4 00 b8 setlo 0xb8,gr14
- 5d8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5dc: 82 30 80 00 calll @\(gr8,gr0\)
- 5e0: 10 cc f0 48 lddi\.p @\(gr15,72\),gr8
- 5e4: 9c fc 00 48 setlos 0x48,gr14
- 5e8: 82 30 80 00 calll @\(gr8,gr0\)
- 5ec: 10 cc ff a0 lddi\.p @\(gr15,-96\),gr8
- 5f0: 9c fc ff a0 setlos 0xf*ffffffa0,gr14
- 5f4: 82 30 80 00 calll @\(gr8,gr0\)
- 5f8: 10 cc ff d0 lddi\.p @\(gr15,-48\),gr8
- 5fc: 9c fc ff d0 setlos 0xf*ffffffd0,gr14
- 600: 82 30 80 00 calll @\(gr8,gr0\)
- 604: 80 88 00 00 nop
- 608: 92 fc 00 04 setlos 0x4,gr9
- 60c: 80 88 00 00 nop
- 610: 92 fc 10 04 setlos 0x1004,gr9
- 614: 92 f8 00 01 sethi 0x1,gr9
- 618: 92 f4 00 04 setlo 0x4,gr9
- 61c: fe 3f ff 94 call 46c <i\+0x45c>
- 620: fe 3f ff 99 call 484 <i\+0x474>
- 624: fe 3f ff 9e call 49c <i\+0x48c>
- 628: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 62c: 9c f4 00 b0 setlo 0xb0,gr14
- 630: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 634: 82 30 80 00 calll @\(gr8,gr0\)
- 638: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 63c: 9c f4 00 80 setlo 0x80,gr14
- 640: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 644: 82 30 80 00 calll @\(gr8,gr0\)
- 648: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 64c: 9c f4 00 70 setlo 0x70,gr14
- 650: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 654: 82 30 80 00 calll @\(gr8,gr0\)
- 658: 10 cc f0 20 lddi\.p @\(gr15,32\),gr8
- 65c: 9c fc 00 20 setlos 0x20,gr14
- 660: 82 30 80 00 calll @\(gr8,gr0\)
- 664: 10 cc f0 28 lddi\.p @\(gr15,40\),gr8
- 668: 9c fc 00 28 setlos 0x28,gr14
- 66c: 82 30 80 00 calll @\(gr8,gr0\)
- 670: 10 cc ff c0 lddi\.p @\(gr15,-64\),gr8
- 674: 9c fc ff c0 setlos 0xf*ffffffc0,gr14
- 678: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: fe 3f ff f0 call .*
+[0-9a-f ]+: fe 3f ff f5 call .*
+[0-9a-f ]+: fe 3f ff fa call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 98 setlo 0x98,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 a8 setlo 0xa8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 c0 setlo 0xc0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 60 lddi\.p @\(gr15,96\),gr8
+[0-9a-f ]+: 9c fc 00 60 setlos 0x60,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff b8 lddi\.p @\(gr15,-72\),gr8
+[0-9a-f ]+: 9c fc ff b8 setlos 0xf*ffffffb8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff e8 lddi\.p @\(gr15,-24\),gr8
+[0-9a-f ]+: 9c fc ff e8 setlos 0xf*ffffffe8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: fe 3f ff e0 call .*
+[0-9a-f ]+: fe 3f ff c9 call .*
+[0-9a-f ]+: fe 3f ff ca call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 c8 setlo 0xc8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 78 setlo 0x78,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 88 setlo 0x88,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff f8 lddi\.p @\(gr15,-8\),gr8
+[0-9a-f ]+: 9c fc ff f8 setlos 0xf*fffffff8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 18 lddi\.p @\(gr15,24\),gr8
+[0-9a-f ]+: 9c fc 00 18 setlos 0x18,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 38 lddi\.p @\(gr15,56\),gr8
+[0-9a-f ]+: 9c fc 00 38 setlos 0x38,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: fe 3f ff b0 call .*
+[0-9a-f ]+: fe 3f ff b5 call .*
+[0-9a-f ]+: fe 3f ff ba call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 90 setlo 0x90,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 a0 setlo 0xa0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 b8 setlo 0xb8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 48 lddi\.p @\(gr15,72\),gr8
+[0-9a-f ]+: 9c fc 00 48 setlos 0x48,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff a0 lddi\.p @\(gr15,-96\),gr8
+[0-9a-f ]+: 9c fc ff a0 setlos 0xf*ffffffa0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff d0 lddi\.p @\(gr15,-48\),gr8
+[0-9a-f ]+: 9c fc ff d0 setlos 0xf*ffffffd0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: fe 3f ff 94 call .*
+[0-9a-f ]+: fe 3f ff 99 call .*
+[0-9a-f ]+: fe 3f ff 9e call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 b0 setlo 0xb0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 80 setlo 0x80,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 70 setlo 0x70,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 20 lddi\.p @\(gr15,32\),gr8
+[0-9a-f ]+: 9c fc 00 20 setlos 0x20,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 28 lddi\.p @\(gr15,40\),gr8
+[0-9a-f ]+: 9c fc 00 28 setlos 0x28,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff c0 lddi\.p @\(gr15,-64\),gr8
+[0-9a-f ]+: 9c fc ff c0 setlos 0xf*ffffffc0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
Disassembly of section \.got:
-00004700 <_GLOBAL_OFFSET_TABLE_-0x60>:
- 4700: 00 00 00 00 add\.p gr0,gr0,gr0
- 4700: R_FRV_TLSDESC_VALUE \.tbss
- 4704: 00 00 17 f3 \*unknown\*
- 4708: 00 00 00 00 add\.p gr0,gr0,gr0
- 4708: R_FRV_TLSDESC_VALUE x
- 470c: 00 00 10 01 add\.p sp,sp,gr0
- 4710: 00 00 00 00 add\.p gr0,gr0,gr0
- 4710: R_FRV_TLSDESC_VALUE \.tbss
- 4714: 00 00 10 01 add\.p sp,sp,gr0
- 4718: 00 00 00 00 add\.p gr0,gr0,gr0
- 4718: R_FRV_TLSDESC_VALUE \.tbss
- 471c: 00 00 10 03 add\.p sp,gr3,gr0
- 4720: 00 00 00 00 add\.p gr0,gr0,gr0
- 4720: R_FRV_TLSDESC_VALUE x
- 4724: 00 01 00 03 add\.p gr16,gr3,gr0
- 4728: 00 00 00 00 add\.p gr0,gr0,gr0
- 4728: R_FRV_TLSDESC_VALUE \.tbss
- 472c: 00 01 07 f1 \*unknown\*
- 4730: 00 00 00 00 add\.p gr0,gr0,gr0
- 4730: R_FRV_TLSDESC_VALUE \.tbss
- 4734: 00 01 07 f3 \*unknown\*
- 4738: 00 00 00 00 add\.p gr0,gr0,gr0
- 4738: R_FRV_TLSDESC_VALUE x
- 473c: 00 01 00 01 add\.p gr16,sp,gr0
- 4740: 00 00 00 00 add\.p gr0,gr0,gr0
- 4740: R_FRV_TLSDESC_VALUE \.tbss
- 4744: 00 01 00 01 add\.p gr16,sp,gr0
- 4748: 00 00 00 00 add\.p gr0,gr0,gr0
- 4748: R_FRV_TLSDESC_VALUE \.tbss
- 474c: 00 01 00 03 add\.p gr16,gr3,gr0
- 4750: 00 00 00 00 add\.p gr0,gr0,gr0
- 4750: R_FRV_TLSDESC_VALUE \.tbss
- 4754: 00 00 00 11 add\.p gr0,gr17,gr0
- 4758: 00 00 00 00 add\.p gr0,gr0,gr0
- 4758: R_FRV_TLSDESC_VALUE \.tbss
- 475c: 00 00 00 13 add\.p gr0,gr19,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 11 add\.p gr0,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 13 add\.p gr0,gr19,gr0
-00004760 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4770: R_FRV_TLSDESC_VALUE \.tbss
- 4774: 00 00 10 11 add\.p sp,gr17,gr0
- 4778: 00 00 00 00 add\.p gr0,gr0,gr0
- 4778: R_FRV_TLSDESC_VALUE \.tbss
- 477c: 00 00 10 13 add\.p sp,gr19,gr0
- 4780: 00 00 00 00 add\.p gr0,gr0,gr0
- 4780: R_FRV_TLSDESC_VALUE x
- 4784: 00 00 00 03 add\.p gr0,gr3,gr0
- 4788: 00 00 00 00 add\.p gr0,gr0,gr0
- 4788: R_FRV_TLSDESC_VALUE x
- 478c: 00 00 10 03 add\.p sp,gr3,gr0
- 4790: 00 00 00 00 add\.p gr0,gr0,gr0
- 4790: R_FRV_TLSDESC_VALUE \.tbss
- 4794: 00 01 00 11 add\.p gr16,gr17,gr0
- 4798: 00 00 00 00 add\.p gr0,gr0,gr0
- 4798: R_FRV_TLSDESC_VALUE \.tbss
- 479c: 00 01 00 13 add\.p gr16,gr19,gr0
- 47a0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47a0: R_FRV_TLSDESC_VALUE \.tbss
- 47a4: 00 00 07 f1 \*unknown\*
- 47a8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47a8: R_FRV_TLSDESC_VALUE \.tbss
- 47ac: 00 00 07 f3 \*unknown\*
- 47b0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47b0: R_FRV_TLSDESC_VALUE x
- 47b4: 00 00 00 01 add\.p gr0,sp,gr0
- 47b8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47b8: R_FRV_TLSDESC_VALUE \.tbss
- 47bc: 00 00 00 01 add\.p gr0,sp,gr0
- 47c0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47c0: R_FRV_TLSDESC_VALUE \.tbss
- 47c4: 00 00 00 03 add\.p gr0,gr3,gr0
- 47c8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47c8: R_FRV_TLSDESC_VALUE \.tbss
- 47cc: 00 00 17 f1 \*unknown\*
- 47d0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47d0: R_FRV_TLSDESC_VALUE x
- 47d4: 00 01 00 02 add\.p gr16,fp,gr0
- 47d8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47d8: R_FRV_TLSDESC_VALUE \.tbss
- 47dc: 00 00 10 12 add\.p sp,gr18,gr0
- 47e0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47e0: R_FRV_TLSDESC_VALUE x
- 47e4: 00 00 10 02 add\.p sp,fp,gr0
- 47e8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47e8: R_FRV_TLSDESC_VALUE \.tbss
- 47ec: 00 01 00 12 add\.p gr16,gr18,gr0
- 47f0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47f0: R_FRV_TLSDESC_VALUE \.tbss
- 47f4: 00 00 07 f2 \*unknown\*
- 47f8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47f8: R_FRV_TLSDESC_VALUE \.tbss
- 47fc: 00 00 00 02 add\.p gr0,fp,gr0
- 4800: 00 00 00 00 add\.p gr0,gr0,gr0
- 4800: R_FRV_TLSDESC_VALUE \.tbss
- 4804: 00 00 17 f2 \*unknown\*
- 4808: 00 00 00 00 add\.p gr0,gr0,gr0
- 4808: R_FRV_TLSDESC_VALUE \.tbss
- 480c: 00 00 10 02 add\.p sp,fp,gr0
- 4810: 00 00 00 00 add\.p gr0,gr0,gr0
- 4810: R_FRV_TLSDESC_VALUE x
- 4814: 00 00 00 02 add\.p gr0,fp,gr0
- 4818: 00 00 00 00 add\.p gr0,gr0,gr0
- 4818: R_FRV_TLSDESC_VALUE \.tbss
- 481c: 00 01 07 f2 \*unknown\*
- 4820: 00 00 00 00 add\.p gr0,gr0,gr0
- 4820: R_FRV_TLSDESC_VALUE \.tbss
- 4824: 00 01 00 02 add\.p gr16,fp,gr0
- 4828: 00 00 00 00 add\.p gr0,gr0,gr0
- 4828: R_FRV_TLSDESC_VALUE \.tbss
- 482c: 00 00 00 12 add\.p gr0,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 11 add\.p sp,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 13 add\.p sp,gr19,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 11 add\.p gr16,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 13 add\.p gr16,gr19,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 12 add\.p sp,gr18,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 12 add\.p gr16,gr18,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 12 add\.p gr0,gr18,gr0
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-3.d b/ld/testsuite/ld-frv/tls-relax-shared-3.d
index 216e4ff..48909d5 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-000002f4 <_start>:
- 2f4: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 2f8: 00 88 00 00 nop\.p
- 2fc: 80 88 00 00 nop
- 300: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 304: 80 88 00 00 nop
- 308: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 30c: 80 88 00 00 nop
- 310: 80 88 00 00 nop
- 314: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 318: 00 88 00 00 nop\.p
- 31c: 80 88 00 00 nop
- 320: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-000043a8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 43b4: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-relax-static-1.d b/ld/testsuite/ld-frv/tls-relax-static-1.d
index 45038e7..d87d22c 100644
--- a/ld/testsuite/ld-frv/tls-relax-static-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-static-1.d
@@ -7,56 +7,56 @@
Disassembly of section \.text:
-000100b4 <_start>:
- 100b4: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 100b8: 00 88 00 00 nop\.p
- 100bc: 80 88 00 00 nop
- 100c0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 100c4: 80 88 00 00 nop
- 100c8: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 100cc: 80 88 00 00 nop
- 100d0: 80 88 00 00 nop
- 100d4: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 100d8: 00 88 00 00 nop\.p
- 100dc: 80 88 00 00 nop
- 100e0: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 100e4: 80 88 00 00 nop
- 100e8: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 100ec: 80 88 00 00 nop
- 100f0: 80 88 00 00 nop
- 100f4: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 100f8: 00 88 00 00 nop\.p
- 100fc: 80 88 00 00 nop
- 10100: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10104: 80 88 00 00 nop
- 10108: 12 fc f8 30 setlos\.p 0xf*fffff830,gr9
- 1010c: 80 88 00 00 nop
- 10110: 80 88 00 00 nop
- 10114: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10118: 00 88 00 00 nop\.p
- 1011c: 80 88 00 00 nop
- 10120: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10124: 80 88 00 00 nop
- 10128: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 1012c: 80 88 00 00 nop
- 10130: 80 88 00 00 nop
- 10134: 00 88 00 00 nop\.p
- 10138: 90 fc f8 30 setlos 0xf*fffff830,gr8
- 1013c: 00 88 00 00 nop\.p
- 10140: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10144: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10148: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1014c: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10150: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10154: 00 88 00 00 nop\.p
- 10158: 80 88 00 00 nop
- 1015c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10160: 00 88 00 00 nop\.p
- 10164: 80 88 00 00 nop
- 10168: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1016c: 00 88 00 00 nop\.p
- 10170: 80 88 00 00 nop
- 10174: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10178: 00 88 00 00 nop\.p
- 1017c: 80 88 00 00 nop
- 10180: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 30 setlos\.p 0xf*fffff830,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 30 setlos 0xf*fffff830,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
diff --git a/ld/testsuite/ld-frv/tls-shared-1.d b/ld/testsuite/ld-frv/tls-shared-1.d
index aabd072..03fe411 100644
--- a/ld/testsuite/ld-frv/tls-shared-1.d
+++ b/ld/testsuite/ld-frv/tls-shared-1.d
@@ -7,67 +7,67 @@
Disassembly of section \.text:
-00000354 <_start>:
- 354: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 358: 00 88 00 00 nop\.p
- 35c: 80 88 00 00 nop
- 360: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 364: 80 88 00 00 nop
- 368: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
- 36c: 80 88 00 00 nop
- 370: 80 88 00 00 nop
- 374: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 378: 00 88 00 00 nop\.p
- 37c: 80 88 00 00 nop
- 380: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 384: 80 88 00 00 nop
- 388: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
- 38c: 80 88 00 00 nop
- 390: 80 88 00 00 nop
- 394: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 398: 00 88 00 00 nop\.p
- 39c: 80 88 00 00 nop
- 3a0: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3a4: 80 88 00 00 nop
- 3a8: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 3ac: 80 88 00 00 nop
- 3b0: 80 88 00 00 nop
- 3b4: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3b8: 00 88 00 00 nop\.p
- 3bc: 80 88 00 00 nop
- 3c0: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3c4: 80 88 00 00 nop
- 3c8: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
- 3cc: 80 88 00 00 nop
- 3d0: 80 88 00 00 nop
- 3d4: 00 88 00 00 nop\.p
- 3d8: 90 fc f8 20 setlos 0xf*fffff820,gr8
- 3dc: 00 88 00 00 nop\.p
- 3e0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 3e4: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 3e8: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 3ec: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 3f0: 92 c8 f0 18 ldi @\(gr15,24\),gr9
- 3f4: 00 88 00 00 nop\.p
- 3f8: 80 88 00 00 nop
- 3fc: 92 c8 f0 10 ldi @\(gr15,16\),gr9
- 400: 00 88 00 00 nop\.p
- 404: 80 88 00 00 nop
- 408: 92 c8 f0 14 ldi @\(gr15,20\),gr9
- 40c: 00 88 00 00 nop\.p
- 410: 80 88 00 00 nop
- 414: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 418: 00 88 00 00 nop\.p
- 41c: 80 88 00 00 nop
- 420: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 10 ldi\.p @\(gr15,16\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 14 ldi\.p @\(gr15,20\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 18 ldi\.p @\(gr15,24\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 20 setlos 0xf*fffff820,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 10 ldi @\(gr15,16\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 14 ldi @\(gr15,20\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 18 ldi @\(gr15,24\),gr9
Disassembly of section \.got:
-000044b8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 44c4: 00 00 00 10 add\.p gr0,gr16,gr0
- 44c4: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 00 10 add\.p gr0,gr16,gr0
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
\.\.\.
- 44c8: R_FRV_TLSOFF x
- 44cc: R_FRV_TLSOFF \.tbss
- 44d0: 00 00 07 f0 \*unknown\*
- 44d0: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: R_FRV_TLSOFF x
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
+[0-9a-f ]+: 00 00 07 f0 \*unknown\*
+[0-9a-f ]+: R_FRV_TLSOFF \.tbss
diff --git a/ld/testsuite/ld-frv/tls-shared-2.d b/ld/testsuite/ld-frv/tls-shared-2.d
index 14d8462..b622ad4 100644
--- a/ld/testsuite/ld-frv/tls-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-shared-2.d
@@ -7,258 +7,258 @@
Disassembly of section \.plt:
-00000454 <\.plt>:
- 454: 90 cc f0 10 lddi @\(gr15,16\),gr8
- 458: 80 30 80 00 jmpl @\(gr8,gr0\)
- 45c: 90 cc f0 30 lddi @\(gr15,48\),gr8
- 460: 80 30 80 00 jmpl @\(gr8,gr0\)
- 464: 90 cc f0 40 lddi @\(gr15,64\),gr8
- 468: 80 30 80 00 jmpl @\(gr8,gr0\)
- 46c: 90 cc f0 50 lddi @\(gr15,80\),gr8
- 470: 80 30 80 00 jmpl @\(gr8,gr0\)
- 474: 90 cc f0 58 lddi @\(gr15,88\),gr8
- 478: 80 30 80 00 jmpl @\(gr8,gr0\)
- 47c: 90 cc f0 68 lddi @\(gr15,104\),gr8
- 480: 80 30 80 00 jmpl @\(gr8,gr0\)
- 484: 90 cc ff a8 lddi @\(gr15,-88\),gr8
- 488: 80 30 80 00 jmpl @\(gr8,gr0\)
- 48c: 90 cc ff b0 lddi @\(gr15,-80\),gr8
- 490: 80 30 80 00 jmpl @\(gr8,gr0\)
- 494: 90 cc ff c8 lddi @\(gr15,-56\),gr8
- 498: 80 30 80 00 jmpl @\(gr8,gr0\)
- 49c: 90 cc ff d8 lddi @\(gr15,-40\),gr8
- 4a0: 80 30 80 00 jmpl @\(gr8,gr0\)
- 4a4: 90 cc ff e0 lddi @\(gr15,-32\),gr8
- 4a8: 80 30 80 00 jmpl @\(gr8,gr0\)
- 4ac: 90 cc ff f0 lddi @\(gr15,-16\),gr8
- 4b0: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+<\.plt>:
+[0-9a-f ]+: 90 cc f0 10 lddi @\(gr15,16\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 30 lddi @\(gr15,48\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 40 lddi @\(gr15,64\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 50 lddi @\(gr15,80\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 58 lddi @\(gr15,88\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc f0 68 lddi @\(gr15,104\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff a8 lddi @\(gr15,-88\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff b0 lddi @\(gr15,-80\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff c8 lddi @\(gr15,-56\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff d8 lddi @\(gr15,-40\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff e0 lddi @\(gr15,-32\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
+[0-9a-f ]+: 90 cc ff f0 lddi @\(gr15,-16\),gr8
+[0-9a-f ]+: 80 30 80 00 jmpl @\(gr8,gr0\)
Disassembly of section \.text:
-000004b4 <_start>:
- 4b4: fe 3f ff f0 call 474 <i\+0x464>
- 4b8: fe 3f ff f5 call 48c <i\+0x47c>
- 4bc: fe 3f ff fa call 4a4 <i\+0x494>
- 4c0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4c4: 9c f4 00 98 setlo 0x98,gr14
- 4c8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4cc: 82 30 80 00 calll @\(gr8,gr0\)
- 4d0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4d4: 9c f4 00 a8 setlo 0xa8,gr14
- 4d8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4dc: 82 30 80 00 calll @\(gr8,gr0\)
- 4e0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 4e4: 9c f4 00 c0 setlo 0xc0,gr14
- 4e8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 4ec: 82 30 80 00 calll @\(gr8,gr0\)
- 4f0: 10 cc f0 60 lddi\.p @\(gr15,96\),gr8
- 4f4: 9c fc 00 60 setlos 0x60,gr14
- 4f8: 82 30 80 00 calll @\(gr8,gr0\)
- 4fc: 10 cc ff b8 lddi\.p @\(gr15,-72\),gr8
- 500: 9c fc ff b8 setlos 0xf*ffffffb8,gr14
- 504: 82 30 80 00 calll @\(gr8,gr0\)
- 508: 10 cc ff e8 lddi\.p @\(gr15,-24\),gr8
- 50c: 9c fc ff e8 setlos 0xf*ffffffe8,gr14
- 510: 82 30 80 00 calll @\(gr8,gr0\)
- 514: 80 88 00 00 nop
- 518: 92 fc f8 14 setlos 0xf*fffff814,gr9
- 51c: 80 88 00 00 nop
- 520: 92 fc 08 14 setlos 0x814,gr9
- 524: 92 f8 00 00 sethi hi\(0x0\),gr9
- 528: 92 f4 f8 14 setlo 0xf814,gr9
- 52c: fe 3f ff e0 call 4ac <i\+0x49c>
- 530: fe 3f ff c9 call 454 <i\+0x444>
- 534: fe 3f ff ca call 45c <i\+0x44c>
- 538: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 53c: 9c f4 00 c8 setlo 0xc8,gr14
- 540: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 544: 82 30 80 00 calll @\(gr8,gr0\)
- 548: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 54c: 9c f4 00 78 setlo 0x78,gr14
- 550: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 554: 82 30 80 00 calll @\(gr8,gr0\)
- 558: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 55c: 9c f4 00 88 setlo 0x88,gr14
- 560: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 564: 82 30 80 00 calll @\(gr8,gr0\)
- 568: 10 cc ff f8 lddi\.p @\(gr15,-8\),gr8
- 56c: 9c fc ff f8 setlos 0xf*fffffff8,gr14
- 570: 82 30 80 00 calll @\(gr8,gr0\)
- 574: 10 cc f0 18 lddi\.p @\(gr15,24\),gr8
- 578: 9c fc 00 18 setlos 0x18,gr14
- 57c: 82 30 80 00 calll @\(gr8,gr0\)
- 580: 10 cc f0 38 lddi\.p @\(gr15,56\),gr8
- 584: 9c fc 00 38 setlos 0x38,gr14
- 588: 82 30 80 00 calll @\(gr8,gr0\)
- 58c: 80 88 00 00 nop
- 590: 92 fc f8 24 setlos 0xf*fffff824,gr9
- 594: 80 88 00 00 nop
- 598: 92 fc 08 24 setlos 0x824,gr9
- 59c: 92 f8 00 00 sethi hi\(0x0\),gr9
- 5a0: 92 f4 f8 24 setlo 0xf824,gr9
- 5a4: fe 3f ff b0 call 464 <i\+0x454>
- 5a8: fe 3f ff b5 call 47c <i\+0x46c>
- 5ac: fe 3f ff ba call 494 <i\+0x484>
- 5b0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5b4: 9c f4 00 90 setlo 0x90,gr14
- 5b8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5bc: 82 30 80 00 calll @\(gr8,gr0\)
- 5c0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5c4: 9c f4 00 a0 setlo 0xa0,gr14
- 5c8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5cc: 82 30 80 00 calll @\(gr8,gr0\)
- 5d0: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 5d4: 9c f4 00 b8 setlo 0xb8,gr14
- 5d8: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 5dc: 82 30 80 00 calll @\(gr8,gr0\)
- 5e0: 10 cc f0 48 lddi\.p @\(gr15,72\),gr8
- 5e4: 9c fc 00 48 setlos 0x48,gr14
- 5e8: 82 30 80 00 calll @\(gr8,gr0\)
- 5ec: 10 cc ff a0 lddi\.p @\(gr15,-96\),gr8
- 5f0: 9c fc ff a0 setlos 0xf*ffffffa0,gr14
- 5f4: 82 30 80 00 calll @\(gr8,gr0\)
- 5f8: 10 cc ff d0 lddi\.p @\(gr15,-48\),gr8
- 5fc: 9c fc ff d0 setlos 0xf*ffffffd0,gr14
- 600: 82 30 80 00 calll @\(gr8,gr0\)
- 604: 80 88 00 00 nop
- 608: 92 fc 00 04 setlos 0x4,gr9
- 60c: 80 88 00 00 nop
- 610: 92 fc 10 04 setlos 0x1004,gr9
- 614: 92 f8 00 01 sethi 0x1,gr9
- 618: 92 f4 00 04 setlo 0x4,gr9
- 61c: fe 3f ff 94 call 46c <i\+0x45c>
- 620: fe 3f ff 99 call 484 <i\+0x474>
- 624: fe 3f ff 9e call 49c <i\+0x48c>
- 628: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 62c: 9c f4 00 b0 setlo 0xb0,gr14
- 630: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 634: 82 30 80 00 calll @\(gr8,gr0\)
- 638: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 63c: 9c f4 00 80 setlo 0x80,gr14
- 640: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 644: 82 30 80 00 calll @\(gr8,gr0\)
- 648: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
- 64c: 9c f4 00 70 setlo 0x70,gr14
- 650: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
- 654: 82 30 80 00 calll @\(gr8,gr0\)
- 658: 10 cc f0 20 lddi\.p @\(gr15,32\),gr8
- 65c: 9c fc 00 20 setlos 0x20,gr14
- 660: 82 30 80 00 calll @\(gr8,gr0\)
- 664: 10 cc f0 28 lddi\.p @\(gr15,40\),gr8
- 668: 9c fc 00 28 setlos 0x28,gr14
- 66c: 82 30 80 00 calll @\(gr8,gr0\)
- 670: 10 cc ff c0 lddi\.p @\(gr15,-64\),gr8
- 674: 9c fc ff c0 setlos 0xf*ffffffc0,gr14
- 678: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: fe 3f ff f0 call .*
+[0-9a-f ]+: fe 3f ff f5 call .*
+[0-9a-f ]+: fe 3f ff fa call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 98 setlo 0x98,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 a8 setlo 0xa8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 c0 setlo 0xc0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 60 lddi\.p @\(gr15,96\),gr8
+[0-9a-f ]+: 9c fc 00 60 setlos 0x60,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff b8 lddi\.p @\(gr15,-72\),gr8
+[0-9a-f ]+: 9c fc ff b8 setlos 0xf*ffffffb8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff e8 lddi\.p @\(gr15,-24\),gr8
+[0-9a-f ]+: 9c fc ff e8 setlos 0xf*ffffffe8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 14 setlos 0xf*fffff814,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 14 setlos 0x814,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 14 setlo 0xf814,gr9
+[0-9a-f ]+: fe 3f ff e0 call .*
+[0-9a-f ]+: fe 3f ff c9 call .*
+[0-9a-f ]+: fe 3f ff ca call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 c8 setlo 0xc8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 78 setlo 0x78,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 88 setlo 0x88,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff f8 lddi\.p @\(gr15,-8\),gr8
+[0-9a-f ]+: 9c fc ff f8 setlos 0xf*fffffff8,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 18 lddi\.p @\(gr15,24\),gr8
+[0-9a-f ]+: 9c fc 00 18 setlos 0x18,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 38 lddi\.p @\(gr15,56\),gr8
+[0-9a-f ]+: 9c fc 00 38 setlos 0x38,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 24 setlos 0xf*fffff824,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 08 24 setlos 0x824,gr9
+[0-9a-f ]+: 92 f8 00 00 sethi hi\(0x0\),gr9
+[0-9a-f ]+: 92 f4 f8 24 setlo 0xf824,gr9
+[0-9a-f ]+: fe 3f ff b0 call .*
+[0-9a-f ]+: fe 3f ff b5 call .*
+[0-9a-f ]+: fe 3f ff ba call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 90 setlo 0x90,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 a0 setlo 0xa0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 b8 setlo 0xb8,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 48 lddi\.p @\(gr15,72\),gr8
+[0-9a-f ]+: 9c fc 00 48 setlos 0x48,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff a0 lddi\.p @\(gr15,-96\),gr8
+[0-9a-f ]+: 9c fc ff a0 setlos 0xf*ffffffa0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff d0 lddi\.p @\(gr15,-48\),gr8
+[0-9a-f ]+: 9c fc ff d0 setlos 0xf*ffffffd0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 04 setlos 0x4,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 10 04 setlos 0x1004,gr9
+[0-9a-f ]+: 92 f8 00 01 sethi 0x1,gr9
+[0-9a-f ]+: 92 f4 00 04 setlo 0x4,gr9
+[0-9a-f ]+: fe 3f ff 94 call .*
+[0-9a-f ]+: fe 3f ff 99 call .*
+[0-9a-f ]+: fe 3f ff 9e call .*
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 b0 setlo 0xb0,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 80 setlo 0x80,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 1c f8 00 00 sethi\.p hi\(0x0\),gr14
+[0-9a-f ]+: 9c f4 00 70 setlo 0x70,gr14
+[0-9a-f ]+: 90 08 f1 4e ldd @\(gr15,gr14\),gr8
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 20 lddi\.p @\(gr15,32\),gr8
+[0-9a-f ]+: 9c fc 00 20 setlos 0x20,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc f0 28 lddi\.p @\(gr15,40\),gr8
+[0-9a-f ]+: 9c fc 00 28 setlos 0x28,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
+[0-9a-f ]+: 10 cc ff c0 lddi\.p @\(gr15,-64\),gr8
+[0-9a-f ]+: 9c fc ff c0 setlos 0xf*ffffffc0,gr14
+[0-9a-f ]+: 82 30 80 00 calll @\(gr8,gr0\)
Disassembly of section \.got:
-00004700 <_GLOBAL_OFFSET_TABLE_-0x60>:
- 4700: 00 00 00 00 add\.p gr0,gr0,gr0
- 4700: R_FRV_TLSDESC_VALUE \.tbss
- 4704: 00 00 17 f3 \*unknown\*
- 4708: 00 00 00 00 add\.p gr0,gr0,gr0
- 4708: R_FRV_TLSDESC_VALUE x
- 470c: 00 00 10 01 add\.p sp,sp,gr0
- 4710: 00 00 00 00 add\.p gr0,gr0,gr0
- 4710: R_FRV_TLSDESC_VALUE \.tbss
- 4714: 00 00 10 01 add\.p sp,sp,gr0
- 4718: 00 00 00 00 add\.p gr0,gr0,gr0
- 4718: R_FRV_TLSDESC_VALUE \.tbss
- 471c: 00 00 10 03 add\.p sp,gr3,gr0
- 4720: 00 00 00 00 add\.p gr0,gr0,gr0
- 4720: R_FRV_TLSDESC_VALUE x
- 4724: 00 01 00 03 add\.p gr16,gr3,gr0
- 4728: 00 00 00 00 add\.p gr0,gr0,gr0
- 4728: R_FRV_TLSDESC_VALUE \.tbss
- 472c: 00 01 07 f1 \*unknown\*
- 4730: 00 00 00 00 add\.p gr0,gr0,gr0
- 4730: R_FRV_TLSDESC_VALUE \.tbss
- 4734: 00 01 07 f3 \*unknown\*
- 4738: 00 00 00 00 add\.p gr0,gr0,gr0
- 4738: R_FRV_TLSDESC_VALUE x
- 473c: 00 01 00 01 add\.p gr16,sp,gr0
- 4740: 00 00 00 00 add\.p gr0,gr0,gr0
- 4740: R_FRV_TLSDESC_VALUE \.tbss
- 4744: 00 01 00 01 add\.p gr16,sp,gr0
- 4748: 00 00 00 00 add\.p gr0,gr0,gr0
- 4748: R_FRV_TLSDESC_VALUE \.tbss
- 474c: 00 01 00 03 add\.p gr16,gr3,gr0
- 4750: 00 00 00 00 add\.p gr0,gr0,gr0
- 4750: R_FRV_TLSDESC_VALUE \.tbss
- 4754: 00 00 00 11 add\.p gr0,gr17,gr0
- 4758: 00 00 00 00 add\.p gr0,gr0,gr0
- 4758: R_FRV_TLSDESC_VALUE \.tbss
- 475c: 00 00 00 13 add\.p gr0,gr19,gr0
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 01 add\.p sp,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 01 add\.p gr16,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 03 add\.p gr16,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 11 add\.p gr0,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 13 add\.p gr0,gr19,gr0
-00004760 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 4770: R_FRV_TLSDESC_VALUE \.tbss
- 4774: 00 00 10 11 add\.p sp,gr17,gr0
- 4778: 00 00 00 00 add\.p gr0,gr0,gr0
- 4778: R_FRV_TLSDESC_VALUE \.tbss
- 477c: 00 00 10 13 add\.p sp,gr19,gr0
- 4780: 00 00 00 00 add\.p gr0,gr0,gr0
- 4780: R_FRV_TLSDESC_VALUE x
- 4784: 00 00 00 03 add\.p gr0,gr3,gr0
- 4788: 00 00 00 00 add\.p gr0,gr0,gr0
- 4788: R_FRV_TLSDESC_VALUE x
- 478c: 00 00 10 03 add\.p sp,gr3,gr0
- 4790: 00 00 00 00 add\.p gr0,gr0,gr0
- 4790: R_FRV_TLSDESC_VALUE \.tbss
- 4794: 00 01 00 11 add\.p gr16,gr17,gr0
- 4798: 00 00 00 00 add\.p gr0,gr0,gr0
- 4798: R_FRV_TLSDESC_VALUE \.tbss
- 479c: 00 01 00 13 add\.p gr16,gr19,gr0
- 47a0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47a0: R_FRV_TLSDESC_VALUE \.tbss
- 47a4: 00 00 07 f1 \*unknown\*
- 47a8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47a8: R_FRV_TLSDESC_VALUE \.tbss
- 47ac: 00 00 07 f3 \*unknown\*
- 47b0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47b0: R_FRV_TLSDESC_VALUE x
- 47b4: 00 00 00 01 add\.p gr0,sp,gr0
- 47b8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47b8: R_FRV_TLSDESC_VALUE \.tbss
- 47bc: 00 00 00 01 add\.p gr0,sp,gr0
- 47c0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47c0: R_FRV_TLSDESC_VALUE \.tbss
- 47c4: 00 00 00 03 add\.p gr0,gr3,gr0
- 47c8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47c8: R_FRV_TLSDESC_VALUE \.tbss
- 47cc: 00 00 17 f1 \*unknown\*
- 47d0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47d0: R_FRV_TLSDESC_VALUE x
- 47d4: 00 01 00 02 add\.p gr16,fp,gr0
- 47d8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47d8: R_FRV_TLSDESC_VALUE \.tbss
- 47dc: 00 00 10 12 add\.p sp,gr18,gr0
- 47e0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47e0: R_FRV_TLSDESC_VALUE x
- 47e4: 00 00 10 02 add\.p sp,fp,gr0
- 47e8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47e8: R_FRV_TLSDESC_VALUE \.tbss
- 47ec: 00 01 00 12 add\.p gr16,gr18,gr0
- 47f0: 00 00 00 00 add\.p gr0,gr0,gr0
- 47f0: R_FRV_TLSDESC_VALUE \.tbss
- 47f4: 00 00 07 f2 \*unknown\*
- 47f8: 00 00 00 00 add\.p gr0,gr0,gr0
- 47f8: R_FRV_TLSDESC_VALUE \.tbss
- 47fc: 00 00 00 02 add\.p gr0,fp,gr0
- 4800: 00 00 00 00 add\.p gr0,gr0,gr0
- 4800: R_FRV_TLSDESC_VALUE \.tbss
- 4804: 00 00 17 f2 \*unknown\*
- 4808: 00 00 00 00 add\.p gr0,gr0,gr0
- 4808: R_FRV_TLSDESC_VALUE \.tbss
- 480c: 00 00 10 02 add\.p sp,fp,gr0
- 4810: 00 00 00 00 add\.p gr0,gr0,gr0
- 4810: R_FRV_TLSDESC_VALUE x
- 4814: 00 00 00 02 add\.p gr0,fp,gr0
- 4818: 00 00 00 00 add\.p gr0,gr0,gr0
- 4818: R_FRV_TLSDESC_VALUE \.tbss
- 481c: 00 01 07 f2 \*unknown\*
- 4820: 00 00 00 00 add\.p gr0,gr0,gr0
- 4820: R_FRV_TLSDESC_VALUE \.tbss
- 4824: 00 01 00 02 add\.p gr16,fp,gr0
- 4828: 00 00 00 00 add\.p gr0,gr0,gr0
- 4828: R_FRV_TLSDESC_VALUE \.tbss
- 482c: 00 00 00 12 add\.p gr0,gr18,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 11 add\.p sp,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 13 add\.p sp,gr19,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 03 add\.p sp,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 11 add\.p gr16,gr17,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 13 add\.p gr16,gr19,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f3 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 01 add\.p gr0,sp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 03 add\.p gr0,gr3,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f1 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 12 add\.p sp,gr18,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 12 add\.p gr16,gr18,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 07 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 17 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 10 02 add\.p sp,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE x
+[0-9a-f ]+: 00 00 00 02 add\.p gr0,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 07 f2 \*unknown\*
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 01 00 02 add\.p gr16,fp,gr0
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: R_FRV_TLSDESC_VALUE \.tbss
+[0-9a-f ]+: 00 00 00 12 add\.p gr0,gr18,gr0
diff --git a/ld/testsuite/ld-frv/tls-shared-3.d b/ld/testsuite/ld-frv/tls-shared-3.d
index d1a74c8..dc2d693 100644
--- a/ld/testsuite/ld-frv/tls-shared-3.d
+++ b/ld/testsuite/ld-frv/tls-shared-3.d
@@ -7,21 +7,21 @@
Disassembly of section \.text:
-000002f4 <_start>:
- 2f4: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 2f8: 00 88 00 00 nop\.p
- 2fc: 80 88 00 00 nop
- 300: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 304: 80 88 00 00 nop
- 308: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
- 30c: 80 88 00 00 nop
- 310: 80 88 00 00 nop
- 314: 92 c8 f0 0c ldi @\(gr15,12\),gr9
- 318: 00 88 00 00 nop\.p
- 31c: 80 88 00 00 nop
- 320: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 c8 f0 0c ldi\.p @\(gr15,12\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 c8 f0 0c ldi @\(gr15,12\),gr9
Disassembly of section \.got:
-000043a8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 43b4: R_FRV_TLSOFF u
+[0-9a-f ]+: R_FRV_TLSOFF u
diff --git a/ld/testsuite/ld-frv/tls-static-1.d b/ld/testsuite/ld-frv/tls-static-1.d
index 75b4011..0eeb21d 100644
--- a/ld/testsuite/ld-frv/tls-static-1.d
+++ b/ld/testsuite/ld-frv/tls-static-1.d
@@ -7,64 +7,64 @@
Disassembly of section \.text:
-000100b4 <_start>:
- 100b4: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 100b8: 00 88 00 00 nop\.p
- 100bc: 80 88 00 00 nop
- 100c0: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 100c4: 80 88 00 00 nop
- 100c8: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
- 100cc: 80 88 00 00 nop
- 100d0: 80 88 00 00 nop
- 100d4: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 100d8: 00 88 00 00 nop\.p
- 100dc: 80 88 00 00 nop
- 100e0: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 100e4: 80 88 00 00 nop
- 100e8: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
- 100ec: 80 88 00 00 nop
- 100f0: 80 88 00 00 nop
- 100f4: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 100f8: 00 88 00 00 nop\.p
- 100fc: 80 88 00 00 nop
- 10100: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10104: 80 88 00 00 nop
- 10108: 12 fc f8 30 setlos\.p 0xf*fffff830,gr9
- 1010c: 80 88 00 00 nop
- 10110: 80 88 00 00 nop
- 10114: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10118: 00 88 00 00 nop\.p
- 1011c: 80 88 00 00 nop
- 10120: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10124: 80 88 00 00 nop
- 10128: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 1012c: 80 88 00 00 nop
- 10130: 80 88 00 00 nop
- 10134: 00 88 00 00 nop\.p
- 10138: 90 fc f8 30 setlos 0xf*fffff830,gr8
- 1013c: 00 88 00 00 nop\.p
- 10140: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 10144: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10148: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1014c: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10150: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10154: 00 88 00 00 nop\.p
- 10158: 80 88 00 00 nop
- 1015c: 92 fc f8 10 setlos 0xf*fffff810,gr9
- 10160: 00 88 00 00 nop\.p
- 10164: 80 88 00 00 nop
- 10168: 92 fc f8 20 setlos 0xf*fffff820,gr9
- 1016c: 00 88 00 00 nop\.p
- 10170: 80 88 00 00 nop
- 10174: 92 fc f8 30 setlos 0xf*fffff830,gr9
- 10178: 00 88 00 00 nop\.p
- 1017c: 80 88 00 00 nop
- 10180: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 10 setlos\.p 0xf*fffff810,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 20 setlos\.p 0xf*fffff820,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc f8 30 setlos\.p 0xf*fffff830,gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 90 fc f8 30 setlos 0xf*fffff830,gr8
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 10 setlos 0xf*fffff810,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 20 setlos 0xf*fffff820,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc f8 30 setlos 0xf*fffff830,gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-00014190 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
- 1419c: ff ff f8 30 cop2 -32,cpr63,cpr48,cpr63
- 141a0: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
- 141a4: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
- 141a8: 00 00 00 00 add\.p gr0,gr0,gr0
+[0-9a-f ]+: ff ff f8 30 cop2 -32,cpr63,cpr48,cpr63
+[0-9a-f ]+: ff ff f8 10 cop2 -32,cpr63,cpr16,cpr63
+[0-9a-f ]+: ff ff f8 20 cop2 -32,cpr63,cpr32,cpr63
+[0-9a-f ]+: 00 00 00 00 add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/tls-static-3.d b/ld/testsuite/ld-frv/tls-static-3.d
index 3a678b3..7a6bea9 100644
--- a/ld/testsuite/ld-frv/tls-static-3.d
+++ b/ld/testsuite/ld-frv/tls-static-3.d
@@ -7,20 +7,20 @@
Disassembly of section \.text:
-00010094 <_start>:
- 10094: 92 fc 00 00 setlos lo\(0x0\),gr9
- 10098: 00 88 00 00 nop\.p
- 1009c: 80 88 00 00 nop
- 100a0: 92 fc 00 00 setlos lo\(0x0\),gr9
- 100a4: 80 88 00 00 nop
- 100a8: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
- 100ac: 80 88 00 00 nop
- 100b0: 80 88 00 00 nop
- 100b4: 92 fc 00 00 setlos lo\(0x0\),gr9
- 100b8: 00 88 00 00 nop\.p
- 100bc: 80 88 00 00 nop
- 100c0: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+<_start>:
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 12 fc 00 00 setlos\.p lo\(0x0\),gr9
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
+[0-9a-f ]+: 00 88 00 00 nop\.p
+[0-9a-f ]+: 80 88 00 00 nop
+[0-9a-f ]+: 92 fc 00 00 setlos lo\(0x0\),gr9
Disassembly of section \.got:
-000140c8 <_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
\.\.\.
diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index 5af0515..544538d 100644
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -56,26 +56,25 @@ Program Headers:
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
Offset +Info +Type +Sym.Value +Sym. Name
-0+804a100 0000010e R_386_TLS_TPOFF +0+ +sG3
-0+804a104 0000020e R_386_TLS_TPOFF +0+ +sG5
-0+804a108 0000040e R_386_TLS_TPOFF +0+ +sG7
-0+804a10c 00000525 R_386_TLS_TPOFF32 0+ +sG2
-0+804a110 00000625 R_386_TLS_TPOFF32 0+ +sG4
-0+804a114 0000060e R_386_TLS_TPOFF +0+ +sG4
-0+804a118 00000825 R_386_TLS_TPOFF32 0+ +sG6
-0+804a11c 00000925 R_386_TLS_TPOFF32 0+ +sG1
-0+804a120 00000c0e R_386_TLS_TPOFF +0+ +sG8
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG3
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG7
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG2
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG4
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG1
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG8
Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym.Value Sym. Name
-0+804a130 00000d07 R_386_JUMP_SLOT +[0-9a-f]+ +___tls_get_addr
+[0-9a-f ]+R_386_JUMP_SLOT +[0-9a-f]+ +___tls_get_addr
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains 13 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG3
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG5
- +[0-9]+: 0+804a060 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[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
@@ -128,7 +127,7 @@ Symbol table '.symtab' contains 73 entries:
+[0-9]+: 00000074 +0 TLS +GLOBAL DEFAULT +10 bg6
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG5
+[0-9]+: 00000068 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: 0+804a060 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+ +[0-9]+: 0+804a060 +0 OBJECT GLOBAL HIDDEN +11 _DYNAMIC
+[0-9]+: 00000008 +0 TLS +GLOBAL DEFAULT +9 sg3
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG7
+[0-9]+: 00000048 +0 TLS +GLOBAL HIDDEN +9 sh3
diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index b0e22f6..d8dcc66 100644
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -69,12 +69,11 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
[0-9a-f ]+R_386_TLS_TPOFF 0+ sg2
-Symbol table '.dynsym' contains 13 entries:
+Symbol table '.dynsym' contains 12 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg3
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg4
+[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
@@ -105,12 +104,12 @@ Symbol table '.symtab' contains 33 entries:
+[0-9]+: 0+08 +0 TLS +LOCAL DEFAULT +6 bl3
+[0-9]+: 0+0c +0 TLS +LOCAL DEFAULT +6 bl4
+[0-9]+: 0+10 +0 TLS +LOCAL DEFAULT +6 bl5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT LOCAL HIDDEN ABS _DYNAMIC
+[0-9]+: 0+1c +0 TLS +LOCAL HIDDEN +6 sh3
+[0-9]+: 0+20 +0 TLS +LOCAL HIDDEN +6 sh4
+[0-9]+: 0+14 +0 TLS +LOCAL HIDDEN +6 sh1
+[0-9]+: 0+218c +0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
+[0-9]+: 0+18 +0 TLS +LOCAL HIDDEN +6 sh2
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg3
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg4
+[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index dde6c4d..890a493 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -81,14 +81,13 @@ Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym.Value +Sym. Name
[0-9a-f ]+R_386_JUMP_SLOT 0+ ___tls_get_addr
-Symbol table '.dynsym' contains 18 entries:
+Symbol table '.dynsym' contains 17 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 *
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
+[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
+[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
@@ -129,6 +128,7 @@ Symbol table '.symtab' contains 55 entries:
+[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +8 sl7
+[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +8 sl8
+[0-9]+: 0+60 +0 TLS +LOCAL HIDDEN +9 sH1
+ +[0-9]+: [0-9a-f]+ +0 OBJECT LOCAL HIDDEN ABS _DYNAMIC
+[0-9]+: 0+48 +0 TLS +LOCAL HIDDEN +8 sh3
+[0-9]+: 0+64 +0 TLS +LOCAL HIDDEN +9 sH2
+[0-9]+: 0+78 +0 TLS +LOCAL HIDDEN +9 sH7
@@ -146,7 +146,6 @@ Symbol table '.symtab' contains 55 entries:
+[0-9]+: 0+44 +0 TLS +LOCAL HIDDEN +8 sh2
+[0-9]+: 0+54 +0 TLS +LOCAL HIDDEN +8 sh6
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
+[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
+[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
diff --git a/ld/testsuite/ld-ia64/tlsbin.dd b/ld/testsuite/ld-ia64/tlsbin.dd
index 44790c7..d581579 100644
--- a/ld/testsuite/ld-ia64/tlsbin.dd
+++ b/ld/testsuite/ld-ia64/tlsbin.dd
@@ -18,25 +18,25 @@ Disassembly of section .text:
40+101c: 81 0a 00 90[ ]+addl r15=40,r1;;
40+1020: 19 18 01 1c 18 10[ ]+\[MMB\][ ]+ld8 r35=\[r14\]
40+1026: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\]
-40+102c: c8 f3 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+40+102c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
40+1030: 0d 70 c0 02 00 24[ ]+\[MFI\][ ]+addl r14=48,r1
40+1036: 00 00 00 02 00 e0[ ]+nop.f 0x0
40+103c: 01 0c 00 90[ ]+addl r15=64,r1;;
40+1040: 19 18 01 1c 18 10[ ]+\[MMB\][ ]+ld8 r35=\[r14\]
40+1046: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\]
-40+104c: a8 f3 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+40+104c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
40+1050: 0d 70 c0 02 00 24[ ]+\[MFI\][ ]+addl r14=48,r1
40+1056: 00 00 00 02 00 80[ ]+nop.f 0x0
40+105c: 14 02 00 90[ ]+mov r36=33;;
40+1060: 1d 18 01 1c 18 10[ ]+\[MFB\][ ]+ld8 r35=\[r14\]
40+1066: 00 00 00 02 00 00[ ]+nop.f 0x0
-40+106c: 88 f3 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+40+106c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
40+1070: 0d 70 c0 02 00 24[ ]+\[MFI\][ ]+addl r14=48,r1
40+1076: 00 00 00 02 00 80[ ]+nop.f 0x0
40+107c: 04 00 00 84[ ]+mov r36=r0;;
40+1080: 1d 18 01 1c 18 10[ ]+\[MFB\][ ]+ld8 r35=\[r14\]
40+1086: 00 00 00 02 00 00[ ]+nop.f 0x0
-40+108c: 68 f3 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+40+108c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
40+1090: 0b 10 00 10 00 21[ ]+\[MMI\][ ]+mov r2=r8;;
40+1096: e0 00 0a 00 48 e0[ ]+addl r14=64,r2
40+109c: 61 14 00 90[ ]+addl r15=70,r2;;
diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
index fe5683f..86997a3 100644
--- a/ld/testsuite/ld-ia64/tlsbin.rd
+++ b/ld/testsuite/ld-ia64/tlsbin.rd
@@ -48,93 +48,92 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-60+1330 0+200000097 R_IA64_TPREL64LSB +0+ sG2 \+ 0
-60+1338 0+5000000a7 R_IA64_DTPMOD64LSB +0+ sG1 \+ 0
-60+1340 0+5000000b7 R_IA64_DTPREL64LSB +0+ sG1 \+ 0
+[0-9a-f ]+R_IA64_TPREL64LSB +0+ sG2 \+ 0
+[0-9a-f ]+R_IA64_DTPMOD64LSB +0+ sG1 \+ 0
+[0-9a-f ]+R_IA64_DTPREL64LSB +0+ sG1 \+ 0
Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-60+1360 0+300000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
-Symbol table '.dynsym' contains 8 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains 69 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18 *
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +11 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +11 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +11 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +11 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +11 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +11 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +11 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +11 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL +DEFAULT +12 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +12 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +12 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +12 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +12 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +12 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +12 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +12 bl8
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +11 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +12 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +12 bg6
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +12 bg3
- +[0-9]+: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +11 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +11 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +11 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +11 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +12 bg5
- +[0-9]+: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +11 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +11 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +11 sg1
- +[0-9]+: 40+10d0 +112 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +11 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +12 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +11 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 40+1000 +208 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +11 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +11 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +11 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +11 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +14 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +11 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +11 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +12 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +12 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +12 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* SECTION LOCAL +DEFAULT +15 *
+.* SECTION LOCAL +DEFAULT +16 *
+.* SECTION LOCAL +DEFAULT +17 *
+.* SECTION LOCAL +DEFAULT +18 *
+.* TLS +LOCAL +DEFAULT +11 sl1
+.* TLS +LOCAL +DEFAULT +11 sl2
+.* TLS +LOCAL +DEFAULT +11 sl3
+.* TLS +LOCAL +DEFAULT +11 sl4
+.* TLS +LOCAL +DEFAULT +11 sl5
+.* TLS +LOCAL +DEFAULT +11 sl6
+.* TLS +LOCAL +DEFAULT +11 sl7
+.* TLS +LOCAL +DEFAULT +11 sl8
+.* TLS +LOCAL +DEFAULT +12 bl1
+.* TLS +LOCAL +DEFAULT +12 bl2
+.* TLS +LOCAL +DEFAULT +12 bl3
+.* TLS +LOCAL +DEFAULT +12 bl4
+.* TLS +LOCAL +DEFAULT +12 bl5
+.* TLS +LOCAL +DEFAULT +12 bl6
+.* TLS +LOCAL +DEFAULT +12 bl7
+.* TLS +LOCAL +DEFAULT +12 bl8
+.* TLS +GLOBAL DEFAULT +11 sg8
+.* TLS +GLOBAL DEFAULT +12 bg8
+.* TLS +GLOBAL DEFAULT +12 bg6
+.* TLS +GLOBAL DEFAULT +12 bg3
+.* OBJECT +GLOBAL HIDDEN +13 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +11 sg3
+.* TLS +GLOBAL HIDDEN +11 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +11 sg4
+.* TLS +GLOBAL DEFAULT +11 sg5
+.* TLS +GLOBAL DEFAULT +12 bg5
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +11 sh7
+.* TLS +GLOBAL HIDDEN +11 sh8
+.* TLS +GLOBAL DEFAULT +11 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +11 sh4
+.* TLS +GLOBAL DEFAULT +12 bg7
+.* TLS +GLOBAL HIDDEN +11 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +11 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +11 sh1
+.* TLS +GLOBAL DEFAULT +11 sg6
+.* TLS +GLOBAL DEFAULT +11 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL HIDDEN +14 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +11 sh2
+.* TLS +GLOBAL HIDDEN +11 sh6
+.* TLS +GLOBAL DEFAULT +12 bg2
+.* TLS +GLOBAL DEFAULT +12 bg1
+.* TLS +GLOBAL DEFAULT +12 bg4
diff --git a/ld/testsuite/ld-ia64/tlspic.dd b/ld/testsuite/ld-ia64/tlspic.dd
index f4e2f80..32850f0 100644
--- a/ld/testsuite/ld-ia64/tlspic.dd
+++ b/ld/testsuite/ld-ia64/tlspic.dd
@@ -18,25 +18,25 @@ Disassembly of section .text:
+101c: 01 0a 00 90[ ]+addl r15=32,r1;;
+1020: 19 18 01 1c 18 10[ ]+\[MMB\] +ld8 r35=\[r14\]
+1026: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\]
- +102c: 28 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+ +102c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+1030: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1
+1036: 00 00 00 02 00 e0[ ]+nop.f 0x0
+103c: 01 0c 00 90[ ]+addl r15=64,r1;;
+1040: 19 18 01 1c 18 10[ ]+\[MMB\] +ld8 r35=\[r14\]
+1046: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\]
- +104c: 08 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+ +104c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+1050: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1
+1056: 00 00 00 02 00 80[ ]+nop.f 0x0
+105c: 14 02 00 90[ ]+mov r36=33;;
+1060: 1d 18 01 1c 18 10[ ]+\[MFB\] +ld8 r35=\[r14\]
+1066: 00 00 00 02 00 00[ ]+nop.f 0x0
- +106c: e8 f4 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+ +106c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+1070: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1
+1076: 00 00 00 02 00 80[ ]+nop.f 0x0
+107c: 04 00 00 84[ ]+mov r36=r0;;
+1080: 1d 18 01 1c 18 10[ ]+\[MFB\] +ld8 r35=\[r14\]
+1086: 00 00 00 02 00 00[ ]+nop.f 0x0
- +108c: c8 f4 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+ +108c: [0-9a-f ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;;
+1090: 0b 10 00 10 00 21[ ]+\[MMI\] +mov r2=r8;;
+1096: e0 00 0a 00 48 e0[ ]+addl r14=64,r2
+109c: 21 16 00 90[ ]+addl r15=98,r2;;
diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
index c0e151f..2e9b2c8 100644
--- a/ld/testsuite/ld-ia64/tlspic.rd
+++ b/ld/testsuite/ld-ia64/tlspic.rd
@@ -45,97 +45,96 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 6 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+112f0 +0+d000000a7 R_IA64_DTPMOD64LSB +0+ sg1 \+ 0
-0+112f8 +0+d000000b7 R_IA64_DTPREL64LSB +0+ sg1 \+ 0
-0+11300 +0+1000000097 R_IA64_TPREL64LSB +0+4 sg2 \+ 0
-0+11308 +0+a7 R_IA64_DTPMOD64LSB +0+
-0+11310 +0+97 R_IA64_TPREL64LSB +0+44
-0+11320 +0+97 R_IA64_TPREL64LSB +0+24
+[0-9a-f ]+R_IA64_DTPMOD64LSB +0+ sg1 \+ 0
+[0-9a-f ]+R_IA64_DTPREL64LSB +0+ sg1 \+ 0
+[0-9a-f ]+R_IA64_TPREL64LSB +0+4 sg2 \+ 0
+[0-9a-f ]+R_IA64_DTPMOD64LSB +0+
+[0-9a-f ]+R_IA64_TPREL64LSB +0+44
+[0-9a-f ]+R_IA64_TPREL64LSB +0+24
Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+[0-9a-f]+ +0+c00000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
-Symbol table '.dynsym' contains 21 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[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 +14 *
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +10 sg8
- +[0-9]+: 0+11[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +10 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +10 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +10 sg5
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +10 sg1
- +[0-9]+: 0+1000 +272 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +10 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +10 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +10 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* TLS +GLOBAL DEFAULT +10 sg8
+.* TLS +GLOBAL DEFAULT +10 sg3
+.* TLS +GLOBAL DEFAULT +10 sg4
+.* TLS +GLOBAL DEFAULT +10 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +10 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +10 sg2
+.* TLS +GLOBAL DEFAULT +10 sg6
+.* TLS +GLOBAL DEFAULT +10 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains 57 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +10 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +10 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +10 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +10 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +10 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +10 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +10 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +10 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL +HIDDEN +11 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL +HIDDEN +10 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL +HIDDEN +11 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL +HIDDEN +11 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL +HIDDEN +10 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL +HIDDEN +10 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL +HIDDEN +11 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL +HIDDEN +10 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL +HIDDEN +11 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL +HIDDEN +10 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL +HIDDEN +11 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL +HIDDEN +11 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL +HIDDEN +11 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL +HIDDEN +10 sh1
- +[0-9]+: 0+112d8 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL +HIDDEN +10 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL +HIDDEN +10 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +10 sg8
- +[0-9]+: 0+11[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +10 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +10 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +10 sg5
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +10 sg1
- +[0-9]+: 0+1000 +272 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +10 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +10 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +10 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* SECTION LOCAL +DEFAULT +15 *
+.* SECTION LOCAL +DEFAULT +16 *
+.* SECTION LOCAL +DEFAULT +17 *
+.* TLS +LOCAL +DEFAULT +10 sl1
+.* TLS +LOCAL +DEFAULT +10 sl2
+.* TLS +LOCAL +DEFAULT +10 sl3
+.* TLS +LOCAL +DEFAULT +10 sl4
+.* TLS +LOCAL +DEFAULT +10 sl5
+.* TLS +LOCAL +DEFAULT +10 sl6
+.* TLS +LOCAL +DEFAULT +10 sl7
+.* TLS +LOCAL +DEFAULT +10 sl8
+.* TLS +LOCAL +HIDDEN +11 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +10 sh3
+.* TLS +LOCAL +HIDDEN +11 sH2
+.* TLS +LOCAL +HIDDEN +11 sH7
+.* TLS +LOCAL +HIDDEN +10 sh7
+.* TLS +LOCAL +HIDDEN +10 sh8
+.* TLS +LOCAL +HIDDEN +11 sH4
+.* TLS +LOCAL +HIDDEN +10 sh4
+.* TLS +LOCAL +HIDDEN +11 sH3
+.* TLS +LOCAL +HIDDEN +10 sh5
+.* TLS +LOCAL +HIDDEN +11 sH5
+.* TLS +LOCAL +HIDDEN +11 sH6
+.* TLS +LOCAL +HIDDEN +11 sH8
+.* TLS +LOCAL +HIDDEN +10 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +10 sh2
+.* TLS +LOCAL +HIDDEN +10 sh6
+.* TLS +GLOBAL DEFAULT +10 sg8
+.* TLS +GLOBAL DEFAULT +10 sg3
+.* TLS +GLOBAL DEFAULT +10 sg4
+.* TLS +GLOBAL DEFAULT +10 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +10 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +10 sg2
+.* TLS +GLOBAL DEFAULT +10 sg6
+.* TLS +GLOBAL DEFAULT +10 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-powerpc/tlsexe.g b/ld/testsuite/ld-powerpc/tlsexe.g
index cd09c51..6f9aa97 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.g
+++ b/ld/testsuite/ld-powerpc/tlsexe.g
@@ -7,6 +7,6 @@
.*: +file format elf64-powerpc
Contents of section \.got:
- 100105f0 00000000 100185f0 ffffffff ffff8018 .*
- 10010600 00000000 00000000 00000000 00000000 .*
- 10010610 00000000 00000000 00000000 00000000 .*
+.* 00000000 100185d0 ffffffff ffff8018 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
index ccb0e23..7c501bd 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.r
+++ b/ld/testsuite/ld-powerpc/tlsexe.r
@@ -37,10 +37,10 @@ Program Headers:
+PHDR +0x0+40 0x0+10000040 0x0+10000040 0x0+150 0x0+150 R E 0x8
+INTERP +0x0+190 0x0+10000190 0x0+10000190 0x0+11 0x0+11 R +0x1
+\[Requesting program interpreter: .*\]
- +LOAD +0x0+ 0x0+10000000 0x0+10000000 0x0+468 0x0+468 R E 0x10000
- +LOAD +0x0+468 0x0+10010468 0x0+10010468 0x0+1b8 0x0+1e8 RW +0x10000
- +DYNAMIC +0x0+4a0 0x0+100104a0 0x0+100104a0 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+468 0x0+10010468 0x0+10010468 0x0+38 0x0+70 R +0x8
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+38 0x0+70 R +0x8
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -59,59 +59,58 @@ Relocation section '\.rela\.dyn' at offset .* contains 3 entries:
Relocation section '\.rela\.plt' at offset .* contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10010638 +0+300000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
-.* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
-.* 0+100104a0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND gd
-.* 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND ld
-.* 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
-.* 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* 0+10010650 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* TLS +GLOBAL DEFAULT +UND gd
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +UND ld
+.* TLS +GLOBAL DEFAULT +10 ld2
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '\.symtab' contains 40 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
.* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
-.* 0+10000368 +0 SECTION LOCAL +DEFAULT +7
-.* 0+10000468 +0 SECTION LOCAL +DEFAULT +8
-.* 0+10010468 +0 SECTION LOCAL +DEFAULT +9
-.* 0+100104a0 +0 SECTION LOCAL +DEFAULT +10
-.* 0+100104a0 +0 SECTION LOCAL +DEFAULT +11
-.* 0+100105f0 +0 SECTION LOCAL +DEFAULT +12
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
-.* 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
-.* 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
-.* 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
-.* 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
-.* 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
-.* 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
-.* 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
-.* 0+ +0 FUNC +LOCAL +DEFAULT +UND \.__tls_get_addr
-.* 0+100104a0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND gd
-.* 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
-.* 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.* 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
-.* 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND ld
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +7 _start
-.* 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
-.* 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-.* 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
-.* 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* SECTION LOCAL +DEFAULT +16
+.* TLS +LOCAL +DEFAULT +9 gd4
+.* TLS +LOCAL +DEFAULT +9 ld4
+.* TLS +LOCAL +DEFAULT +9 ld5
+.* TLS +LOCAL +DEFAULT +9 ld6
+.* TLS +LOCAL +DEFAULT +9 ie4
+.* TLS +LOCAL +DEFAULT +9 le4
+.* TLS +LOCAL +DEFAULT +9 le5
+.* FUNC +LOCAL +DEFAULT +UND \.__tls_get_addr
+.* OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+.* GLOBAL DEFAULT +UND gd
+.* GLOBAL DEFAULT +10 le0
+.* GLOBAL DEFAULT +UND __tls_get_addr
+.* GLOBAL DEFAULT +10 ld0
+.* GLOBAL DEFAULT +10 le1
+.* GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +7 _start
+.* TLS +GLOBAL DEFAULT +10 ld2
+.* TLS +GLOBAL DEFAULT +10 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +10 gd0
+.* TLS +GLOBAL DEFAULT +10 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.d b/ld/testsuite/ld-powerpc/tlsexe32.d
index 73edfaa..c69e335 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.d
+++ b/ld/testsuite/ld-powerpc/tlsexe32.d
@@ -44,4 +44,4 @@ Disassembly of section \.got:
.*: 4e 80 00 21 blrl
.* <_GLOBAL_OFFSET_TABLE_>:
-.*: 01 81 02 d0 00 00 00 00 00 00 00 00 .*
+.*: 01 81 02 b4 00 00 00 00 00 00 00 00 .*
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.g b/ld/testsuite/ld-powerpc/tlsexe32.g
index d403786..14b7f8c 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.g
+++ b/ld/testsuite/ld-powerpc/tlsexe32.g
@@ -8,4 +8,4 @@
Contents of section \.got:
.* 00000000 00000000 00000000 4e800021 .*
-.* 018102d0 00000000 00000000 .*
+.* 018102b4 00000000 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
index 75be30a..eacc6b0 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.r
+++ b/ld/testsuite/ld-powerpc/tlsexe32.r
@@ -9,18 +9,18 @@ There are 16 section headers.*
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[ 0\] +NULL +00000000 000000 000000 00 +0 +0 +0
+ +\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+\[ 1\] \.interp +.*
+\[ 2\] \.hash +.*
+\[ 3\] \.dynsym +.*
+\[ 4\] \.dynstr +.*
+\[ 5\] \.rela\.dyn +.*
+\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS +01800244 000244 000070 00 +AX +0 +0 +1
- +\[ 8\] \.tdata +PROGBITS +018102b4 0002b4 00001c 00 WAT +0 +0 +4
- +\[ 9\] \.tbss +NOBITS +018102d0 0002d0 00001c 00 WAT +0 +0 +4
- +\[10\] \.dynamic +DYNAMIC +018102d0 0002d0 0000a0 08 +WA +4 +0 +4
- +\[11\] \.got +PROGBITS +01810370 000370 00001c 04 WAX +0 +0 +4
+ +\[ 7\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000070 00 +AX +0 +0 +1
+ +\[ 8\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
+ +\[ 9\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
+ +\[10\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
+ +\[11\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 04 WAX +0 +0 +4
+\[12\] \.plt +NOBITS +.*
+\[13\] \.shstrtab +STRTAB +.*
+\[14\] \.symtab +SYMTAB +.*
@@ -28,7 +28,7 @@ Section Headers:
#...
Elf file type is EXEC \(Executable file\)
-Entry point 0x1800244
+Entry point .*
There are 6 program headers, starting at offset 52
Program Headers:
@@ -36,10 +36,10 @@ Program Headers:
+PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4
+INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1
+\[Requesting program interpreter: .*\]
- +LOAD +0x000000 0x01800000 0x01800000 0x002b4 0x002b4 R E 0x10000
- +LOAD +0x0002b4 0x018102b4 0x018102b4 0x000d8 0x0012c RWE 0x10000
- +DYNAMIC +0x0002d0 0x018102d0 0x018102d0 0x000a0 0x000a0 RW +0x4
- +TLS +0x0002b4 0x018102b4 0x018102b4 0x0001c 0x00038 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RWE 0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 0x0001c 0x00038 R +0x4
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -50,66 +50,65 @@ Program Headers:
+04 +\.dynamic
+05 +\.tdata \.tbss
-Relocation section '\.rela\.dyn' at offset 0x220 contains 2 entries:
+Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-01810370 +00000249 R_PPC_TPREL32 +00000000 +gd \+ 0
-01810374 +00000444 R_PPC_DTPMOD32 +00000000 +ld \+ 0
+[0-9a-f ]+R_PPC_TPREL32 +00000000 +gd \+ 0
+[0-9a-f ]+R_PPC_DTPMOD32 +00000000 +ld \+ 0
-Relocation section '\.rela\.plt' at offset 0x238 contains 1 entries:
+Relocation section '\.rela\.plt' at offset .* contains 1 entries:
Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-018103d4 +00000315 R_PPC_JMP_SLOT +018103d4 +__tls_get_addr \+ 0
+[0-9a-f ]+R_PPC_JMP_SLOT[0-9a-f ]+__tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
-.*: 00000000 +0 NOTYPE +LOCAL +DEFAULT +UND
-.*: 018102d0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.*: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
-.*: 018103d4 +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.*: 00000000 +0 TLS +GLOBAL DEFAULT +UND ld
-.*: 018103e0 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
-.*: 0181038c +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.*: 0181038c +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.*: 018103e0 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* TLS +GLOBAL DEFAULT +UND gd
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +ABS __end
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '\.symtab' contains 40 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
-.*: 00000000 +0 NOTYPE +LOCAL +DEFAULT +UND
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
-.*: 01800244 +0 SECTION LOCAL +DEFAULT +7
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
-.*: 018102d0 +0 SECTION LOCAL +DEFAULT +9
-.*: 018102d0 +0 SECTION LOCAL +DEFAULT +10
-.*: 01810370 +0 SECTION LOCAL +DEFAULT +11
-.*: 0181038c +0 SECTION LOCAL +DEFAULT +12
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
-.*: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
-.*: 00000000 +0 TLS +LOCAL +DEFAULT +8 gd4
-.*: 00000004 +0 TLS +LOCAL +DEFAULT +8 ld4
-.*: 00000008 +0 TLS +LOCAL +DEFAULT +8 ld5
-.*: 0000000c +0 TLS +LOCAL +DEFAULT +8 ld6
-.*: 00000010 +0 TLS +LOCAL +DEFAULT +8 ie4
-.*: 00000014 +0 TLS +LOCAL +DEFAULT +8 le4
-.*: 00000018 +0 TLS +LOCAL +DEFAULT +8 le5
-.*: 018102d0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.*: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
-.*: 00000030 +0 TLS +GLOBAL DEFAULT +9 le0
-.*: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.*: 00000020 +0 TLS +GLOBAL DEFAULT +9 ld0
-.*: 00000034 +0 TLS +GLOBAL DEFAULT +9 le1
-.*: 00000000 +0 TLS +GLOBAL DEFAULT +UND ld
-.*: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +7 _start
-.*: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __end
-.*: 00000028 +0 TLS +GLOBAL DEFAULT +9 ld2
-.*: 00000024 +0 TLS +GLOBAL DEFAULT +9 ld1
-.*: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.*: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.*: 01810380 +0 OBJECT +GLOBAL +HIDDEN +11 _GLOBAL_OFFSET_TABLE_
-.*: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-.*: 0000001c +0 TLS +GLOBAL DEFAULT +9 gd0
-.*: 0000002c +0 TLS +GLOBAL DEFAULT +9 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* TLS +LOCAL +DEFAULT +8 gd4
+.* TLS +LOCAL +DEFAULT +8 ld4
+.* TLS +LOCAL +DEFAULT +8 ld5
+.* TLS +LOCAL +DEFAULT +8 ld6
+.* TLS +LOCAL +DEFAULT +8 ie4
+.* TLS +LOCAL +DEFAULT +8 le4
+.* TLS +LOCAL +DEFAULT +8 le5
+.* OBJECT +GLOBAL HIDDEN +10 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +9 le0
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +9 ld0
+.* TLS +GLOBAL DEFAULT +9 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +7 _start
+.* NOTYPE +GLOBAL DEFAULT +ABS __end
+.* TLS +GLOBAL DEFAULT +9 ld2
+.* TLS +GLOBAL DEFAULT +9 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL +HIDDEN +11 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +9 gd0
+.* TLS +GLOBAL DEFAULT +9 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.g b/ld/testsuite/ld-powerpc/tlsexetoc.g
index a197b8b..00dc0fe 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.g
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.g
@@ -7,9 +7,9 @@
.*: +file format elf64-powerpc
Contents of section \.got:
- 10010580 00000000 10018580 00000000 00000000 .*
- 10010590 00000000 00000000 00000000 00000000 .*
- 100105a0 00000000 00000000 00000000 00000001 .*
- 100105b0 00000000 00000000 00000000 00000001 .*
- 100105c0 00000000 00000000 ffffffff ffff8050 .*
- 100105d0 00000000 00000000 .*
+.* 00000000 10018558 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000001 .*
+.* 00000000 00000000 00000000 00000001 .*
+.* 00000000 00000000 ffffffff ffff8050 .*
+.* 00000000 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
index d1d7912..f252784 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -37,10 +37,10 @@ Program Headers:
+PHDR +0x0+40 0x0+10000040 0x0+10000040 0x0+150 0x0+150 R E 0x8
+INTERP +0x0+190 0x0+10000190 0x0+10000190 0x0+11 0x0+11 R +0x1
+\[Requesting program interpreter: .*\]
- +LOAD +0x0+ 0x0+10000000 0x0+10000000 0x0+3f8 0x0+3f8 R E 0x10000
- +LOAD +0x0+3f8 0x0+100103f8 0x0+100103f8 0x0+1e0 0x0+210 RW +0x10000
- +DYNAMIC +0x0+430 0x0+10010430 0x0+10010430 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+3f8 0x0+100103f8 0x0+100103f8 0x0+38 0x0+70 R +0x8
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+38 0x0+70 R +0x8
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -53,64 +53,63 @@ Program Headers:
Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10010588 +0+200000049 R_PPC64_TPREL64 +0+ gd \+ 0
-0+10010598 +0+400000044 R_PPC64_DTPMOD64 +0+ ld \+ 0
+[0-9a-f ]+R_PPC64_TPREL64 +0+ gd \+ 0
+[0-9a-f ]+R_PPC64_DTPMOD64 +0+ ld \+ 0
Relocation section '\.rela\.plt' at offset .* contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+100105f0 +0+300000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 8 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
-.* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
-.* 0+10010430 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND gd
-.* 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND ld
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* TLS +GLOBAL DEFAULT +UND gd
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '\.symtab' contains 41 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
-.* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
-.* 0+10000338 +0 SECTION LOCAL +DEFAULT +7
-.* 0+100003f8 +0 SECTION LOCAL +DEFAULT +8
-.* 0+100103f8 +0 SECTION LOCAL +DEFAULT +9
-.* 0+10010430 +0 SECTION LOCAL +DEFAULT +10
-.* 0+10010430 +0 SECTION LOCAL +DEFAULT +11
-.* 0+10010580 +0 SECTION LOCAL +DEFAULT +12
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
-.* 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
-.* 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
-.* 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
-.* 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
-.* 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
-.* 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
-.* 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
-.* 0+100105d0 +0 NOTYPE +LOCAL +DEFAULT +12 \.Lie0
-.* 0+ +0 FUNC +LOCAL +DEFAULT +UND \.__tls_get_addr
-.* 0+10010430 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND gd
-.* 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
-.* 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
-.* 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
-.* 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
-.* 0+ +0 TLS +GLOBAL DEFAULT +UND ld
-.* 0+10000354 +0 NOTYPE +GLOBAL DEFAULT +7 _start
-.* 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
-.* 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
-.* 0+100105d8 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* 0+100105d8 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* 0+10010608 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-.* 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
-.* 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* SECTION LOCAL +DEFAULT +16
+.* TLS +LOCAL +DEFAULT +9 gd4
+.* TLS +LOCAL +DEFAULT +9 ld4
+.* TLS +LOCAL +DEFAULT +9 ld5
+.* TLS +LOCAL +DEFAULT +9 ld6
+.* TLS +LOCAL +DEFAULT +9 ie4
+.* TLS +LOCAL +DEFAULT +9 le4
+.* TLS +LOCAL +DEFAULT +9 le5
+.* NOTYPE +LOCAL +DEFAULT +12 \.Lie0
+.* FUNC +LOCAL +DEFAULT +UND \.__tls_get_addr
+.* OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +10 le0
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +10 ld0
+.* TLS +GLOBAL DEFAULT +10 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +7 _start
+.* TLS +GLOBAL DEFAULT +10 ld2
+.* TLS +GLOBAL DEFAULT +10 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +10 gd0
+.* TLS +GLOBAL DEFAULT +10 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsso.g b/ld/testsuite/ld-powerpc/tlsso.g
index 2a10d99..caef9dd 100644
--- a/ld/testsuite/ld-powerpc/tlsso.g
+++ b/ld/testsuite/ld-powerpc/tlsso.g
@@ -7,9 +7,9 @@
.*: +file format elf64-powerpc
Contents of section \.got:
- 10818 00000000 00018818 00000000 00000000 .*
- 10828 00000000 00000000 00000000 00000000 .*
- 10838 00000000 00000000 00000000 00000000 .*
- 10848 00000000 00000000 00000000 00000000 .*
- 10858 00000000 00000000 00000000 00000000 .*
- 10868 00000000 00000000 00000000 00000000 .*
+.* 00000000 000187f0 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index a03069e..8501c6f 100644
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -9,21 +9,21 @@ There are 16 section headers.*
Section Headers:
+\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
+\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash +.*
- +\[ 2\] \.dynsym +.*
- +\[ 3\] \.dynstr +.*
- +\[ 4\] \.rela\.dyn +.*
- +\[ 5\] \.rela\.plt +.*
- +\[ 6\] \.text +PROGBITS +0+590 0+590 0+fc 0+ +AX +0 +0 +4
- +\[ 7\] \.tdata +PROGBITS +0+10690 0+690 0+38 0+ WAT +0 +0 +8
- +\[ 8\] \.tbss +NOBITS +0+106c8 0+6c8 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.data\.rel\.ro +PROGBITS .*
- +\[10\] \.dynamic +DYNAMIC +0+106c8 0+6c8 0+150 10 +WA +3 +0 +8
- +\[11\] \.got +PROGBITS +0+10818 0+818 0+60 08 +WA +0 +0 +8
- +\[12\] \.plt +.*
- +\[13\] \.shstrtab +.*
- +\[14\] \.symtab +.*
- +\[15\] \.strtab +.*
+ +\[ 1\] \.hash .*
+ +\[ 2\] \.dynsym .*
+ +\[ 3\] \.dynstr .*
+ +\[ 4\] \.rela\.dyn .*
+ +\[ 5\] \.rela\.plt .*
+ +\[ 6\] \.text .*
+ +\[ 7\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[ 8\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[ 9\] \.data\.rel\.ro .*
+ +\[10\] \.dynamic .*
+ +\[11\] \.got .*
+ +\[12\] \.plt .*
+ +\[13\] \.shstrtab .*
+ +\[14\] \.symtab .*
+ +\[15\] \.strtab .*
#...
Elf file type is DYN \(Shared object file\)
@@ -32,10 +32,10 @@ There are 4 program headers.*
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+68c 0x0+68c R E 0x10000
- +LOAD +0x0+690 0x0+10690 0x0+10690 0x0+1e8 0x0+218 RW +0x10000
- +DYNAMIC +0x0+6c8 0x0+106c8 0x0+106c8 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+690 0x0+10690 0x0+10690 0x0+38 0x0+70 R +0x8
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+38 0x0+70 R +0x8
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -49,9 +49,9 @@ Relocation section '\.rela\.dyn' at offset .* contains 16 entries:
[0-9a-f ]+R_PPC64_TPREL16 +0+60 le0 \+ 0
[0-9a-f ]+R_PPC64_TPREL16_HA +0+68 le1 \+ 0
[0-9a-f ]+R_PPC64_TPREL16_LO +0+68 le1 \+ 0
-[0-9a-f ]+R_PPC64_TPREL16_DS +0+10690 \.tdata \+ 28
-[0-9a-f ]+R_PPC64_TPREL16_HA +0+10690 \.tdata \+ 30
-[0-9a-f ]+R_PPC64_TPREL16_LO +0+10690 \.tdata \+ 30
+[0-9a-f ]+R_PPC64_TPREL16_DS +0+10668 \.tdata \+ 28
+[0-9a-f ]+R_PPC64_TPREL16_HA +0+10668 \.tdata \+ 30
+[0-9a-f ]+R_PPC64_TPREL16_LO +0+10668 \.tdata \+ 30
[0-9a-f ]+R_PPC64_DTPMOD64 +0+
[0-9a-f ]+R_PPC64_DTPMOD64 +0+
[0-9a-f ]+R_PPC64_DTPREL64 +0+
@@ -67,67 +67,66 @@ Relocation section '\.rela\.plt' at offset .* contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
[0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 20 entries:
+Symbol table '\.dynsym' contains .* entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: 0+590 +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: 0+10690 +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: 0+106c8 +0 SECTION LOCAL +DEFAULT +8
- +[0-9]+: 0+106c8 +0 SECTION LOCAL +DEFAULT +9
- +[0-9]+: 0+106c8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+40 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+50 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+48 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+38 +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+58 +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
Symbol table '\.symtab' contains 39 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +[0-9]+: 0+590 +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: 0+10690 +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: 0+106c8 +0 SECTION LOCAL +DEFAULT +8
- +[0-9]+: 0+106c8 +0 SECTION LOCAL +DEFAULT +9
- +[0-9]+: 0+106c8 +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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: 0+ +0 TLS +LOCAL +DEFAULT +7 gd4
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +7 ld4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +7 ld5
- +[0-9]+: 0+18 +0 TLS +LOCAL +DEFAULT +7 ld6
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 ie4
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 le4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 le5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
- +[0-9]+: 0+106c8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+40 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+50 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+48 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+38 +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+58 +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* TLS +LOCAL +DEFAULT +7 gd4
+.* TLS +LOCAL +DEFAULT +7 ld4
+.* TLS +LOCAL +DEFAULT +7 ld5
+.* TLS +LOCAL +DEFAULT +7 ld6
+.* TLS +LOCAL +DEFAULT +7 ie4
+.* TLS +LOCAL +DEFAULT +7 le4
+.* TLS +LOCAL +DEFAULT +7 le5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsso32.d b/ld/testsuite/ld-powerpc/tlsso32.d
index ebfe3cb..45432db 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.d
+++ b/ld/testsuite/ld-powerpc/tlsso32.d
@@ -42,5 +42,5 @@ Disassembly of section \.got:
.* <\.got>:
\.\.\.
.*: 4e 80 00 21 blrl
-.*: 00 01 04 54 .*
+.*: 00 01 04 38 .*
\.\.\.
diff --git a/ld/testsuite/ld-powerpc/tlsso32.g b/ld/testsuite/ld-powerpc/tlsso32.g
index 63c9bc7..7014419 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.g
+++ b/ld/testsuite/ld-powerpc/tlsso32.g
@@ -9,5 +9,5 @@
Contents of section \.got:
.* 00000000 00000000 00000000 00000000 .*
.* 00000000 00000000 00000000 00000000 .*
-.* 00000000 4e800021 00010454 00000000 .*
+.* 00000000 4e800021 00010438 00000000 .*
.* 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index 046340b..c0c120c 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -14,11 +14,11 @@ Section Headers:
+\[ 3\] \.dynstr +.*
+\[ 4\] \.rela\.dyn +.*
+\[ 5\] \.rela\.plt +.*
- +\[ 6\] \.text +PROGBITS +0+3c8 0+3c8 0+70 0+ +AX +0 +0 +1
- +\[ 7\] \.tdata +PROGBITS +0+10438 0+438 0+1c 0+ WAT +0 +0 +4
- +\[ 8\] \.tbss +NOBITS +0+10454 0+454 0+1c 0+ WAT +0 +0 +4
- +\[ 9\] \.dynamic +DYNAMIC +0+10454 0+454 0+a0 08 +WA +3 +0 +4
- +\[10\] \.got +PROGBITS +0+104f4 0+4f4 0+34 04 WAX +0 +0 +4
+ +\[ 6\] \.text +PROGBITS .* 0+70 0+ +AX +0 +0 +1
+ +\[ 7\] \.tdata +PROGBITS .* 0+1c 0+ WAT +0 +0 +4
+ +\[ 8\] \.tbss +NOBITS .* 0+1c 0+ WAT +0 +0 +4
+ +\[ 9\] \.dynamic +DYNAMIC .* 08 +WA +3 +0 +4
+ +\[10\] \.got +PROGBITS .* 0+34 04 WAX +0 +0 +4
+\[11\] \.plt +.*
+\[12\] \.shstrtab +.*
+\[13\] \.symtab +.*
@@ -31,10 +31,10 @@ There are 4 program headers.*
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+438 0x0+438 R E 0x10000
- +LOAD +0x0+438 0x0+10438 0x0+10438 0x0+f0 0x0+144 RWE 0x10000
- +DYNAMIC +0x0+454 0x0+10454 0x0+10454 0x0+a0 0x0+a0 RW +0x4
- +TLS +0x0+438 0x0+10438 0x0+10438 0x0+1c 0x0+38 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RWE 0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 0x0+1c 0x0+38 R +0x4
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -52,9 +52,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
[0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
[0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
[0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
-[0-9a-f ]+R_PPC_TPREL16 +0+10438 +\.tdata \+ 1044c
-[0-9a-f ]+R_PPC_TPREL16_HA +0+10438 +\.tdata \+ 10450
-[0-9a-f ]+R_PPC_TPREL16_LO +0+10438 +\.tdata \+ 10450
+[0-9a-f ]+R_PPC_TPREL16 +0+1041c +\.tdata \+ 10430
+[0-9a-f ]+R_PPC_TPREL16_HA +0+1041c +\.tdata \+ 10434
+[0-9a-f ]+R_PPC_TPREL16_LO +0+1041c +\.tdata \+ 10434
[0-9a-f ]+R_PPC_DTPMOD32 +0+
[0-9a-f ]+R_PPC_DTPREL32 +0+
[0-9a-f ]+R_PPC_DTPMOD32 +0+
@@ -68,67 +68,66 @@ Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
[0-9a-f ]+R_PPC_JMP_SLOT +0+ +__tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 20 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: 0+3c8 +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: 0+10438 +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: 0+10454 +0 SECTION LOCAL +DEFAULT +8
- +[0-9]+: 0+10454 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+30 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+20 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+34 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +[0-9]+: 0+28 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+24 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+2c +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* NOTYPE +GLOBAL DEFAULT +ABS __end
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
Symbol table '\.symtab' contains 39 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
- +[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+ +0 SECTION LOCAL +DEFAULT +12
- +[0-9]+: 0+ +0 SECTION LOCAL +DEFAULT +13
- +[0-9]+: 0+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: 0+ +0 TLS +LOCAL +DEFAULT +7 gd4
- +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +7 ld4
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +7 ld5
- +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +7 ld6
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +7 ie4
- +[0-9]+: 0+14 +0 TLS +LOCAL +DEFAULT +7 le4
- +[0-9]+: 0+18 +0 TLS +LOCAL +DEFAULT +7 le5
- +[0-9]+: 0+1051c +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+10454 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+30 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+20 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+34 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +[0-9]+: 0+28 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+24 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+2c +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* TLS +LOCAL +DEFAULT +7 gd4
+.* TLS +LOCAL +DEFAULT +7 ld4
+.* TLS +LOCAL +DEFAULT +7 ld5
+.* TLS +LOCAL +DEFAULT +7 ld6
+.* TLS +LOCAL +DEFAULT +7 ie4
+.* TLS +LOCAL +DEFAULT +7 le4
+.* TLS +LOCAL +DEFAULT +7 le5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* NOTYPE +GLOBAL DEFAULT +ABS __end
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
diff --git a/ld/testsuite/ld-powerpc/tlstocso.g b/ld/testsuite/ld-powerpc/tlstocso.g
index 2dfc6b4..b5d7d64 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.g
+++ b/ld/testsuite/ld-powerpc/tlstocso.g
@@ -7,9 +7,9 @@
.*: +file format elf64-powerpc
Contents of section \.got:
- 10760 00000000 00018760 00000000 00000000 .*
- 10770 00000000 00000000 00000000 00000000 .*
- 10780 00000000 00000000 00000000 00000000 .*
- 10790 00000000 00000000 00000000 00000000 .*
- 107a0 00000000 00000000 00000000 00000000 .*
- 107b0 00000000 00000000 .*
+.* 00000000 00018738 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 00000000 00000000 .*
+.* 00000000 00000000 .*
diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
index c2b2ff9..d63136f 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.r
+++ b/ld/testsuite/ld-powerpc/tlstocso.r
@@ -9,21 +9,21 @@ There are 16 section headers.*
Section Headers:
+\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
+\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash +.*
- +\[ 2\] \.dynsym +.*
- +\[ 3\] \.dynstr +.*
- +\[ 4\] \.rela\.dyn +.*
- +\[ 5\] \.rela\.plt +.*
- +\[ 6\] \.text +PROGBITS +0+518 0+518 0+bc 0+ +AX +0 +0 +4
- +\[ 7\] \.tdata +PROGBITS +0+105d8 0+5d8 0+38 0+ WAT +0 +0 +8
- +\[ 8\] \.tbss +NOBITS +0+10610 0+610 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.data\.rel\.ro +PROGBITS .*
- +\[10\] \.dynamic +DYNAMIC +0+10610 0+610 0+150 10 +WA +3 +0 +8
- +\[11\] \.got +PROGBITS +0+10760 0+760 0+58 08 +WA +0 +0 +8
- +\[12\] \.plt +.*
- +\[13\] \.shstrtab +.*
- +\[14\] \.symtab +.*
- +\[15\] \.strtab +.*
+ +\[ 1\] \.hash .*
+ +\[ 2\] \.dynsym .*
+ +\[ 3\] \.dynstr .*
+ +\[ 4\] \.rela\.dyn .*
+ +\[ 5\] \.rela\.plt .*
+ +\[ 6\] \.text .*
+ +\[ 7\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[ 8\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[ 9\] \.data\.rel\.ro .*
+ +\[10\] \.dynamic .*
+ +\[11\] \.got .*
+ +\[12\] \.plt .*
+ +\[13\] \.shstrtab .*
+ +\[14\] \.symtab .*
+ +\[15\] \.strtab .*
#...
Elf file type is DYN \(Shared object file\)
@@ -32,10 +32,10 @@ There are 4 program headers.*
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+5d4 0x0+5d4 R E 0x10000
- +LOAD +0x0+5d8 0x0+105d8 0x0+105d8 0x0+1e0 0x0+210 RW +0x10000
- +DYNAMIC +0x0+610 0x0+10610 0x0+10610 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+5d8 0x0+105d8 0x0+105d8 0x0+38 0x0+70 R +0x8
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+38 0x0+70 R +0x8
Section to Segment mapping:
+Segment Sections\.\.\.
@@ -62,68 +62,67 @@ Relocation section '\.rela\.plt' at offset .* contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
[0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
-Symbol table '\.dynsym' contains 20 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: 0+518 +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: 0+105d8 +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: 0+10610 +0 SECTION LOCAL +DEFAULT +8
- +[0-9]+: 0+10610 +0 SECTION LOCAL +DEFAULT +9
- +[0-9]+: 0+10610 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+40 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+50 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+48 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+38 +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+58 +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
Symbol table '\.symtab' contains 40 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: 0+120 +0 SECTION LOCAL +DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +[0-9]+: 0+518 +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: 0+105d8 +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: 0+10610 +0 SECTION LOCAL +DEFAULT +8
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10
- +[0-9]+: 0+10760 +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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: 0+ +0 TLS +LOCAL +DEFAULT +7 gd4
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +7 ld4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +7 ld5
- +[0-9]+: 0+18 +0 TLS +LOCAL +DEFAULT +7 ld6
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 ie4
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 le4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 le5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +11 \.Lie0
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
- +[0-9]+: 0+10610 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 le0
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+40 +0 TLS +GLOBAL DEFAULT +8 ld0
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 le1
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+50 +0 TLS +GLOBAL DEFAULT +8 ld2
- +[0-9]+: 0+48 +0 TLS +GLOBAL DEFAULT +8 ld1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+38 +0 TLS +GLOBAL DEFAULT +8 gd0
- +[0-9]+: 0+58 +0 TLS +GLOBAL DEFAULT +8 ie0
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* TLS +LOCAL +DEFAULT +7 gd4
+.* TLS +LOCAL +DEFAULT +7 ld4
+.* TLS +LOCAL +DEFAULT +7 ld5
+.* TLS +LOCAL +DEFAULT +7 ld6
+.* TLS +LOCAL +DEFAULT +7 ie4
+.* TLS +LOCAL +DEFAULT +7 le4
+.* TLS +LOCAL +DEFAULT +7 le5
+.* NOTYPE +LOCAL +DEFAULT +11 \.Lie0
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
+.* TLS +GLOBAL DEFAULT +UND gd
+.* TLS +GLOBAL DEFAULT +8 le0
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 ld0
+.* TLS +GLOBAL DEFAULT +8 le1
+.* TLS +GLOBAL DEFAULT +UND ld
+.* NOTYPE +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL DEFAULT +8 ld2
+.* TLS +GLOBAL DEFAULT +8 ld1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL DEFAULT +8 gd0
+.* TLS +GLOBAL DEFAULT +8 ie0
diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index a9a4267..c4439dc 100644
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -10,21 +10,21 @@ There are 16 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- \[ 1\] .interp +.*
- \[ 2\] .hash +.*
- \[ 3\] .dynsym +.*
- \[ 4\] .dynstr +.*
- \[ 5\] .rela.dyn +.*
- \[ 6\] .rela.plt +.*
- \[ 7\] .plt +.*
- \[ 8\] .text +PROGBITS +.*
- \[ 9\] .tdata +PROGBITS +0+401480 0+480 0+60 00 WAT +0 +0 +32
- \[10\] .tbss +NOBITS +0+4014e0 0+4e0 0+40 00 WAT +0 +0 +1
- \[11\] .dynamic +DYNAMIC +0+4014e0 0+4e0 0+a0 08 +WA +4 +0 +4
- \[12\] .got +PROGBITS +0+401580 0+580 0+2c 04 +WA +0 +0 +4
- \[13\] .shstrtab +.*
- \[14\] .symtab +.*
- \[15\] .strtab +.*
+ \[ 1\] .interp .*
+ \[ 2\] .hash .*
+ \[ 3\] .dynsym .*
+ \[ 4\] .dynstr .*
+ \[ 5\] .rela.dyn .*
+ \[ 6\] .rela.plt .*
+ \[ 7\] .plt .*
+ \[ 8\] .text +PROGBITS .*
+ \[ 9\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ \[10\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+ \[11\] .dynamic +DYNAMIC .*
+ \[12\] .got +PROGBITS .*
+ \[13\] .shstrtab .*
+ \[14\] .symtab .*
+ \[15\] .strtab .*
Key to Flags:
.*
.*
@@ -39,10 +39,10 @@ Program Headers:
PHDR +0x0+34 0x0+400034 0x0+400034 0x0+c0 0x0+c0 R E 0x4
INTERP +0x0+f4 0x0+4000f4 0x0+4000f4 0x0+11 0x0+11 R +0x1
.*Requesting program interpreter.*
- LOAD +0x0+ 0x0+400000 0x0+400000 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
- LOAD +0x0+480 0x0+401480 0x0+401480 0x0+12c 0x0+12c RW 0x1000
- DYNAMIC +0x0+4e0 0x0+4014e0 0x0+4014e0 0x0+a0 0x0+a0 RW 0x4
- TLS +0x0+480 0x0+401480 0x0+401480 0x0+60 0x0+a0 R +0x20
+ LOAD .* R E 0x1000
+ LOAD .* RW 0x1000
+ DYNAMIC .* RW 0x4
+ TLS .* 0x0+60 0x0+a0 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -53,97 +53,96 @@ Program Headers:
04 +.dynamic *
05 +.tdata .tbss *
-Relocation section '.rela.dyn' at offset 0x23c contains 4 entries:
+Relocation section '.rela.dyn' at offset .* contains 4 entries:
Offset +Info +Type +Sym.Value Sym. Name \+ Addend
-[0-9a-f]+ 0+138 R_390_TLS_TPOFF +0+ +sG3 \+ 0
-[0-9a-f]+ 0+338 R_390_TLS_TPOFF +0+ +sG2 \+ 0
-[0-9a-f]+ 0+638 R_390_TLS_TPOFF +0+ +sG6 \+ 0
-[0-9a-f]+ 0+738 R_390_TLS_TPOFF +0+ +sG1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG3 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG2 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG6 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG1 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym.Value Sym. Name \+ Addend
-[0-9a-f]+ 0+40b R_390_JMP_SLOT +0+40+298 +__tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG3
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG2
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_offset
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND
+.* TLS +GLOBAL DEFAULT UND sG3
+.* TLS +GLOBAL DEFAULT UND sG2
+.* FUNC +GLOBAL DEFAULT UND __tls_get_offset
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT UND sG6
+.* TLS +GLOBAL DEFAULT UND sG1
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains 68 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8
- +[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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15
- +[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +9 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +9 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +9 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL DEFAULT +9 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL DEFAULT +9 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL DEFAULT +9 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +9 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +9 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL DEFAULT +10 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL DEFAULT +10 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL DEFAULT +10 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL DEFAULT +10 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL DEFAULT +10 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL DEFAULT +10 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL DEFAULT +10 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL DEFAULT +10 bl8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG3
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG6
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL HIDDEN 12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +10 bg4
+.* NOTYPE LOCAL DEFAULT UND
+.* SECTION LOCAL DEFAULT +1
+.* SECTION LOCAL DEFAULT +2
+.* SECTION LOCAL DEFAULT +3
+.* SECTION LOCAL DEFAULT +4
+.* SECTION LOCAL DEFAULT +5
+.* SECTION LOCAL DEFAULT +6
+.* SECTION LOCAL DEFAULT +7
+.* SECTION LOCAL DEFAULT +8
+.* SECTION LOCAL DEFAULT +9
+.* SECTION LOCAL DEFAULT +10
+.* SECTION LOCAL DEFAULT +11
+.* SECTION LOCAL DEFAULT +12
+.* SECTION LOCAL DEFAULT +13
+.* SECTION LOCAL DEFAULT +14
+.* SECTION LOCAL DEFAULT +15
+.* TLS +LOCAL DEFAULT +9 sl1
+.* TLS +LOCAL DEFAULT +9 sl2
+.* TLS +LOCAL DEFAULT +9 sl3
+.* TLS +LOCAL DEFAULT +9 sl4
+.* TLS +LOCAL DEFAULT +9 sl5
+.* TLS +LOCAL DEFAULT +9 sl6
+.* TLS +LOCAL DEFAULT +9 sl7
+.* TLS +LOCAL DEFAULT +9 sl8
+.* TLS +LOCAL DEFAULT +10 bl1
+.* TLS +LOCAL DEFAULT +10 bl2
+.* TLS +LOCAL DEFAULT +10 bl3
+.* TLS +LOCAL DEFAULT +10 bl4
+.* TLS +LOCAL DEFAULT +10 bl5
+.* TLS +LOCAL DEFAULT +10 bl6
+.* TLS +LOCAL DEFAULT +10 bl7
+.* TLS +LOCAL DEFAULT +10 bl8
+.* TLS +GLOBAL DEFAULT UND sG3
+.* TLS +GLOBAL DEFAULT +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT +10 bg3
+.* OBJECT GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +9 sg3
+.* TLS +GLOBAL HIDDEN +9 sh3
+.* TLS +GLOBAL DEFAULT UND sG2
+.* TLS +GLOBAL DEFAULT +9 sg4
+.* TLS +GLOBAL DEFAULT +9 sg5
+.* TLS +GLOBAL DEFAULT +10 bg5
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* FUNC +GLOBAL DEFAULT UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +9 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +9 sh4
+.* TLS +GLOBAL DEFAULT +10 bg7
+.* TLS +GLOBAL HIDDEN +9 sh5
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT UND sG6
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +9 sg2
+.* TLS +GLOBAL DEFAULT UND sG1
+.* TLS +GLOBAL HIDDEN +9 sh1
+.* TLS +GLOBAL DEFAULT +9 sg6
+.* TLS +GLOBAL DEFAULT +9 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* OBJECT GLOBAL HIDDEN 12 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE GLOBAL DEFAULT ABS _end
+.* TLS +GLOBAL HIDDEN +9 sh2
+.* TLS +GLOBAL HIDDEN +9 sh6
+.* TLS +GLOBAL DEFAULT +10 bg2
+.* TLS +GLOBAL DEFAULT +10 bg1
+.* TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index 4855b81..aff1eca 100644
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -10,21 +10,21 @@ There are 16 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- \[ 1\] .interp +.*
- \[ 2\] .hash +.*
- \[ 3\] .dynsym +.*
- \[ 4\] .dynstr +.*
- \[ 5\] .rela.dyn +.*
- \[ 6\] .rela.plt +.*
- \[ 7\] .plt +.*
- \[ 8\] .text +PROGBITS +.*
- \[ 9\] .tdata +PROGBITS +0+800016e0 0+6e0 0+60 00 WAT +0 +0 +32
- \[10\] .tbss +NOBITS +0+80001740 0+740 0+40 00 WAT +0 +0 +1
- \[11\] .dynamic +DYNAMIC +0+80001740 0+740 0+140 10 +WA +4 +0 +8
- \[12\] .got +PROGBITS +0+80001880 0+880 0+78 08 +WA +0 +0 +8
- \[13\] .shstrtab +.*
- \[14\] .symtab +.*
- \[15\] .strtab +.*
+ \[ 1\] .interp .*
+ \[ 2\] .hash .*
+ \[ 3\] .dynsym .*
+ \[ 4\] .dynstr .*
+ \[ 5\] .rela.dyn .*
+ \[ 6\] .rela.plt .*
+ \[ 7\] .plt .*
+ \[ 8\] .text +PROGBITS .*
+ \[ 9\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ \[10\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+ \[11\] .dynamic +DYNAMIC .*
+ \[12\] .got +PROGBITS .*
+ \[13\] .shstrtab .*
+ \[14\] .symtab .*
+ \[15\] .strtab .*
Key to Flags:
.*
.*
@@ -39,10 +39,10 @@ Program Headers:
PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+150 0x0+150 R E 0x8
INTERP +0x0+190 0x0+80000190 0x0+80000190 0x0+11 0x0+11 R +0x1
.*Requesting program interpreter.*
- LOAD +0x0+ 0x0+80000000 0x0+80000000 0x0+6e0 0x0+6e0 R E 0x1000
- LOAD +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+218 0x0+218 RW 0x1000
- DYNAMIC +0x0+740 0x0+80001740 0x0+80001740 0x0+140 0x0+140 RW 0x8
- TLS +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+60 0x0+a0 R +0x20
+ LOAD .* R E 0x1000
+ LOAD .* RW 0x1000
+ DYNAMIC .* RW 0x8
+ TLS .* 0x0+60 0x0+a0 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -55,95 +55,94 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+10+38 R_390_TLS_TPOFF +0+ sG3 \+ 0
-[0-9a-f]+ +0+30+38 R_390_TLS_TPOFF +0+ sG2 \+ 0
-[0-9a-f]+ +0+60+38 R_390_TLS_TPOFF +0+ sG6 \+ 0
-[0-9a-f]+ +0+70+38 R_390_TLS_TPOFF +0+ sG1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG3 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG2 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG6 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG1 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+40+b R_390_JMP_SLOT +0+80+408 __tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_offset
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __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 +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* TLS +GLOBAL DEFAULT +UND sG3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_offset
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains 68 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
- +[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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +9 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +9 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +9 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +9 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +9 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +9 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +9 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +9 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL +DEFAULT +10 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +10 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +10 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +10 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +10 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +10 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +10 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +10 bl8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG3
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +10 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND
+.* SECTION LOCAL +DEFAULT +1
+.* SECTION LOCAL +DEFAULT +2
+.* SECTION LOCAL +DEFAULT +3
+.* SECTION LOCAL +DEFAULT +4
+.* SECTION LOCAL +DEFAULT +5
+.* SECTION LOCAL +DEFAULT +6
+.* SECTION LOCAL +DEFAULT +7
+.* SECTION LOCAL +DEFAULT +8
+.* SECTION LOCAL +DEFAULT +9
+.* SECTION LOCAL +DEFAULT +10
+.* SECTION LOCAL +DEFAULT +11
+.* SECTION LOCAL +DEFAULT +12
+.* SECTION LOCAL +DEFAULT +13
+.* SECTION LOCAL +DEFAULT +14
+.* SECTION LOCAL +DEFAULT +15
+.* TLS +LOCAL +DEFAULT +9 sl1
+.* TLS +LOCAL +DEFAULT +9 sl2
+.* TLS +LOCAL +DEFAULT +9 sl3
+.* TLS +LOCAL +DEFAULT +9 sl4
+.* TLS +LOCAL +DEFAULT +9 sl5
+.* TLS +LOCAL +DEFAULT +9 sl6
+.* TLS +LOCAL +DEFAULT +9 sl7
+.* TLS +LOCAL +DEFAULT +9 sl8
+.* TLS +LOCAL +DEFAULT +10 bl1
+.* TLS +LOCAL +DEFAULT +10 bl2
+.* TLS +LOCAL +DEFAULT +10 bl3
+.* TLS +LOCAL +DEFAULT +10 bl4
+.* TLS +LOCAL +DEFAULT +10 bl5
+.* TLS +LOCAL +DEFAULT +10 bl6
+.* TLS +LOCAL +DEFAULT +10 bl7
+.* TLS +LOCAL +DEFAULT +10 bl8
+.* TLS +GLOBAL DEFAULT +UND sG3
+.* TLS +GLOBAL DEFAULT +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT +10 bg3
+.* OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +9 sg3
+.* TLS +GLOBAL HIDDEN +9 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +9 sg4
+.* TLS +GLOBAL DEFAULT +9 sg5
+.* TLS +GLOBAL DEFAULT +10 bg5
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +9 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +9 sh4
+.* TLS +GLOBAL DEFAULT +10 bg7
+.* TLS +GLOBAL HIDDEN +9 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +9 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +9 sh1
+.* TLS +GLOBAL DEFAULT +9 sg6
+.* TLS +GLOBAL DEFAULT +9 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL HIDDEN +12 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +9 sh2
+.* TLS +GLOBAL HIDDEN +9 sh6
+.* TLS +GLOBAL DEFAULT +10 bg2
+.* TLS +GLOBAL DEFAULT +10 bg1
+.* TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index fd0a5aa..c8ddd91 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -10,20 +10,20 @@ There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 0
- \[ 1\] .hash +.*
- \[ 2\] .dynsym +.*
- \[ 3\] .dynstr +.*
- \[ 4\] .rela.dyn +.*
- \[ 5\] .rela.plt +.*
- \[ 6\] .plt +.*
- \[ 7\] .text +PROGBITS +.*
- \[ 8\] .tdata +PROGBITS +0+15c0 0+5c0 0+60 00 WAT 0 +0 32
- \[ 9\] .tbss +NOBITS +0+1620 0+620 0+20 00 WAT 0 +0 1
- \[10\] .dynamic +DYNAMIC +0+1620 0+620 0+98 08 WA 3 +0 4
- \[11\] .got +PROGBITS +0+16b8 0+6b8 0+58 04 WA 0 +0 4
- \[12\] .shstrtab +.*
- \[13\] .symtab +.*
- \[14\] .strtab +.*
+ \[ 1\] .hash .*
+ \[ 2\] .dynsym .*
+ \[ 3\] .dynstr .*
+ \[ 4\] .rela.dyn .*
+ \[ 5\] .rela.plt .*
+ \[ 6\] .plt .*
+ \[ 7\] .text +PROGBITS .*
+ \[ 8\] .tdata +PROGBITS .* 0+60 00 WAT 0 +0 32
+ \[ 9\] .tbss +NOBITS .* 0+20 00 WAT 0 +0 1
+ \[10\] .dynamic +DYNAMIC .*
+ \[11\] .got +PROGBITS .*
+ \[12\] .shstrtab .*
+ \[13\] .symtab .*
+ \[14\] .strtab .*
Key to Flags:
.*
.*
@@ -35,10 +35,10 @@ There are 4 program headers, starting at offset [0-9]+
Program Headers:
Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz Flg Align
- LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
- LOAD +0x0+5c0 0x0+15c0 0x0+15c0 0x00150 0x00150 RW 0x1000
- DYNAMIC +0x0+620 0x0+1620 0x0+1620 0x0+98 0x0+98 RW 0x4
- TLS +0x0+5c0 0x0+15c0 0x0+15c0 0x0+60 0x0+80 R +0x20
+ LOAD .* R E 0x1000
+ LOAD .* RW 0x1000
+ DYNAMIC .* RW 0x4
+ TLS .* 0x0+60 0x0+80 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -49,101 +49,98 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
Offset +Info +Type +Sym.Value Sym. Name \+ Addend
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+24
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+30
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+64
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+50
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+70
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+44
-[0-9a-f]+ 0+a38 R_390_TLS_TPOFF +0+10 +sg5 \+ 0
-[0-9a-f]+ 0+c36 R_390_TLS_DTPMOD 0+ +sg1 \+ 0
-[0-9a-f]+ 0+c37 R_390_TLS_DTPOFF 0+ +sg1 \+ 0
-[0-9a-f]+ 0+f38 R_390_TLS_TPOFF +0+4 +sg2 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+24
+[0-9a-f ]+R_390_TLS_TPOFF +0+30
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+64
+[0-9a-f ]+R_390_TLS_TPOFF +0+50
+[0-9a-f ]+R_390_TLS_TPOFF +0+70
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_TPOFF +0+10 +sg5 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD 0+ +sg1 \+ 0
+[0-9a-f ]+R_390_TLS_DTPOFF 0+ +sg1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+4 +sg2 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym.Value Sym. Name \+ Addend
-[0-9a-f]+ 0+b0b R_390_JMP_SLOT +0+ +__tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT +0+ +__tls_get_offset \+ 0
-Symbol table '.dynsym' contains 20 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_offset
- +[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 ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND
+.* SECTION LOCAL DEFAULT +7
+.* SECTION LOCAL DEFAULT +8
+.* SECTION LOCAL DEFAULT +9
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains 54 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8
- +[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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14
- +[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +8 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +8 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL HIDDEN +9 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL HIDDEN +8 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL HIDDEN +9 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL HIDDEN +9 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL HIDDEN +8 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL HIDDEN +8 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL HIDDEN +9 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL HIDDEN +8 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL HIDDEN +9 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL HIDDEN +8 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL HIDDEN +9 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL HIDDEN +9 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL HIDDEN +9 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL HIDDEN +8 sh1
- +[0-9]+: [0-9a-f]+ +0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL HIDDEN +8 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL HIDDEN +8 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_offset
- +[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 ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND
+.* SECTION LOCAL DEFAULT +1
+.* SECTION LOCAL DEFAULT +2
+.* SECTION LOCAL DEFAULT +3
+.* SECTION LOCAL DEFAULT +4
+.* SECTION LOCAL DEFAULT +5
+.* SECTION LOCAL DEFAULT +6
+.* SECTION LOCAL DEFAULT +7
+.* SECTION LOCAL DEFAULT +8
+.* SECTION LOCAL DEFAULT +9
+.* SECTION LOCAL DEFAULT +10
+.* SECTION LOCAL DEFAULT +11
+.* SECTION LOCAL DEFAULT +12
+.* SECTION LOCAL DEFAULT +13
+.* SECTION LOCAL DEFAULT +14
+.* TLS +LOCAL DEFAULT +8 sl1
+.* TLS +LOCAL DEFAULT +8 sl2
+.* TLS +LOCAL DEFAULT +8 sl3
+.* TLS +LOCAL DEFAULT +8 sl4
+.* TLS +LOCAL DEFAULT +8 sl5
+.* TLS +LOCAL DEFAULT +8 sl6
+.* TLS +LOCAL DEFAULT +8 sl7
+.* TLS +LOCAL DEFAULT +8 sl8
+.* TLS +LOCAL HIDDEN +9 sH1
+.* OBJECT LOCAL HIDDEN ABS _DYNAMIC
+.* TLS +LOCAL HIDDEN +8 sh3
+.* TLS +LOCAL HIDDEN +9 sH2
+.* TLS +LOCAL HIDDEN +9 sH7
+.* TLS +LOCAL HIDDEN +8 sh7
+.* TLS +LOCAL HIDDEN +8 sh8
+.* TLS +LOCAL HIDDEN +9 sH4
+.* TLS +LOCAL HIDDEN +8 sh4
+.* TLS +LOCAL HIDDEN +9 sH3
+.* TLS +LOCAL HIDDEN +8 sh5
+.* TLS +LOCAL HIDDEN +9 sH5
+.* TLS +LOCAL HIDDEN +9 sH6
+.* TLS +LOCAL HIDDEN +9 sH8
+.* TLS +LOCAL HIDDEN +8 sh1
+.* OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL HIDDEN +8 sh2
+.* TLS +LOCAL HIDDEN +8 sh6
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index 6d7cbd8..ec6b5a3 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -10,20 +10,20 @@ There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- \[ 1\] .hash +.*
- \[ 2\] .dynsym +.*
- \[ 3\] .dynstr +.*
- \[ 4\] .rela.dyn +.*
- \[ 5\] .rela.plt +.*
- \[ 6\] .plt +.*
- \[ 7\] .text +PROGBITS +.*
- \[ 8\] .tdata +PROGBITS +0+18c0 0+8c0 0+60 00 WAT +0 +0 +32
- \[ 9\] .tbss +NOBITS +0+1920 0+920 0+20 00 WAT +0 +0 +1
- \[10\] .dynamic +DYNAMIC +0+1920 0+920 0+130 10 +WA +3 +0 +8
- \[11\] .got +PROGBITS +0+1a50 0+a50 0+b0 08 +WA +0 +0 +8
- \[12\] .shstrtab +.*
- \[13\] .symtab +.*
- \[14\] .strtab +.*
+ \[ 1\] .hash .*
+ \[ 2\] .dynsym .*
+ \[ 3\] .dynstr .*
+ \[ 4\] .rela.dyn .*
+ \[ 5\] .rela.plt .*
+ \[ 6\] .plt .*
+ \[ 7\] .text +PROGBITS .*
+ \[ 8\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ \[ 9\] .tbss +NOBITS .* 0+20 00 WAT +0 +0 +1
+ \[10\] .dynamic +DYNAMIC .*
+ \[11\] .got +PROGBITS .*
+ \[12\] .shstrtab .*
+ \[13\] .symtab .*
+ \[14\] .strtab .*
Key to Flags:
.*
.*
@@ -35,10 +35,10 @@ There are 4 program headers, starting at offset [0-9]+
Program Headers:
Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
- LOAD +0x0+8c0 0x0+18c0 0x0+18c0 0x0+240 0x0+240 RW +0x1000
- DYNAMIC +0x0+920 0x0+1920 0x0+1920 0x0+130 0x0+130 RW +0x8
- TLS +0x0+8c0 0x0+18c0 0x0+18c0 0x0+60 0x0+80 R +0x20
+ LOAD .* R E 0x1000
+ LOAD .* RW +0x1000
+ DYNAMIC .* RW +0x8
+ TLS .* 0x0+60 0x0+80 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -49,101 +49,98 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+24
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+30
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+64
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+50
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+70
-[0-9a-f]+ 0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+ 0+38 R_390_TLS_TPOFF +0+44
-[0-9a-f]+ 0+a0+38 R_390_TLS_TPOFF +0+10 sg5 \+ 0
-[0-9a-f]+ 0+c0+36 R_390_TLS_DTPMOD +0+ sg1 \+ 0
-[0-9a-f]+ 0+c0+37 R_390_TLS_DTPOFF +0+ sg1 \+ 0
-[0-9a-f]+ 0+f0+38 R_390_TLS_TPOFF +0+4 sg2 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+24
+[0-9a-f ]+R_390_TLS_TPOFF +0+30
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+64
+[0-9a-f ]+R_390_TLS_TPOFF +0+50
+[0-9a-f ]+R_390_TLS_TPOFF +0+70
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_TPOFF +0+10 sg5 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+ sg1 \+ 0
+[0-9a-f ]+R_390_TLS_DTPOFF +0+ sg1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+4 sg2 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-[0-9a-f]+ 0+b0+b R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
-Symbol table '.dynsym' contains 20 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_offset
- +[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 ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND
+.* SECTION LOCAL DEFAULT +7
+.* SECTION LOCAL DEFAULT +8
+.* SECTION LOCAL DEFAULT +9
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains 54 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +2
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +3
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +4
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8
- +[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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14
- +[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +8 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +8 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL HIDDEN +9 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL HIDDEN +8 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL HIDDEN +9 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL HIDDEN +9 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL HIDDEN +8 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL HIDDEN +8 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL HIDDEN +9 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL HIDDEN +8 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL HIDDEN +9 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL HIDDEN +8 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL HIDDEN +9 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL HIDDEN +9 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL HIDDEN +9 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL HIDDEN +8 sh1
- +[0-9]+: [0-9a-f]+ +0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL HIDDEN +8 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL HIDDEN +8 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_offset
- +[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 ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND
+.* SECTION LOCAL DEFAULT +1
+.* SECTION LOCAL DEFAULT +2
+.* SECTION LOCAL DEFAULT +3
+.* SECTION LOCAL DEFAULT +4
+.* SECTION LOCAL DEFAULT +5
+.* SECTION LOCAL DEFAULT +6
+.* SECTION LOCAL DEFAULT +7
+.* SECTION LOCAL DEFAULT +8
+.* SECTION LOCAL DEFAULT +9
+.* SECTION LOCAL DEFAULT +10
+.* SECTION LOCAL DEFAULT +11
+.* SECTION LOCAL DEFAULT +12
+.* SECTION LOCAL DEFAULT +13
+.* SECTION LOCAL DEFAULT +14
+.* TLS +LOCAL DEFAULT +8 sl1
+.* TLS +LOCAL DEFAULT +8 sl2
+.* TLS +LOCAL DEFAULT +8 sl3
+.* TLS +LOCAL DEFAULT +8 sl4
+.* TLS +LOCAL DEFAULT +8 sl5
+.* TLS +LOCAL DEFAULT +8 sl6
+.* TLS +LOCAL DEFAULT +8 sl7
+.* TLS +LOCAL DEFAULT +8 sl8
+.* TLS +LOCAL HIDDEN +9 sH1
+.* OBJECT LOCAL HIDDEN ABS _DYNAMIC
+.* TLS +LOCAL HIDDEN +8 sh3
+.* TLS +LOCAL HIDDEN +9 sH2
+.* TLS +LOCAL HIDDEN +9 sH7
+.* TLS +LOCAL HIDDEN +8 sh7
+.* TLS +LOCAL HIDDEN +8 sh8
+.* TLS +LOCAL HIDDEN +9 sH4
+.* TLS +LOCAL HIDDEN +8 sh4
+.* TLS +LOCAL HIDDEN +9 sH3
+.* TLS +LOCAL HIDDEN +8 sh5
+.* TLS +LOCAL HIDDEN +9 sH5
+.* TLS +LOCAL HIDDEN +9 sH6
+.* TLS +LOCAL HIDDEN +9 sH8
+.* TLS +LOCAL HIDDEN +8 sh1
+.* OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL HIDDEN +8 sh2
+.* TLS +LOCAL HIDDEN +8 sh6
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd
index a267d31..03f1b01 100644
--- a/ld/testsuite/ld-sh/sh64/abi32.xd
+++ b/ld/testsuite/ld-sh/sh64/abi32.xd
@@ -17,25 +17,13 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 \.text 00000064 0+1000 0+1000 00000100 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.ctors 00000000 0+10e8 0+10e8 00000184 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0+10e8 0+10e8 00000184 2\*\*0
- CONTENTS
- 3 \.data 00000018 0+10e8 0+10e8 00000168 2\*\*2
+ 1 \.data 00000018 0+10e8 0+10e8 00000168 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 4 \.sbss 00000000 0+1100 0+1100 00000184 2\*\*0
- CONTENTS
- 5 \.bss 00000000 0+1100 0+1100 00000180 2\*\*0
- ALLOC
- 6 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
-0+10e8 l d \.ctors 0+ (|\.ctors)
-0+10e8 l d \.dtors 0+ (|\.dtors)
0+10e8 l d \.data 0+ (|\.data)
-0+1100 l d \.sbss 0+ (|\.sbss)
-0+1100 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -45,16 +33,16 @@ SYMBOL TABLE:
0+1060 l \.text 0+ 0x04 plugh
0+10f8 g \.data 0+ foobar
0+10e8 g \.data 0+ baz
-0+10e8 g \.dtors 0+ ___dtors
+0+10e8 g \*ABS\* 0+ ___dtors
0+105c g \.text 0+ 0x04 xyzzy
0+1100 g \*ABS\* 0+ __bss_start
-0+10e8 g \.ctors 0+ ___ctors_end
+0+10e8 g \*ABS\* 0+ ___ctors_end
0+10f0 g \.data 0+ baz2
-0+10e8 g \.ctors 0+ ___ctors
+0+10e8 g \*ABS\* 0+ ___ctors
0+1000 g \.text 0+ 0x04 foo
0+1100 g \*ABS\* 0+ _edata
0+1100 g \*ABS\* 0+ _end
0+1010 g \.text 0+ 0x04 start
0+100c g \.text 0+ 0x04 bar
0+80000 g \.stack 0+ _stack
-0+10e8 g \.dtors 0+ ___dtors_end
+0+10e8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd
index 56e883c..fdfafb0 100644
--- a/ld/testsuite/ld-sh/sh64/abi64.xd
+++ b/ld/testsuite/ld-sh/sh64/abi64.xd
@@ -16,25 +16,13 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 \.text 000000ac 0000000000001000 0000000000001000 00000100 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.ctors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0
- CONTENTS
- 3 \.data 00000018 0000000000001130 0000000000001130 000001b0 2\*\*2
+ 1 \.data 00000018 0000000000001130 0000000000001130 000001b0 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 4 \.sbss 00000000 0000000000001148 0000000000001148 00000204 2\*\*0
- CONTENTS
- 5 \.bss 00000000 0000000000001148 0000000000001148 000001c8 2\*\*0
- ALLOC
- 6 \.stack 00000004 0000000000080000 0000000000080000 00000200 2\*\*0
+ 2 \.stack 00000004 0000000000080000 0000000000080000 00000200 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0000000000001000 l d \.text 0000000000000000 (|\.text)
-0000000000001130 l d \.ctors 0000000000000000 (|\.ctors)
-0000000000001130 l d \.dtors 0000000000000000 (|\.dtors)
0000000000001130 l d \.data 0000000000000000 (|\.data)
-0000000000001148 l d \.sbss 0000000000000000 (|\.sbss)
-0000000000001148 l d \.bss 0000000000000000 (|\.bss)
0000000000080000 l d \.stack 0000000000000000 (|\.stack)
0000000000000000 l d \*ABS\* 0000000000000000 (|\.shstrtab)
0000000000000000 l d \*ABS\* 0000000000000000 (|\.symtab)
@@ -44,16 +32,16 @@ SYMBOL TABLE:
00000000000010a8 l \.text 0000000000000000 0x04 plugh
0000000000001140 g \.data 0000000000000000 foobar
0000000000001130 g \.data 0000000000000000 baz
-0000000000001130 g \.dtors 0000000000000000 ___dtors
+0000000000001130 g \*ABS\* 0000000000000000 ___dtors
00000000000010a4 g \.text 0000000000000000 0x04 xyzzy
0000000000001148 g \*ABS\* 0000000000000000 __bss_start
-0000000000001130 g \.ctors 0000000000000000 ___ctors_end
+0000000000001130 g \*ABS\* 0000000000000000 ___ctors_end
0000000000001138 g \.data 0000000000000000 baz2
-0000000000001130 g \.ctors 0000000000000000 ___ctors
+0000000000001130 g \*ABS\* 0000000000000000 ___ctors
0000000000001000 g \.text 0000000000000000 0x04 foo
0000000000001148 g \*ABS\* 0000000000000000 _edata
0000000000001148 g \*ABS\* 0000000000000000 _end
0000000000001018 g \.text 0000000000000000 0x04 start
0000000000001014 g \.text 0000000000000000 0x04 bar
0000000000080000 g \.stack 0000000000000000 _stack
-0000000000001130 g \.dtors 0000000000000000 ___dtors_end
+0000000000001130 g \*ABS\* 0000000000000000 ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd
index f5e6224..e1beb14 100644
--- a/ld/testsuite/ld-sh/sh64/cmpct1.xd
+++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd
@@ -6,51 +6,34 @@ EXEC_P, HAS_SYMS, D_PAGED
start address 0x0+1000
Program Header:
- LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
+ LOAD off 0x0+80 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+14 memsz 0x0+14 flags r-x
- LOAD off 0x0+118 vaddr 0x0+1098 paddr 0x0+1098 align 2\*\*7
- filesz 0x0+ memsz 0x0+ flags rw-
- LOAD off 0x0+180 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
+ LOAD off 0x0+100 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x00000004 memsz 0x00000004 flags rw-
Sections:
Idx Name Size VMA LMA File off Algn
- 0 \.text 00000008 0+1000 0+1000 00000100 2\*\*0
+ 0 \.text 00000008 0+1000 0+1000 00000080 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.rodata 0000000c 0+1008 0+1008 00000108 2\*\*2
+ 1 \.rodata 0000000c 0+1008 0+1008 00000088 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.ctors 00000000 0+1098 0+1098 00000184 2\*\*0
- CONTENTS
- 3 \.dtors 00000000 0+1098 0+1098 00000184 2\*\*0
- CONTENTS
- 4 \.data 00000000 0+1098 0+1098 00000118 2\*\*0
- CONTENTS, ALLOC, LOAD, DATA
- 5 \.sbss 00000000 0+1098 0+1098 00000184 2\*\*0
- CONTENTS
- 6 \.bss 00000000 0+1098 0+1098 00000118 2\*\*0
- ALLOC
- 7 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000100 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1008 l d \.rodata 0+ (|\.rodata)
-0+1098 l d \.ctors 0+ (|\.ctors)
-0+1098 l d \.dtors 0+ (|\.dtors)
-0+1098 l d \.data 0+ (|\.data)
-0+1098 l d \.sbss 0+ (|\.sbss)
-0+1098 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
0+ l d \*ABS\* 0+ (|\.strtab)
0+1004 l \.text 0+ next
0+100c l \.rodata 0+ here
-0+1098 g \.dtors 0+ ___dtors
+0+1098 g \*ABS\* 0+ ___dtors
0+1098 g \*ABS\* 0+ __bss_start
-0+1098 g \.ctors 0+ ___ctors_end
-0+1098 g \.ctors 0+ ___ctors
+0+1098 g \*ABS\* 0+ ___ctors_end
+0+1098 g \*ABS\* 0+ ___ctors
0+1098 g \*ABS\* 0+ _edata
0+1098 g \*ABS\* 0+ _end
0+1000 g \.text 0+ start
0+80000 g \.stack 0+ _stack
-0+1098 g \.dtors 0+ ___dtors_end
+0+1098 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd
index 1c927ca..52b7bd1 100644
--- a/ld/testsuite/ld-sh/sh64/crange1.rd
+++ b/ld/testsuite/ld-sh/sh64/crange1.rd
@@ -1,20 +1,15 @@
-There are 13 section headers, starting at offset 0x1f8:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 0\] NULL 00000000 000000 000000 00 0 0 0
- \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4
- \[ 2\] \.text PROGBITS 00001004 000104 000018 00 AXp 0 0 4
- \[ 3\] \.ctors PROGBITS 000010a0 000184 000000 00 W 0 0 1
- \[ 4\] \.dtors PROGBITS 000010a0 000184 000000 00 W 0 0 1
- \[ 5\] \.data PROGBITS 000010a0 000120 000000 00 WA 0 0 1
- \[ 6\] \.sbss PROGBITS 000010a0 000184 000000 00 W 0 0 1
- \[ 7\] \.bss NOBITS 000010a0 000120 000000 00 WA 0 0 1
- \[ 8\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
- \[ 9\] \.cranges LOUSER\+1 00000000 000184 00001e 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 0001a2 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 000400 000180 10 12 14 4
- \[12\] \.strtab STRTAB 00000000 000580 000064 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 000018 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000100 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000104 00001e 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
@@ -22,32 +17,27 @@ Key to Flags:
There are no relocations in this file\.
-Symbol table '\.symtab' contains 24 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 000010a0 0 SECTION LOCAL DEFAULT 3
- 4: 000010a0 0 SECTION LOCAL DEFAULT 4
- 5: 000010a0 0 SECTION LOCAL DEFAULT 5
- 6: 000010a0 0 SECTION LOCAL DEFAULT 6
- 7: 000010a0 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
- 14: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors
- 15: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 16: 000010a0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 17: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 18: 000010a0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors
- 19: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _edata
- 20: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _end
- 21: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
- 22: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack
- 23: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors_end
Hex dump of section '\.init':
0x00001000 6ff0fff0 .*
diff --git a/ld/testsuite/ld-sh/sh64/crange2.rd b/ld/testsuite/ld-sh/sh64/crange2.rd
index 281223d..dac8f9b 100644
--- a/ld/testsuite/ld-sh/sh64/crange2.rd
+++ b/ld/testsuite/ld-sh/sh64/crange2.rd
@@ -1,20 +1,15 @@
-There are 13 section headers, starting at offset 0x220:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 0\] NULL 00000000 000000 000000 00 0 0 0
- \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4
- \[ 2\] \.text PROGBITS 00001004 000104 00005c 00 AXp 0 0 4
- \[ 3\] \.ctors PROGBITS 000010e0 000184 000000 00 W 0 0 1
- \[ 4\] \.dtors PROGBITS 000010e0 000184 000000 00 W 0 0 1
- \[ 5\] \.data PROGBITS 000010e0 000160 000000 00 WA 0 0 1
- \[ 6\] \.sbss PROGBITS 000010e0 000184 000000 00 W 0 0 1
- \[ 7\] \.bss NOBITS 000010e0 000160 000000 00 WA 0 0 1
- \[ 8\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
- \[ 9\] \.cranges LOUSER\+1 00000000 000184 000046 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 0001ca 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 000428 0001c0 10 12 18 4
- \[12\] \.strtab STRTAB 00000000 0005e8 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 00005c 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000100 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000104 000046 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
@@ -22,36 +17,31 @@ Key to Flags:
There are no relocations in this file\.
-Symbol table '\.symtab' contains 28 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 000010e0 0 SECTION LOCAL DEFAULT 3
- 4: 000010e0 0 SECTION LOCAL DEFAULT 4
- 5: 000010e0 0 SECTION LOCAL DEFAULT 5
- 6: 000010e0 0 SECTION LOCAL DEFAULT 6
- 7: 000010e0 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
- 14: 0000101c 0 NOTYPE LOCAL DEFAULT 2 sec1
- 15: 0000102c 0 NOTYPE LOCAL DEFAULT 2 sec2
- 16: 00001040 0 NOTYPE LOCAL DEFAULT 2 sec3
- 17: 00001048 0 NOTYPE LOCAL DEFAULT 2 sec4
- 18: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors
- 19: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 20: 000010e0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 21: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 22: 000010e0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors
- 23: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _edata
- 24: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _end
- 25: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
- 26: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack
- 27: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 0000101c 0 NOTYPE LOCAL DEFAULT 2 sec1
+.*: 0000102c 0 NOTYPE LOCAL DEFAULT 2 sec2
+.*: 00001040 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 00001048 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 0000002a .*
diff --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
index 8ff9691..674a913 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
@@ -10,64 +10,54 @@ ELF Header:
Version: 0x1
Entry point address: 0x10c4
Start of program headers: 52 \(bytes into file\)
- Start of section headers: 664 \(bytes into file\)
+ Start of section headers: 504 \(bytes into file\)
Flags: 0xa, sh5
Size of this header: 52 \(bytes\)
Size of program headers: 32 \(bytes\)
- Number of program headers: 3
+ Number of program headers: 2
Size of section headers: 40 \(bytes\)
- Number of section headers: 13
- Section header string table index: 10
+ Number of section headers: 8
+ Section header string table index: 5
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 0\] NULL 00000000 000000 000000 00 0 0 0
- \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4
- \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4
- \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
- 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
- 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
- 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors
- 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
- 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
- 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
- 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack
- 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd
index 51d0a95..c5f2be4 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd
@@ -10,64 +10,54 @@ ELF Header:
Version: 0x1
Entry point address: 0x10a5
Start of program headers: 52 \(bytes into file\)
- Start of section headers: 664 \(bytes into file\)
+ Start of section headers: 504 \(bytes into file\)
Flags: 0xa, sh5
Size of this header: 52 \(bytes\)
Size of program headers: 32 \(bytes\)
- Number of program headers: 3
+ Number of program headers: 2
Size of section headers: 40 \(bytes\)
- Number of section headers: 13
- Section header string table index: 10
+ Number of section headers: 8
+ Section header string table index: 5
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 0\] NULL 00000000 000000 000000 00 0 0 0
- \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4
- \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4
- \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
- 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
- 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
- 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors
- 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
- 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
- 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
- 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack
- 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff --git a/ld/testsuite/ld-sh/sh64/crange3.rd b/ld/testsuite/ld-sh/sh64/crange3.rd
index c55b9e2..0341254 100644
--- a/ld/testsuite/ld-sh/sh64/crange3.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3.rd
@@ -1,54 +1,44 @@
-There are 13 section headers, starting at offset 0x298:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 0\] NULL 00000000 000000 000000 00 0 0 0
- \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4
- \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4
- \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1
- \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1
- \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
- 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
- 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
- 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors
- 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
- 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
- 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
- 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack
- 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff --git a/ld/testsuite/ld-sh/sh64/gotplt.d b/ld/testsuite/ld-sh/sh64/gotplt.d
index 89a401a..5822326 100644
--- a/ld/testsuite/ld-sh/sh64/gotplt.d
+++ b/ld/testsuite/ld-sh/sh64/gotplt.d
@@ -7,6 +7,6 @@
# Make sure that gotplt relocations of forced local symbols
# use the GOT.
-Relocation section '\.rela\.dyn' at offset 0x270 contains 1 entries:
+Relocation section '\.rela\.dyn' at offset .* contains 1 entries:
Offset Info Type Sym\.Value Sym\. Name \+ Addend
-0000039c 000000a5 R_SH_RELATIVE 0000027c
+[0-9a-f ]+R_SH_RELATIVE[0-9a-f ]+
diff --git a/ld/testsuite/ld-sh/sh64/init-cmpct.d b/ld/testsuite/ld-sh/sh64/init-cmpct.d
index b9f1731..6f64bc4 100644
--- a/ld/testsuite/ld-sh/sh64/init-cmpct.d
+++ b/ld/testsuite/ld-sh/sh64/init-cmpct.d
@@ -7,14 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is not set
# when _init and _fini are SHcompact code.
-Dynamic section at offset 0x228 contains 8 entries:
+Dynamic section at offset .* contains 8 entries:
Tag Type Name/Value
- 0x0000000c \(INIT\) 0x216
- 0x0000000d \(FINI\) 0x21e
- 0x00000004 \(HASH\) 0x94
- 0x00000005 \(STRTAB\) 0x1c0
- 0x00000006 \(SYMTAB\) 0xe0
- 0x0000000a \(STRSZ\) 85 \(bytes\)
- 0x0000000b \(SYMENT\) 16 \(bytes\)
- 0x00000000 \(NULL\) 0x0
-
+ 0x0000000c \(INIT\) .*[02468ace]
+ 0x0000000d \(FINI\) .*[02468ace]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/init-media.d b/ld/testsuite/ld-sh/sh64/init-media.d
index 4e0e585..56c6c19 100644
--- a/ld/testsuite/ld-sh/sh64/init-media.d
+++ b/ld/testsuite/ld-sh/sh64/init-media.d
@@ -7,13 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is set
# when _init and _fini are SHmedia code.
-Dynamic section at offset 0x238 contains 8 entries:
+.*
Tag Type Name/Value
- 0x0000000c \(INIT\) 0x217
- 0x0000000d \(FINI\) 0x227
- 0x00000004 \(HASH\) 0x94
- 0x00000005 \(STRTAB\) 0x1c0
- 0x00000006 \(SYMTAB\) 0xe0
- 0x0000000a \(STRSZ\) 85 \(bytes\)
- 0x0000000b \(SYMENT\) 16 \(bytes\)
- 0x00000000 \(NULL\) 0x0
+ 0x0000000c \(INIT\) .*[13579bdf]
+ 0x0000000d \(FINI\) .*[13579bdf]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/init64.d b/ld/testsuite/ld-sh/sh64/init64.d
index c32a76f..01c8e97 100644
--- a/ld/testsuite/ld-sh/sh64/init64.d
+++ b/ld/testsuite/ld-sh/sh64/init64.d
@@ -7,13 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is set
# when _init and _fini are SHmedia code.
-Dynamic section at offset 0x300 contains 8 entries:
+.*
Tag Type Name/Value
- 0x000000000000000c \(INIT\) 0x2df
- 0x000000000000000d \(FINI\) 0x2ef
- 0x0000000000000004 \(HASH\) 0xe8
- 0x0000000000000005 \(STRTAB\) 0x288
- 0x0000000000000006 \(SYMTAB\) 0x138
- 0x000000000000000a \(STRSZ\) 85 \(bytes\)
- 0x000000000000000b \(SYMENT\) 24 \(bytes\)
- 0x0000000000000000 \(NULL\) 0x0
+ 0x000000000000000c \(INIT\) .*[13579bdf]
+ 0x000000000000000d \(FINI\) .*[13579bdf]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
index ea17531..ae82c45 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.xd
+++ b/ld/testsuite/ld-sh/sh64/mix1.xd
@@ -9,34 +9,22 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+48 memsz 0x0+48 flags r-x
LOAD off 0x0+148 vaddr 0x0+10c8 paddr 0x0+10c8 align 2\*\*7
- filesz 0x0+c memsz 0x0+10 flags rw-
+ filesz 0x0+c memsz 0x0+c flags rw-
LOAD off 0x0+180 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x0+4 memsz 0x0+4 flags rw-
Sections:
Idx Name Size VMA LMA File off Algn
0 \.text 00000048 0+1000 0+1000 00000100 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 3 \.data 0000000c 0+10c8 0+10c8 00000148 2\*\*2
+ 1 \.data 0000000c 0+10c8 0+10c8 00000148 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 4 \.sbss 00000000 0+10d8 0+10d8 00000184 2\*\*0
- CONTENTS
- 5 \.bss 00000000 0+10d8 0+10d8 00000154 2\*\*0
- ALLOC
- 6 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
- 7 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
+ 3 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
CONTENTS, DEBUGGING, SORT_ENTRIES
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
-0+10c8 l d \.ctors 0+ (|\.ctors)
-0+10c8 l d \.dtors 0+ (|\.dtors)
0+10c8 l d \.data 0+ (|\.data)
-0+10d8 l d \.sbss 0+ (|\.sbss)
-0+10d8 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \.cranges 0+ (|\.cranges)
0+ l d \*ABS\* 0+ (|\.shstrtab)
@@ -46,12 +34,12 @@ SYMBOL TABLE:
0+1004 l \.text 0+ start2
0+1030 l \.text 0+ 0x04 mediacode2
0+1018 l \.text 0+ 0x04 mediacode
-0+10c8 g \.dtors 0+ ___dtors
+0+10c8 g \*ABS\* 0+ ___dtors
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.ctors 0+ ___ctors_end
-0+10c8 g \.ctors 0+ ___ctors
+0+10c8 g \*ABS\* 0+ ___ctors_end
+0+10c8 g \*ABS\* 0+ ___ctors
0+10d8 g \*ABS\* 0+ _edata
0+10d8 g \*ABS\* 0+ _end
0+1000 g \.text 0+ start
0+80000 g \.stack 0+ _stack
-0+10c8 g \.dtors 0+ ___dtors_end
+0+10c8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
index ec76cc8..a7df4ef 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.xd
+++ b/ld/testsuite/ld-sh/sh64/mix2.xd
@@ -19,28 +19,16 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 \.rodata 00000010 0+1034 0+1034 00000134 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 3 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 4 \.data 00000010 0+10c8 0+10c8 00000148 2\*\*2
+ 2 \.data 00000010 0+10c8 0+10c8 00000148 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 5 \.sbss 00000000 0+10d8 0+10d8 00000184 2\*\*0
- CONTENTS
- 6 \.bss 00000000 0+10d8 0+10d8 00000158 2\*\*0
- ALLOC
- 7 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 3 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
- 8 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
+ 4 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
CONTENTS, DEBUGGING, SORT_ENTRIES
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1034 l d \.rodata 0+ (|\.rodata)
-0+10c8 l d \.ctors 0+ (|\.ctors)
-0+10c8 l d \.dtors 0+ (|\.dtors)
0+10c8 l d \.data 0+ (|\.data)
-0+10d8 l d \.sbss 0+ (|\.sbss)
-0+10d8 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \.cranges 0+ (|\.cranges)
0+ l d \*ABS\* 0+ (|\.shstrtab)
@@ -54,14 +42,14 @@ SYMBOL TABLE:
0+1024 g \.text 0+ compactlabel2
0+1028 g \.text 0+ compactlabel3
0+1010 g \.text 0+ 0x04 medialabel1
-0+10c8 g \.dtors 0+ ___dtors
+0+10c8 g \*ABS\* 0+ ___dtors
0+10cc g \.data 0+ medialabel4
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.ctors 0+ ___ctors_end
+0+10c8 g \*ABS\* 0+ ___ctors_end
0+10d4 g \.data 0+ compactlabel5
-0+10c8 g \.ctors 0+ ___ctors
+0+10c8 g \*ABS\* 0+ ___ctors
0+10d8 g \*ABS\* 0+ _edata
0+10d8 g \*ABS\* 0+ _end
0+1000 g \.text 0+ 0x04 start
0+80000 g \.stack 0+ _stack
-0+10c8 g \.dtors 0+ ___dtors_end
+0+10c8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/sh64.exp b/ld/testsuite/ld-sh/sh64/sh64.exp
index 1b54cf5..a150dc2 100644
--- a/ld/testsuite/ld-sh/sh64/sh64.exp
+++ b/ld/testsuite/ld-sh/sh64/sh64.exp
@@ -97,13 +97,13 @@ set sh64tests {
{{readelf {-s -r -x 1 -x 3} reldl64.rd}} "reldl64.bin" }
{"Handling SH64 assembler-generated .cranges" "-mshelf32"
"--abi=32" {crange-2a.s crange-1.s}
- {{readelf {-S -s -r -x 1 -x 2 -x 9} crange1.rd}} "crange1.bin" }
+ {{readelf {-S -s -r -x 1 -x 2 -x 4} crange1.rd}} "crange1.bin" }
{"Handling SH64 assembler-generated .cranges, partial linking" "-mshelf32 -r"
"--abi=32" {crange-2a.s}
{{readelf {-S -s -r -x 2 -x 6} crangerel1.rd}} "crangerel1.bin" }
{"Mixing SH64 assembler-generated with linker-generated .cranges" "-mshelf32"
"--abi=32" {crange-2a.s crange-2b.s crange-1.s}
- {{readelf {-S -s -r -x 2 -x 9} crange2.rd}} "crange2.bin" }
+ {{readelf {-S -s -r -x 2 -x 4} crange2.rd}} "crange2.bin" }
{"Mixing SH64 assembler-generated with linker-generated .cranges, partial linking"
"-mshelf32 -r"
"--abi=32" {crange-2a.s crange-2c.s crange-2d.s crange-2e.s}
@@ -112,17 +112,17 @@ set sh64tests {
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-S -s -x 2 -x 9} crange3.rd} {objdump -d crange3.dd}} "crange3.bin" }
+ {{readelf {-S -s -x 2 -x 4} crange3.rd} {objdump -d crange3.dd}} "crange3.bin" }
{"Sorted SH64 .cranges, entry at SHcompact code" "-mshelf32 --entry diversion"
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-h -S -s -x 2 -x 9} crange3-cmpct.rd}} "crange3-cmpct.bin" }
+ {{readelf {-h -S -s -x 2 -x 4} crange3-cmpct.rd}} "crange3-cmpct.bin" }
{"Sorted SH64 .cranges, entry at SHmedia code" "-mshelf32 --entry diversion2"
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-h -S -s -x 2 -x 9} crange3-media.rd}} "crange3-media.bin" }
+ {{readelf {-h -S -s -x 2 -x 4} crange3-media.rd}} "crange3-media.bin" }
{"SH64 Big Endianness" "-mshelf64 -Tendian.ld"
"--abi=64" {endian.s}
{{objdump -s endian.sbd} {objdump -d endian.dbd}} "endianb.bin" }
diff --git a/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd
index 84dabc5..c0b1f34 100644
--- a/ld/testsuite/ld-sh/sh64/shdl32.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl32.xd
@@ -8,7 +8,7 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+348 memsz 0x0+348 flags r-x
LOAD off 0x0+448 vaddr 0x0+13c8 paddr 0x0+13c8 align 2\*\*7
- filesz 0x0+194 memsz 0x0+198 flags rw-
+ filesz 0x0+194 memsz 0x0+194 flags rw-
LOAD off 0x0+600 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x00000004 memsz 0x00000004 flags rw-
@@ -18,26 +18,14 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 \.rodata 0+144 0+1204 0+1204 0+304 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
+ 2 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 5 \.sbss 0+ 0+1560 0+1560 0+604 2\*\*0
- CONTENTS
- 6 \.bss 0+ 0+1560 0+1560 0+5dc 2\*\*0
- ALLOC
- 7 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
+ 3 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1204 l d \.rodata 0+ (|\.rodata)
-0+13c8 l d \.ctors 0+ (|\.ctors)
-0+13c8 l d \.dtors 0+ (|\.dtors)
0+13c8 l d \.data 0+ (|\.data)
-0+1560 l d \.sbss 0+ (|\.sbss)
-0+1560 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -88,7 +76,7 @@ SYMBOL TABLE:
0+14e0 g \.data 0+ dbar_mixboth2
0+14ec g \.data 0+ dbaz
0+1524 g \.data 0+ dbaz_mix
-0+13c8 g \.dtors 0+ ___dtors
+0+13c8 g \*ABS\* 0+ ___dtors
0+141c g \.data 0+ dfoo_mixboth2
0+119c g \.text 0+ 0x04 bazboth
0+13f0 g \.data 0+ dfoo_other
@@ -104,13 +92,13 @@ SYMBOL TABLE:
0+14f4 g \.data 0+ dbazboth
0+1038 g \.text 0+ 0x04 foo_otherwithout
0+1190 g \.text 0+ 0x04 bar_mixwithout2
-0+13c8 g \.ctors 0+ ___ctors_end
+0+13c8 g \*ABS\* 0+ ___ctors_end
0+1064 g \.text 0+ 0x04 foo_mixwithout
0+116c g \.text 0+ 0x04 bar_other
0+13d0 g \.data 0+ dfooboth
0+1034 g \.text 0+ 0x04 foo_otherboth2
0+1400 g \.data 0+ dfoo_mix
-0+13c8 g \.ctors 0+ ___ctors
+0+13c8 g \*ABS\* 0+ ___ctors
0+14d4 g \.data 0+ dbar_mix
0+100c g \.text 0+ 0x04 fooboth
0+1170 g \.text 0+ 0x04 bar_otherboth
@@ -133,6 +121,6 @@ SYMBOL TABLE:
0+1160 g \.text 0+ 0x04 barboth
0+14b8 g \.data 0+ dbarboth
0+1188 g \.text 0+ 0x04 bar_mixboth2
-0+13c8 g \.dtors 0+ ___dtors_end
+0+13c8 g \*ABS\* 0+ ___dtors_end
0+151c g \.data 0+ dbaz_otherboth2
0+1500 g \.data 0+ dbazboth2
diff --git a/ld/testsuite/ld-sh/sh64/shdl64.xd b/ld/testsuite/ld-sh/sh64/shdl64.xd
index 71ab0d3..8a7b236 100644
--- a/ld/testsuite/ld-sh/sh64/shdl64.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl64.xd
@@ -8,7 +8,7 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+348 memsz 0x0+348 flags r-x
LOAD off 0x0+448 vaddr 0x0+13c8 paddr 0x0+13c8 align 2\*\*7
- filesz 0x0+194 memsz 0x0+198 flags rw-
+ filesz 0x0+194 memsz 0x0+194 flags rw-
LOAD off 0x0+600 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x0+4 memsz 0x0+4 flags rw-
@@ -18,26 +18,14 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 \.rodata 0+144 0+1204 0+1204 0+304 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
+ 2 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
CONTENTS, ALLOC, LOAD, DATA
- 5 \.sbss 0+ 0+1560 0+1560 0+604 2\*\*0
- CONTENTS
- 6 \.bss 0+ 0+1560 0+1560 0+5dc 2\*\*0
- ALLOC
- 7 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
+ 3 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1204 l d \.rodata 0+ (|\.rodata)
-0+13c8 l d \.ctors 0+ (|\.ctors)
-0+13c8 l d \.dtors 0+ (|\.dtors)
0+13c8 l d \.data 0+ (|\.data)
-0+1560 l d \.sbss 0+ (|\.sbss)
-0+1560 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -88,7 +76,7 @@ SYMBOL TABLE:
0+14e0 g \.data 0+ dbar_mixboth2
0+14ec g \.data 0+ dbaz
0+1524 g \.data 0+ dbaz_mix
-0+13c8 g \.dtors 0+ ___dtors
+0+13c8 g \*ABS\* 0+ ___dtors
0+141c g \.data 0+ dfoo_mixboth2
0+119c g \.text 0+ 0x04 bazboth
0+13f0 g \.data 0+ dfoo_other
@@ -104,13 +92,13 @@ SYMBOL TABLE:
0+14f4 g \.data 0+ dbazboth
0+1038 g \.text 0+ 0x04 foo_otherwithout
0+1190 g \.text 0+ 0x04 bar_mixwithout2
-0+13c8 g \.ctors 0+ ___ctors_end
+0+13c8 g \*ABS\* 0+ ___ctors_end
0+1064 g \.text 0+ 0x04 foo_mixwithout
0+116c g \.text 0+ 0x04 bar_other
0+13d0 g \.data 0+ dfooboth
0+1034 g \.text 0+ 0x04 foo_otherboth2
0+1400 g \.data 0+ dfoo_mix
-0+13c8 g \.ctors 0+ ___ctors
+0+13c8 g \*ABS\* 0+ ___ctors
0+14d4 g \.data 0+ dbar_mix
0+100c g \.text 0+ 0x04 fooboth
0+1170 g \.text 0+ 0x04 bar_otherboth
@@ -133,6 +121,6 @@ SYMBOL TABLE:
0+1160 g \.text 0+ 0x04 barboth
0+14b8 g \.data 0+ dbarboth
0+1188 g \.text 0+ 0x04 bar_mixboth2
-0+13c8 g \.dtors 0+ ___dtors_end
+0+13c8 g \*ABS\* 0+ ___dtors_end
0+151c g \.data 0+ dbaz_otherboth2
0+1500 g \.data 0+ dbazboth2
diff --git a/ld/testsuite/ld-sh/shared-1.d b/ld/testsuite/ld-sh/shared-1.d
index 8ee19bd..fbc4d6e 100644
--- a/ld/testsuite/ld-sh/shared-1.d
+++ b/ld/testsuite/ld-sh/shared-1.d
@@ -13,10 +13,10 @@
Relocation section '\.rela\.text' at offset 0x[0-9a-f]+ contains 1 entries:
.*
-000001f8 000000a5 R_SH_RELATIVE +000001fc
+000001b0 000000a5 R_SH_RELATIVE +000001b4
Hex dump of section '\.rela\.text':
- 0x000001e4 000001fc 000000a5 000001f8 .*
+ 0x0000019c 000001b4 000000a5 000001b0 .*
Hex dump of section '\.text':
- 0x000001f0 000001fc 00090009 00090009 .*
+ 0x000001a8 000001b4 00090009 00090009 .*
diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d
index 04b91e3..6118071 100644
--- a/ld/testsuite/ld-sh/tlsbin-2.d
+++ b/ld/testsuite/ld-sh/tlsbin-2.d
@@ -10,22 +10,22 @@ There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- \[ 1\] \.interp +.*
- \[ 2\] \.hash +.*
- \[ 3\] \.dynsym +.*
- \[ 4\] \.dynstr +.*
- \[ 5\] \.rela\.dyn +.*
- \[ 6\] \.rela\.plt +.*
- \[ 7\] \.plt +.*
- \[ 8\] \.text +PROGBITS +0+401000 .*
- \[ 9\] \.tdata +PROGBITS +0+413000 [0-9a-f]+ 0+018 00 WAT 0 0 4
- \[10\] \.tbss +NOBITS +0+413018 [0-9a-f]+ 0+010 00 WAT 0 0 1
+ \[ 1\] \.interp .*
+ \[ 2\] \.hash .*
+ \[ 3\] \.dynsym .*
+ \[ 4\] \.dynstr .*
+ \[ 5\] \.rela\.dyn .*
+ \[ 6\] \.rela\.plt .*
+ \[ 7\] \.plt .*
+ \[ 8\] \.text +PROGBITS .*
+ \[ 9\] \.tdata +PROGBITS .* 0+018 00 WAT 0 0 4
+ \[10\] \.tbss +NOBITS .* 0+010 00 WAT 0 0 1
#...
- \[[0-9a-f]+\] \.got +PROGBITS +0+414000 .*
+ \[[0-9a-f]+\] \.got +PROGBITS .*
#...
- \[[0-9a-f]+\] \.shstrtab +.*
- \[[0-9a-f]+\] \.symtab +.*
- \[[0-9a-f]+\] \.strtab +.*
+ \[[0-9a-f]+\] \.shstrtab .*
+ \[[0-9a-f]+\] \.symtab .*
+ \[[0-9a-f]+\] \.strtab .*
Key to Flags:
.*
.*
@@ -56,25 +56,24 @@ Program Headers:
Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+414010 00000197 R_SH_TLS_TPOFF32 +0+ +sG3 \+ 0
-0+414014 00000397 R_SH_TLS_TPOFF32 +0+ +sG2 \+ 0
-0+414018 00000497 R_SH_TLS_TPOFF32 +0+ +sG4 \+ 0
-0+41401c 0000[0-9a-f]+97 R_SH_TLS_TPOFF32 +0+ +sG1 \+ 0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+ +sG3 \+ 0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+ +sG2 \+ 0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+ +sG4 \+ 0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+ +sG1 \+ 0
Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+41400c 000005a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ [0-9a-f]+
+[0-9a-f ]+R_SH_JMP_SLOT[0-9a-f ]+__tls_get_addr \+ [0-9a-f]+
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT UND *
- +1: 0+ +0 TLS +GLOBAL DEFAULT UND sG3
- +2: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +3: 0+ +0 TLS +GLOBAL DEFAULT UND sG2
- +4: 0+ +0 TLS +GLOBAL DEFAULT UND sG4
- +5: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_addr
+.* NOTYPE +LOCAL +DEFAULT UND *
+.* TLS +GLOBAL DEFAULT UND sG3
+.* TLS +GLOBAL DEFAULT UND sG2
+.* TLS +GLOBAL DEFAULT UND sG4
+.* FUNC +GLOBAL DEFAULT UND __tls_get_addr
#...
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1
+.* TLS +GLOBAL DEFAULT UND sG1
#...
#pass
diff --git a/ld/testsuite/ld-sh/tlsbin-3.d b/ld/testsuite/ld-sh/tlsbin-3.d
index 7fb7e87..618ae59 100644
--- a/ld/testsuite/ld-sh/tlsbin-3.d
+++ b/ld/testsuite/ld-sh/tlsbin-3.d
@@ -8,5 +8,5 @@
.*: +file format elf32-sh.*
Contents of section \.got:
- 414000 [0-9a-f]+ 00000000 00000000 [0-9a-f]+ .*
- 414010 00000000 00000000 00000000 00000000 .*
+ [0-9a-f]+ [0-9a-f]+ 00000000 00000000 [0-9a-f]+ .*
+ [0-9a-f]+ 00000000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-sh/tlsbin-4.d b/ld/testsuite/ld-sh/tlsbin-4.d
index 25e0875..b1683b8 100644
--- a/ld/testsuite/ld-sh/tlsbin-4.d
+++ b/ld/testsuite/ld-sh/tlsbin-4.d
@@ -8,5 +8,5 @@
.*: +file format elf32-sh.*
Contents of section .tdata:
- 413000 11000000 12000000 41000000 42000000 .*
- 413010 01010000 02010000 +.*
+ [0-9a-f]+ 11000000 12000000 41000000 42000000 .*
+ [0-9a-f]+ 01010000 02010000 +.*
diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
index c95f401..70d65da 100644
--- a/ld/testsuite/ld-sh/tlspic-2.d
+++ b/ld/testsuite/ld-sh/tlspic-2.d
@@ -10,21 +10,21 @@ There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- \[ 1\] \.hash +.*
- \[ 2\] \.dynsym +.*
- \[ 3\] \.dynstr +.*
- \[ 4\] \.rela\.dyn +.*
- \[ 5\] \.rela\.plt +.*
- \[ 6\] \.plt +.*
- \[ 7\] \.text +PROGBITS +0+[0-9a-f]+ .*
- \[ 8\] \.tdata +PROGBITS +0+[0-9a-f]+ [0-9a-f]+ 0+018 00 WAT 0 0 4
- \[ 9\] \.tbss +NOBITS +0+[0-9a-f]+ [0-9a-f]+ 0+008 00 WAT 0 0 1
+ \[ 1\] \.hash .*
+ \[ 2\] \.dynsym .*
+ \[ 3\] \.dynstr .*
+ \[ 4\] \.rela\.dyn .*
+ \[ 5\] \.rela\.plt .*
+ \[ 6\] \.plt .*
+ \[ 7\] \.text +PROGBITS .*
+ \[ 8\] \.tdata +PROGBITS .* 0+18 00 WAT 0 0 4
+ \[ 9\] \.tbss +NOBITS .* 0+08 00 WAT 0 0 1
#...
- \[[0-9a-f]+\] \.got +PROGBITS +0+[0-9a-f]+ .*
+ \[[0-9a-f]+\] \.got +PROGBITS .*
#...
- \[[0-9a-f]+\] \.shstrtab +.*
- \[[0-9a-f]+\] \.symtab +.*
- \[[0-9a-f]+\] \.strtab +.*
+ \[[0-9a-f]+\] \.shstrtab .*
+ \[[0-9a-f]+\] \.symtab .*
+ \[[0-9a-f]+\] \.strtab .*
Key to Flags:
.*
.*
@@ -39,7 +39,7 @@ Program Headers:
LOAD.*
LOAD.*
DYNAMIC.*
- TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+20 R +0x4
+ TLS .* 0x0+18 0x0+20 R +0x4
Section to Segment mapping:
Segment Sections\.\.\.
@@ -50,37 +50,33 @@ Program Headers:
Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+[0-9a-f]+ 00000095 R_SH_TLS_DTPMOD32 +0+00
-0+[0-9a-f]+ 00000097 R_SH_TLS_TPOFF32 +0+0c
-0+[0-9a-f]+ 00000095 R_SH_TLS_DTPMOD32 +0+00
-0+[0-9a-f]+ 00000095 R_SH_TLS_DTPMOD32 +0+00
-0+[0-9a-f]+ 00000097 R_SH_TLS_TPOFF32 +0+1c
-0+[0-9a-f]+ 00000095 R_SH_TLS_DTPMOD32 +0+00
-0+[0-9a-f]+ 00000097 R_SH_TLS_TPOFF32 +0+14
-0+[0-9a-f]+ 0000[0-9a-f]+95 R_SH_TLS_DTPMOD32 +0+ +sg1 \+ 0
-0+[0-9a-f]+ 0000[0-9a-f]+96 R_SH_TLS_DTPOFF32 +0+ +sg1 \+ 0
-0+[0-9a-f]+ 0000[0-9a-f]+97 R_SH_TLS_TPOFF32 +0+04 +sg2 \+ 0
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+0c
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+1c
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+14
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SH_TLS_DTPOFF32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +0+04 +sg2 \+ 0
Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+[0-9a-f]+ 0000[0-9a-f]+a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ [0-9a-f]+
+[0-9a-f ]+R_SH_JMP_SLOT[0-9a-f ]+__tls_get_addr \+ [0-9a-f]+
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
- +2: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
- +3: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 *
- +4: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +[0-9]+ *
- +5: 0+ +0 NOTYPE +LOCAL +DEFAULT UND *
- +6: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9a-f]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr
- +[0-9a-f]+: 0+00 +0 TLS +GLOBAL DEFAULT +8 sg1
+.* NOTYPE +LOCAL +DEFAULT UND *
+.* SECTION LOCAL DEFAULT +7 *
+.* SECTION LOCAL DEFAULT +8 *
+.* SECTION LOCAL DEFAULT +9 *
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 sg1
#...
- +[0-9a-f]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1
+.* FUNC +GLOBAL DEFAULT +7 fn1
#...
- +[0-9a-f]+: 0+04 +0 TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg2
#...
#pass
-
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index c2abc8f..912d760 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -4,7 +4,7 @@
#readelf: -WSsrl
#target: sparc*-*-*
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+.*
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -19,10 +19,9 @@ Section Headers:
+\[ 8\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4
+\[ 9\] .dynamic +DYNAMIC +0+231f4 0+31f4 0+80 08 +WA +4 +0 +4
+\[10\] .got +PROGBITS +0+23274 0+3274 0+14 04 +WA +0 +0 +4
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[11\] .shstrtab +.*
+ +\[12\] .symtab +.*
+ +\[13\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -34,100 +33,97 @@ Program Headers:
+PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
+INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
.*Requesting program interpreter.*
- +LOAD +0x0+ 0x0+10000 0x0+10000 0x0+2194 0x0+2194 R E 0x10000
- +LOAD +0x0+2194 0x0+22194 0x0+22194 0x0+10f4 0x0+10f4 RWE 0x10000
- +DYNAMIC +0x0+31f4 0x0+231f4 0x0+231f4 0x0+80 0x0+80 RW +0x4
- +TLS +0x0+2194 0x0+22194 0x0+22194 0x0+1060 0x0+10a0 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 0x0+1060 0x0+10a0 R +0x4
#...
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-00023278 +0000014e R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
-0002327c +0000034e R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
-00023280 +0000074e R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
-00023284 +0000084e R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
-Symbol table '.dynsym' contains 11 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +2: 0+231f4 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +3: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +4: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +5: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +6: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +7: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +8: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 68 entries:
+Symbol table '.symtab' contains 67 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: 0+1020 +0 TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+1024 +0 TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+1028 +0 TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+102c +0 TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+1030 +0 TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+1034 +0 TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+1038 +0 TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+103c +0 TLS +LOCAL +DEFAULT +7 sl8
- +[0-9]+: 0+1080 +0 TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 0+1084 +0 TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 0+1088 +0 TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0+108c +0 TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 0+1090 +0 TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 0+1094 +0 TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 0+1098 +0 TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0+109c +0 TLS +LOCAL +DEFAULT +8 bl8
- +[0-9]+: 0+101c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+107c +0 TLS +GLOBAL DEFAULT +8 bg8
- +[0-9]+: 0+1074 +0 TLS +GLOBAL DEFAULT +8 bg6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +[0-9]+: 0+1068 +0 TLS +GLOBAL DEFAULT +8 bg3
- +[0-9]+: 0+231f4 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1008 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+1048 +0 TLS +GLOBAL HIDDEN +7 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+100c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+1010 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+1070 +0 TLS +GLOBAL DEFAULT +8 bg5
- +[0-9]+: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+1058 +0 TLS +GLOBAL HIDDEN +7 sh7
- +[0-9]+: 0+105c +0 TLS +GLOBAL HIDDEN +7 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+12000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+104c +0 TLS +GLOBAL HIDDEN +7 sh4
- +[0-9]+: 0+1078 +0 TLS +GLOBAL DEFAULT +8 bg7
- +[0-9]+: 0+1050 +0 TLS +GLOBAL HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: 0+11008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +[0-9]+: 0+1004 +0 TLS +GLOBAL DEFAULT +7 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+1040 +0 TLS +GLOBAL HIDDEN +7 sh1
- +[0-9]+: 0+1014 +0 TLS +GLOBAL DEFAULT +7 sg6
- +[0-9]+: 0+1018 +0 TLS +GLOBAL DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: 0+23274 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+1044 +0 TLS +GLOBAL HIDDEN +7 sh2
- +[0-9]+: 0+1054 +0 TLS +GLOBAL HIDDEN +7 sh6
- +[0-9]+: 0+1064 +0 TLS +GLOBAL DEFAULT +8 bg2
- +[0-9]+: 0+1060 +0 TLS +GLOBAL DEFAULT +8 bg1
- +[0-9]+: 0+106c +0 TLS +GLOBAL DEFAULT +8 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +DEFAULT +8 bl1
+.* TLS +LOCAL +DEFAULT +8 bl2
+.* TLS +LOCAL +DEFAULT +8 bl3
+.* TLS +LOCAL +DEFAULT +8 bl4
+.* TLS +LOCAL +DEFAULT +8 bl5
+.* TLS +LOCAL +DEFAULT +8 bl6
+.* TLS +LOCAL +DEFAULT +8 bl7
+.* TLS +LOCAL +DEFAULT +8 bl8
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +8 bg8
+.* TLS +GLOBAL DEFAULT +8 bg6
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +8 bg3
+.* OBJECT +GLOBAL HIDDEN +9 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL HIDDEN +7 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* OBJECT +GLOBAL HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +GLOBAL DEFAULT +8 bg5
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +7 sh7
+.* TLS +GLOBAL HIDDEN +7 sh8
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL HIDDEN +7 sh4
+.* TLS +GLOBAL DEFAULT +8 bg7
+.* TLS +GLOBAL HIDDEN +7 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +6 fn2
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +7 sh1
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +7 sh2
+.* TLS +GLOBAL HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +8 bg2
+.* TLS +GLOBAL DEFAULT +8 bg1
+.* TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd
index ae1f1cc..8a3a168 100644
--- a/ld/testsuite/ld-sparc/tlssunbin64.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -4,7 +4,7 @@
#readelf: -WSsrl
#target: sparc*-*-*
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+.*
Section Headers:
+\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -19,10 +19,9 @@ Section Headers:
+\[ 8\] .tbss +NOBITS +0+202204 0+2204 0+40 00 WAT +0 +0 +4
+\[ 9\] .dynamic +DYNAMIC +0+202208 0+2208 0+100 10 +WA +4 +0 +8
+\[10\] .got +PROGBITS +0+202308 0+2308 0+28 08 +WA +0 +0 +8
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[11\] .shstrtab +.*
+ +\[12\] .symtab +.*
+ +\[13\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -34,100 +33,97 @@ Program Headers:
+PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
+INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
.*Requesting program interpreter.*
- +LOAD +0x0+ 0x0+100000 0x0+100000 0x0+21a4 0x0+21a4 R E 0x100000
- +LOAD +0x0+21a4 0x0+2021a4 0x0+2021a4 0x0+25c 0x0+25c RWE 0x100000
- +DYNAMIC +0x0+2208 0x0+202208 0x0+202208 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+21a4 0x0+2021a4 0x0+2021a4 0x0+60 0x0+a0 R +0x4
+ +LOAD .* R E 0x100000
+ +LOAD .* RW +0x100000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+60 0x0+a0 R +0x4
#...
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+202310 +0+10000004f R_SPARC_TLS_TPOFF64 +0+ +sG5 \+ 0
-0+202318 +0+30000004f R_SPARC_TLS_TPOFF64 +0+ +sG2 \+ 0
-0+202320 +0+70000004f R_SPARC_TLS_TPOFF64 +0+ +sG6 \+ 0
-0+202328 +0+80000004f R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG6 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 0
-Symbol table '.dynsym' contains 11 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +2: 0+202208 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +3: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +4: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +5: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +6: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +7: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +8: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 68 entries:
+Symbol table '.symtab' contains 67 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +7 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +8 bl8
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +8 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +8 bg6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 bg3
- +[0-9]+: 0+202208 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+08 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +7 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+0c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +8 bg5
- +[0-9]+: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +7 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +7 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+102000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +7 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +8 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: 0+101008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +[0-9]+: 0+04 +0 TLS +GLOBAL DEFAULT +7 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +7 sh1
- +[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 +ABS _edata
- +[0-9]+: 0+202308 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +7 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +7 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +8 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +8 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +DEFAULT +8 bl1
+.* TLS +LOCAL +DEFAULT +8 bl2
+.* TLS +LOCAL +DEFAULT +8 bl3
+.* TLS +LOCAL +DEFAULT +8 bl4
+.* TLS +LOCAL +DEFAULT +8 bl5
+.* TLS +LOCAL +DEFAULT +8 bl6
+.* TLS +LOCAL +DEFAULT +8 bl7
+.* TLS +LOCAL +DEFAULT +8 bl8
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +8 bg8
+.* TLS +GLOBAL DEFAULT +8 bg6
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +8 bg3
+.* OBJECT +GLOBAL HIDDEN +9 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL HIDDEN +7 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* OBJECT +GLOBAL HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +GLOBAL DEFAULT +8 bg5
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +7 sh7
+.* TLS +GLOBAL HIDDEN +7 sh8
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL HIDDEN +7 sh4
+.* TLS +GLOBAL DEFAULT +8 bg7
+.* TLS +GLOBAL HIDDEN +7 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +6 fn2
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +7 sh1
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +7 sh2
+.* TLS +GLOBAL HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +8 bg2
+.* TLS +GLOBAL DEFAULT +8 bg1
+.* TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index 9ffcbd2..19fbf55 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: sparc-*-*
-There are 13 section headers, starting at offset 0x[0-9a-f]+:
+.*
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -18,10 +18,9 @@ Section Headers:
+\[ 6\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4
+\[ 7\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4
+\[ 8\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4
- +\[ 9\] .plt +.*
- +\[10\] .shstrtab +.*
- +\[11\] .symtab +.*
- +\[12\] .strtab +.*
+ +\[ 9\] .shstrtab +.*
+ +\[10\] .symtab +.*
+ +\[11\] .strtab +.*
#...
Elf file type is DYN \(Shared object file\)
Entry point 0x1000
@@ -29,74 +28,69 @@ There are 4 program headers, starting at offset [0-9a-f]+
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
- +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+9c 0x0+9c RWE 0x10000
- +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+80 0x0+80 RW +0x4
- +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+ 0x0+24 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 0x0+ 0x0+24 R +0x4
#...
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+1004 +0+309 R_SPARC_HI22 +0+12080 +\.got \+ 12080
-0+1008 +0+30c R_SPARC_LO10 +0+12080 +\.got \+ 12080
-0+10dc +0+48 R_SPARC_TLS_LE_HIX22 +0+9
-0+10e0 +0+49 R_SPARC_TLS_LE_LOX10 +0+9
-0+10f8 +0+48 R_SPARC_TLS_LE_HIX22 +0+1c
-0+10fc +0+49 R_SPARC_TLS_LE_LOX10 +0+1c
-0+12084 +0+4e R_SPARC_TLS_TPOFF32 +0+
-0+12088 +0+4e R_SPARC_TLS_TPOFF32 +0+4
-0+12094 +0+4e R_SPARC_TLS_TPOFF32 +0+14
-0+12098 +0+4e R_SPARC_TLS_TPOFF32 +0+18
-0+1208c +0+94e R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0
-0+12090 +0+b4e R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
+[0-9a-f ]+R_SPARC_HI22 +0+12080 +\.got \+ 12080
+[0-9a-f ]+R_SPARC_LO10 +0+12080 +\.got \+ 12080
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+4
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+14
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+18
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +4: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +5: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +6: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +9: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +11: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 31 entries:
+Symbol table '.symtab' contains 30 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +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+ +0 TLS +LOCAL +DEFAULT +6 bl1
- +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
- +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
- +[0-9]+: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
- +[0-9]+: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
- +[0-9]+: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
- +[0-9]+: 0+12080 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
- +[0-9]+: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* TLS +LOCAL +DEFAULT +6 bl1
+.* TLS +LOCAL +DEFAULT +6 bl2
+.* TLS +LOCAL +DEFAULT +6 bl3
+.* TLS +LOCAL +DEFAULT +6 bl4
+.* TLS +LOCAL +DEFAULT +6 bl5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +6 sh3
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh4
+.* TLS +LOCAL +HIDDEN +6 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh2
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
index c12918e..ce375ef 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: sparc-*-*
-There are 13 section headers, starting at offset 0x[0-9a-f]+:
+.*
Section Headers:
+\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -18,10 +18,9 @@ Section Headers:
+\[ 6\] .tbss +NOBITS +0+102000 0+2000 0+24 0+ WAT +0 +0 +4
+\[ 7\] .dynamic +DYNAMIC +0+102000 0+2000 0+100 10 +WA +3 +0 +8
+\[ 8\] .got +PROGBITS +0+102100 0+2100 0+38 08 +WA +0 +0 +8
- +\[ 9\] .plt +.*
- +\[10\] .shstrtab +.*
- +\[11\] .symtab +.*
- +\[12\] .strtab +.*
+ +\[ 9\] .shstrtab +.*
+ +\[10\] .symtab +.*
+ +\[11\] .strtab +.*
#...
Elf file type is DYN \(Shared object file\)
Entry point 0x1000
@@ -29,76 +28,71 @@ There are 4 program headers, starting at offset [0-9a-f]+
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
- +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+200 0x0+200 RWE 0x100000
- +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+ 0x0+24 R +0x4
+ +LOAD .* R E 0x100000
+ +LOAD .* RW +0x100000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+ 0x0+24 R +0x4
#...
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+1004 +0+300000022 R_SPARC_HH22 +0+102100 +\.got \+ 102100
-0+1008 +0+300000024 R_SPARC_LM22 +0+102100 +\.got \+ 102100
-0+100c +0+300000023 R_SPARC_HM10 +0+102100 +\.got \+ 102100
-0+1010 +0+30000000c R_SPARC_LO10 +0+102100 +\.got \+ 102100
-0+10ec +0+48 R_SPARC_TLS_LE_HIX22 +0+9
-0+10f0 +0+49 R_SPARC_TLS_LE_LOX10 +0+9
-0+1108 +0+48 R_SPARC_TLS_LE_HIX22 +0+1c
-0+110c +0+49 R_SPARC_TLS_LE_LOX10 +0+1c
-0+102108 +0+4f R_SPARC_TLS_TPOFF64 +0+
-0+102110 +0+4f R_SPARC_TLS_TPOFF64 +0+4
-0+102128 +0+4f R_SPARC_TLS_TPOFF64 +0+14
-0+102130 +0+4f R_SPARC_TLS_TPOFF64 +0+18
-0+102118 +0+90000004f R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0
-0+102120 +0+b0000004f R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
+[0-9a-f ]+R_SPARC_HH22 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_LM22 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_HM10 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_LO10 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+4
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+14
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+18
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +4: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +5: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +6: 0+102000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +9: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +11: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 31 entries:
+Symbol table '.symtab' contains 30 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +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+ +0 TLS +LOCAL +DEFAULT +6 bl1
- +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
- +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
- +[0-9]+: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
- +[0-9]+: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
- +[0-9]+: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
- +[0-9]+: 0+102100 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
- +[0-9]+: 0+102000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* TLS +LOCAL +DEFAULT +6 bl1
+.* TLS +LOCAL +DEFAULT +6 bl2
+.* TLS +LOCAL +DEFAULT +6 bl3
+.* TLS +LOCAL +DEFAULT +6 bl4
+.* TLS +LOCAL +DEFAULT +6 bl5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +6 sh3
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh4
+.* TLS +LOCAL +HIDDEN +6 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh2
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index 80d2873..818d859 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -40,104 +40,100 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+120fc +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12104 +0+4e R_SPARC_TLS_TPOFF32 +0+24
-0+12108 +0+4e R_SPARC_TLS_TPOFF32 +0+30
-0+1210c +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12114 +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+1211c +0+4e R_SPARC_TLS_TPOFF32 +0+64
-0+1212c +0+4e R_SPARC_TLS_TPOFF32 +0+50
-0+12130 +0+4e R_SPARC_TLS_TPOFF32 +0+70
-0+12138 +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12140 +0+4e R_SPARC_TLS_TPOFF32 +0+44
-0+12120 +0+b4e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
-0+12124 +0+e4a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
-0+12128 +0+e4c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
-0+12134 +0+114e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+24
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+64
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+50
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+44
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+12174 +0+d15 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+[0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
-Symbol table '.dynsym' contains 22 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __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 +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains 55 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +7 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL +HIDDEN +8 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL +HIDDEN +7 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL +HIDDEN +8 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL +HIDDEN +8 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL +HIDDEN +7 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL +HIDDEN +7 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL +HIDDEN +8 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL +HIDDEN +7 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL +HIDDEN +8 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL +HIDDEN +7 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL +HIDDEN +8 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL +HIDDEN +8 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL +HIDDEN +8 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL +HIDDEN +7 sh1
- +[0-9]+: 0+120f8 +0 OBJECT +LOCAL HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL +HIDDEN +7 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL +HIDDEN +7 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __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 +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +HIDDEN +8 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +7 sh3
+.* TLS +LOCAL +HIDDEN +8 sH2
+.* TLS +LOCAL +HIDDEN +8 sH7
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh7
+.* TLS +LOCAL +HIDDEN +7 sh8
+.* TLS +LOCAL +HIDDEN +8 sH4
+.* TLS +LOCAL +HIDDEN +7 sh4
+.* TLS +LOCAL +HIDDEN +8 sH3
+.* TLS +LOCAL +HIDDEN +7 sh5
+.* TLS +LOCAL +HIDDEN +8 sH5
+.* TLS +LOCAL +HIDDEN +8 sH6
+.* TLS +LOCAL +HIDDEN +8 sH8
+.* TLS +LOCAL +HIDDEN +7 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh2
+.* TLS +LOCAL +HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
index 6b395a9..0033426 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -40,104 +40,100 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+102198 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021a8 +0+4f R_SPARC_TLS_TPOFF64 +0+24
-0+1021b0 +0+4f R_SPARC_TLS_TPOFF64 +0+30
-0+1021b8 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021c8 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021d8 +0+4f R_SPARC_TLS_TPOFF64 +0+64
-0+1021f8 +0+4f R_SPARC_TLS_TPOFF64 +0+50
-0+102200 +0+4f R_SPARC_TLS_TPOFF64 +0+70
-0+102210 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+102220 +0+4f R_SPARC_TLS_TPOFF64 +0+44
-0+1021e0 +0+b0000004f R_SPARC_TLS_TPOFF64 +0+10 +sg5 \+ 0
-0+1021e8 +0+e0000004b R_SPARC_TLS_DTPMOD64 +0+ +sg1 \+ 0
-0+1021f0 +0+e0000004d R_SPARC_TLS_DTPOFF64 +0+ +sg1 \+ 0
-0+102208 +0+110000004f R_SPARC_TLS_TPOFF64 +0+4 +sg2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+24
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+64
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+50
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+44
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+10 +sg5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPOFF64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+4 +sg2 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+102380 +0+d00000015 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+[0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
-Symbol table '.dynsym' contains 22 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+102060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __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 +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
Symbol table '.symtab' contains 55 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +7 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL +HIDDEN +8 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL +HIDDEN +7 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL +HIDDEN +8 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL +HIDDEN +8 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL +HIDDEN +7 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL +HIDDEN +7 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL +HIDDEN +8 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL +HIDDEN +7 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL +HIDDEN +8 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL +HIDDEN +7 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL +HIDDEN +8 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL +HIDDEN +8 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL +HIDDEN +8 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL +HIDDEN +7 sh1
- +[0-9]+: 0+102190 +0 OBJECT +LOCAL HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL +HIDDEN +7 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL +HIDDEN +7 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+102060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __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 +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +HIDDEN +8 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +7 sh3
+.* TLS +LOCAL +HIDDEN +8 sH2
+.* TLS +LOCAL +HIDDEN +8 sH7
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh7
+.* TLS +LOCAL +HIDDEN +7 sh8
+.* TLS +LOCAL +HIDDEN +8 sH4
+.* TLS +LOCAL +HIDDEN +7 sh4
+.* TLS +LOCAL +HIDDEN +8 sH3
+.* TLS +LOCAL +HIDDEN +7 sh5
+.* TLS +LOCAL +HIDDEN +8 sH5
+.* TLS +LOCAL +HIDDEN +8 sH6
+.* TLS +LOCAL +HIDDEN +8 sH8
+.* TLS +LOCAL +HIDDEN +7 sh1
+.* OBJECT +LOCAL HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh2
+.* TLS +LOCAL +HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
index 2960ae4..7a0c9a0 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.rd
+++ b/ld/testsuite/ld-x86-64/tlsbin.rd
@@ -56,96 +56,95 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-0+5013d0 0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0
-0+5013d8 0+300000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0
-0+5013e0 0+600000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0
-0+5013e8 0+700000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG5 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG2 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG6 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG1 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-0+[0-9a-f]+ 0+400000007 R_X86_64_JUMP_SLOT +0+[0-9a-f]+ __tls_get_addr \+ 0
+[0-9a-f ]+R_X86_64_JUMP_SLOT[0-9a-f ]+__tls_get_addr \+ 0
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG5
- +[0-9]+: 0+501290 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG2
- +[0-9]+: 0+[0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_addr
- +[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1
- +[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
- +[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND *
+.* TLS +GLOBAL DEFAULT UND sG5
+.* TLS +GLOBAL DEFAULT UND sG2
+.* FUNC +GLOBAL DEFAULT UND __tls_get_addr
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT UND sG6
+.* TLS +GLOBAL DEFAULT UND sG1
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains 69 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 *
- +[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +9 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +9 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +9 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL DEFAULT +9 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL DEFAULT +9 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL DEFAULT +9 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +9 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +9 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL DEFAULT +10 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL DEFAULT +10 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL DEFAULT +10 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL DEFAULT +10 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL DEFAULT +10 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL DEFAULT +10 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL DEFAULT +10 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL DEFAULT +10 bl8
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG5
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: 0+501290 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_addr
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: 0+40113c +0 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG6
- +[0-9]+: 0+401000 +0 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
- +[0-9]+: 0+5013f0 +0 OBJECT GLOBAL HIDDEN 13 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +10 bg4
+.* NOTYPE LOCAL DEFAULT UND *
+.* SECTION LOCAL DEFAULT +1 *
+.* SECTION LOCAL DEFAULT +2 *
+.* SECTION LOCAL DEFAULT +3 *
+.* SECTION LOCAL DEFAULT +4 *
+.* SECTION LOCAL DEFAULT +5 *
+.* SECTION LOCAL DEFAULT +6 *
+.* SECTION LOCAL DEFAULT +7 *
+.* SECTION LOCAL DEFAULT +8 *
+.* SECTION LOCAL DEFAULT +9 *
+.* SECTION LOCAL DEFAULT +10 *
+.* SECTION LOCAL DEFAULT +11 *
+.* SECTION LOCAL DEFAULT +12 *
+.* SECTION LOCAL DEFAULT +13 *
+.* SECTION LOCAL DEFAULT +14 *
+.* SECTION LOCAL DEFAULT +15 *
+.* SECTION LOCAL DEFAULT +16 *
+.* TLS +LOCAL DEFAULT +9 sl1
+.* TLS +LOCAL DEFAULT +9 sl2
+.* TLS +LOCAL DEFAULT +9 sl3
+.* TLS +LOCAL DEFAULT +9 sl4
+.* TLS +LOCAL DEFAULT +9 sl5
+.* TLS +LOCAL DEFAULT +9 sl6
+.* TLS +LOCAL DEFAULT +9 sl7
+.* TLS +LOCAL DEFAULT +9 sl8
+.* TLS +LOCAL DEFAULT +10 bl1
+.* TLS +LOCAL DEFAULT +10 bl2
+.* TLS +LOCAL DEFAULT +10 bl3
+.* TLS +LOCAL DEFAULT +10 bl4
+.* TLS +LOCAL DEFAULT +10 bl5
+.* TLS +LOCAL DEFAULT +10 bl6
+.* TLS +LOCAL DEFAULT +10 bl7
+.* TLS +LOCAL DEFAULT +10 bl8
+.* TLS +GLOBAL DEFAULT +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT UND sG5
+.* TLS +GLOBAL DEFAULT +10 bg3
+.* OBJECT GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +9 sg3
+.* TLS +GLOBAL HIDDEN +9 sh3
+.* TLS +GLOBAL DEFAULT UND sG2
+.* TLS +GLOBAL DEFAULT +9 sg4
+.* TLS +GLOBAL DEFAULT +9 sg5
+.* TLS +GLOBAL DEFAULT +10 bg5
+.* FUNC +GLOBAL DEFAULT UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* TLS +GLOBAL DEFAULT +9 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +9 sh4
+.* TLS +GLOBAL DEFAULT +10 bg7
+.* TLS +GLOBAL HIDDEN +9 sh5
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT UND sG6
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +9 sg2
+.* TLS +GLOBAL DEFAULT UND sG1
+.* TLS +GLOBAL HIDDEN +9 sh1
+.* TLS +GLOBAL DEFAULT +9 sg6
+.* TLS +GLOBAL DEFAULT +9 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* OBJECT GLOBAL HIDDEN 13 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE GLOBAL DEFAULT ABS _end
+.* TLS +GLOBAL HIDDEN +9 sh2
+.* TLS +GLOBAL HIDDEN +9 sh6
+.* TLS +GLOBAL DEFAULT +10 bg2
+.* TLS +GLOBAL DEFAULT +10 bg1
+.* TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd
index 95e908e..66ea9d6 100644
--- a/ld/testsuite/ld-x86-64/tlspic.dd
+++ b/ld/testsuite/ld-x86-64/tlspic.dd
@@ -22,7 +22,7 @@ Disassembly of section .text:
# -> R_X86_64_DTPMOD64 sg1
+1010: 66[ ]+data16
+1011: 66[ ]+data16
- +1012: 48 e8 20 f5 ff ff[ ]+rex64 callq [0-9a-f]+ <.*>
+ +1012: 48 e8 [0-9a-f ]+rex64 callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+1018: 90[ ]+nop *
+1019: 90[ ]+nop *
@@ -43,7 +43,7 @@ Disassembly of section .text:
# -> R_X86_64_DTPMOD64 [0 0x2000000000000000]
+1038: 66[ ]+data16
+1039: 66[ ]+data16
- +103a: 48 e8 f8 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*>
+ +103a: 48 e8 [0-9a-f ]+rex64 callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+1040: 90[ ]+nop *
+1041: 90[ ]+nop *
@@ -64,7 +64,7 @@ Disassembly of section .text:
# -> R_X86_64_DTPMOD64 [0 0x4000000000000000]
+1060: 66[ ]+data16
+1061: 66[ ]+data16
- +1062: 48 e8 d0 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*>
+ +1062: 48 e8 [0-9a-f ]+rex64 callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+1068: 90[ ]+nop *
+1069: 90[ ]+nop *
@@ -85,7 +85,7 @@ Disassembly of section .text:
# -> R_X86_64_DTPMOD64 [0 0x6000000000000000]
+1088: 66[ ]+data16
+1089: 66[ ]+data16
- +108a: 48 e8 a8 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*>
+ +108a: 48 e8 [0-9a-f ]+rex64 callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+1090: 90[ ]+nop *
+1091: 90[ ]+nop *
@@ -103,7 +103,7 @@ Disassembly of section .text:
# LD
+10a8: 48 8d 3d b1 02 10 00[ ]+lea 1049265\(%rip\),%rdi +# 101360 <.*>
# -> R_X86_64_DTPMOD64 [0 0x000000000000000]
- +10af: e8 84 f4 ff ff[ ]+callq [0-9a-f]+ <.*>
+ +10af: e8 [0-9a-f ]+callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+10b4: 90[ ]+nop *
+10b5: 90[ ]+nop *
@@ -118,7 +118,7 @@ Disassembly of section .text:
# LD against hidden and local variables
+10ca: 48 8d 3d 8f 02 10 00[ ]+lea 1049231\(%rip\),%rdi +# 101360 <.*>
# -> R_X86_64_DTPMOD64 [0 0x000000000000000]
- +10d1: e8 62 f4 ff ff[ ]+callq [0-9a-f]+ <.*>
+ +10d1: e8 [0-9a-f ]+callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+10d6: 90[ ]+nop *
+10d7: 90[ ]+nop *
@@ -133,7 +133,7 @@ Disassembly of section .text:
# LD against hidden but not local variables
+10ec: 48 8d 3d 6d 02 10 00[ ]+lea 1049197\(%rip\),%rdi +# 101360 <.*>
# -> R_X86_64_DTPMOD64 [0 0x000000000000000]
- +10f3: e8 40 f4 ff ff[ ]+callq [0-9a-f]+ <.*>
+ +10f3: e8 [0-9a-f ]+callq [0-9a-f]+ <.*>
# -> R_X86_64_JUMP_SLOT __tls_get_addr
+10f8: 90[ ]+nop *
+10f9: 90[ ]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
index e13b04a..286fbf2 100644
--- a/ld/testsuite/ld-x86-64/tlspic.rd
+++ b/ld/testsuite/ld-x86-64/tlspic.rd
@@ -50,100 +50,99 @@ Program Headers:
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+101340 0+10 R_X86_64_DTPMOD64 +0+
-0+101350 0+12 R_X86_64_TPOFF64 +0+24
-0+101358 0+12 R_X86_64_TPOFF64 +0+30
-0+101360 0+10 R_X86_64_DTPMOD64 +0+
-0+101370 0+10 R_X86_64_DTPMOD64 +0+
-0+101380 0+12 R_X86_64_TPOFF64 +0+64
-0+1013a0 0+12 R_X86_64_TPOFF64 +0+50
-0+1013a8 0+12 R_X86_64_TPOFF64 +0+70
-0+1013b8 0+10 R_X86_64_DTPMOD64 +0+
-0+1013c8 0+12 R_X86_64_TPOFF64 +0+44
-0+101388 0+800000012 R_X86_64_TPOFF64 +0+10 sg5 \+ 0
-0+101390 0+a00000010 R_X86_64_DTPMOD64 +0+ sg1 \+ 0
-0+101398 0+a00000011 R_X86_64_DTPOFF64 +0+ sg1 \+ 0
-0+1013b0 0+d00000012 R_X86_64_TPOFF64 +0+4 sg2 \+ 0
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+24
+[0-9a-f ]+R_X86_64_TPOFF64 +0+30
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+64
+[0-9a-f ]+R_X86_64_TPOFF64 +0+50
+[0-9a-f ]+R_X86_64_TPOFF64 +0+70
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+44
+[0-9a-f ]+R_X86_64_TPOFF64 +0+10 sg5 \+ 0
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+ sg1 \+ 0
+[0-9a-f ]+R_X86_64_DTPOFF64 +0+ sg1 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+4 sg2 \+ 0
Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
-0+[0-9a-f]+ 0+900000007 R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
-Symbol table '.dynsym' contains 18 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 *
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: 0+101210 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND *
+.* SECTION LOCAL DEFAULT +7 *
+.* SECTION LOCAL DEFAULT +8 *
+.* SECTION LOCAL DEFAULT +9 *
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end
Symbol table '.symtab' contains 55 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
- +[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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
- +[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +8 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL DEFAULT +8 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL HIDDEN +9 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL HIDDEN +8 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL HIDDEN +9 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL HIDDEN +9 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL HIDDEN +8 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL HIDDEN +8 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL HIDDEN +9 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL HIDDEN +8 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL HIDDEN +9 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL HIDDEN +8 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL HIDDEN +9 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL HIDDEN +9 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL HIDDEN +9 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL HIDDEN +8 sh1
- +[0-9]+: 0+1013d0 +0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL HIDDEN +8 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL HIDDEN +8 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: 0+101210 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS __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 ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+.* NOTYPE LOCAL DEFAULT UND *
+.* SECTION LOCAL DEFAULT +1 *
+.* SECTION LOCAL DEFAULT +2 *
+.* SECTION LOCAL DEFAULT +3 *
+.* SECTION LOCAL DEFAULT +4 *
+.* SECTION LOCAL DEFAULT +5 *
+.* SECTION LOCAL DEFAULT +6 *
+.* SECTION LOCAL DEFAULT +7 *
+.* SECTION LOCAL DEFAULT +8 *
+.* SECTION LOCAL DEFAULT +9 *
+.* SECTION LOCAL DEFAULT +10 *
+.* SECTION LOCAL DEFAULT +11 *
+.* SECTION LOCAL DEFAULT +12 *
+.* SECTION LOCAL DEFAULT +13 *
+.* SECTION LOCAL DEFAULT +14 *
+.* SECTION LOCAL DEFAULT +15 *
+.* TLS +LOCAL DEFAULT +8 sl1
+.* TLS +LOCAL DEFAULT +8 sl2
+.* TLS +LOCAL DEFAULT +8 sl3
+.* TLS +LOCAL DEFAULT +8 sl4
+.* TLS +LOCAL DEFAULT +8 sl5
+.* TLS +LOCAL DEFAULT +8 sl6
+.* TLS +LOCAL DEFAULT +8 sl7
+.* TLS +LOCAL DEFAULT +8 sl8
+.* TLS +LOCAL HIDDEN +9 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL HIDDEN +8 sh3
+.* TLS +LOCAL HIDDEN +9 sH2
+.* TLS +LOCAL HIDDEN +9 sH7
+.* TLS +LOCAL HIDDEN +8 sh7
+.* TLS +LOCAL HIDDEN +8 sh8
+.* TLS +LOCAL HIDDEN +9 sH4
+.* TLS +LOCAL HIDDEN +8 sh4
+.* TLS +LOCAL HIDDEN +9 sH3
+.* TLS +LOCAL HIDDEN +8 sh5
+.* TLS +LOCAL HIDDEN +9 sH5
+.* TLS +LOCAL HIDDEN +9 sH6
+.* TLS +LOCAL HIDDEN +9 sH8
+.* TLS +LOCAL HIDDEN +8 sh1
+.* OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL HIDDEN +8 sh2
+.* TLS +LOCAL HIDDEN +8 sh6
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE GLOBAL DEFAULT UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE GLOBAL DEFAULT ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE GLOBAL DEFAULT ABS _edata
+.* NOTYPE GLOBAL DEFAULT ABS _end