Dynamic TLS section symbols

It is possible to create shared libraries on PowerPC using
-ftls-model=inital-exec or -ftls-model=local-exec.  The first is half
reasonable, getting you a shared library that can't be dlopen'd but
otherwise is reasonable.  The second is quite bad.  Not only do you
lose being able to dlopen, the library also has dynamic text
relocations.  Worse, the TPREL16_LO, TPREL16_HA and other TPREL16
dynamic relocs emitted were wrong, resulting in wrong values being
applied by ld.so.

Using the first TLS section symbol in dynamic relocations for local
TLS symbols doesn't work.  It's wrong because TLS symbols used by TLS
relocs have values relative to the TLS segment, whereas the TLS
section symbols are addresses.  This patch instead uses a symbol index
of zero which is used elsewhere by PowerPC on dynamic TLS relocs.
It's not strictly ABI compliant to use a non-TLS symbol with TLS
relocs but symbol index zero can be interpreted as "no symbol".  Not
using the first TLS section symbol means it doesn't need to be dynamic.

The patch also fixes a further problem with PowerPC32 dynamic TPREL16*
relocs, which shouldn't have the symbol value in the addend as we do
for non-TLS symbols.

bfd/
	* elflink.c (_bfd_elf_omit_section_dynsym_default): Don't keep
	tls_sec.
	(_bfd_elf_init_1_index_section): Prefer not using TLS sections.
	(_bfd_elf_init_2_index_sections): Likewise.
	* elf64-ppc.c (ppc64_elf_relocate_section): When emitting dynamic
	relocations for local TLS symbols, use STN_UNDEF as the relocation
	symbol.
	* elf32-ppc.c (ppc_elf_relocate_section): Likewise, and don't
	leave TLS symbol value in the addend.
ld/
	* testsuite/ld-powerpc/tlsso.r: Update.
	* testsuite/ld-powerpc/tlsso32.g: Update.
	* testsuite/ld-powerpc/tlsso32.r: Update.
	* testsuite/ld-powerpc/tlstocso.r: Update.
	* testsuite/ld-cris/tls-dso-dtpoffd2.d: Update.
	* testsuite/ld-cris/tls-dso-dtpoffd4.d: Update.
	* testsuite/ld-cris/tls-dso-tpoffgotcomm1.d: Update.
	* testsuite/ld-cris/tls-gd-1.d: Update.
	* testsuite/ld-cris/tls-gd-1h.d: Update.
	* testsuite/ld-cris/tls-gd-2.d: Update.
	* testsuite/ld-cris/tls-gd-2h.d: Update.
	* testsuite/ld-cris/tls-ie-10.d: Update.
	* testsuite/ld-cris/tls-ie-11.d: Update.
	* testsuite/ld-cris/tls-ie-8.d: Update.
	* testsuite/ld-cris/tls-ie-9.d: Update.
	* testsuite/ld-cris/tls-js1.d: Update.
	* testsuite/ld-cris/tls-ld-4.d: Update.
	* testsuite/ld-cris/tls-ld-5.d: Update.
	* testsuite/ld-cris/tls-ld-6.d: Update.
	* testsuite/ld-cris/tls-ld-7.d: Update.
	* testsuite/ld-cris/tls-ldgd-14.d: Update.
	* testsuite/ld-cris/tls-ldgd-15.d: Update.
	* testsuite/ld-cris/tls-ldgdx-14.d: Update.
	* testsuite/ld-cris/tls-ldgdx-15.d: Update.
	* testsuite/ld-cris/tls-local-54.d: Update.
	* testsuite/ld-cris/tls-local-60.d: Update.
	* testsuite/ld-cris/tls-local-61.d: Update.
	* testsuite/ld-cris/tls-local-63.d: Update.
	* testsuite/ld-cris/tls-local-64.d: Update.
	* testsuite/ld-cris/tls-ok-30.d: Update.
	* testsuite/ld-cris/tls-ok-32.d: Update.
	* testsuite/ld-cris/tls-ok-34.d: Update.
	* testsuite/ld-mips-elf/tls-multi-got-1.got: Update.
	* testsuite/ld-mips-elf/tls-multi-got-1.r: Update.
	* testsuite/ld-mips-elf/tlsdyn-pie-o32.d: Update.
	* testsuite/ld-mips-elf/tlsdyn-pie-o32.got: Update.
	* testsuite/ld-mips-elf/tlslib-o32-hidden.got: Update.
	* testsuite/ld-mips-elf/tlslib-o32-ver.got: Update.
	* testsuite/ld-mips-elf/tlslib-o32.got: Update.
	* testsuite/ld-s390/tlspic.rd: Update.
	* testsuite/ld-s390/tlspic_64.rd: Update.
	* testsuite/ld-sparc/tlssunnopic32.rd: Update.
	* testsuite/ld-sparc/tlssunnopic64.rd: Update.
	* testsuite/ld-sparc/tlssunpic32.rd: Update.
	* testsuite/ld-sparc/tlssunpic64.rd: Update.

28 files changed, 252 insertions, 252 deletions

diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
index 12fe7f8..46ad8ab 100644
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
@@ -23,13 +23,13 @@ SYMBOL TABLE:
 0+80 g       .tdata	0+4 x
 #...
 Contents of section .rela.dyn:
- 0154 68220000 17030000 00000000           .*
+ 0140 54220000 17020000 00000000           .*
 Contents of section .text:
- 0160 41b20000 5fae0c00                    .*
+ 014c 41b20000 5fae0c00                    .*
 #...
 Contents of section .got:
- 225c ec210000 00000000 00000000 00000000  .*
- 226c 00000000                             .*
+ 2248 d8210000 00000000 00000000 00000000  .*
+ 2258 00000000                             .*
 Contents of section .debug_info:
  0000 80000000                             .*
 #...
diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
index bb72e87..a8f1305 100644
--- a/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
+++ b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
@@ -23,13 +23,13 @@ SYMBOL TABLE:
 0+80 g       .tbss	0+4 x
 #...
 Contents of section .rela.dyn:
- 0154 64220000 17030000 00000000           .*
+ 0140 50220000 17020000 00000000           .*
 Contents of section .text:
- 0160 41b20000 5fae0c00                    .*
+ 014c 41b20000 5fae0c00                    .*
 #...
 Contents of section .got:
- 2258 e8210000 00000000 00000000 00000000  .*
- 2268 00000000                             .*
+ 2244 d4210000 00000000 00000000 00000000  .*
+ 2254 00000000                             .*
 Contents of section .debug_info:
  0000 80000000                             .*
 #...
diff --git a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
index 4aa2794..a591113 100644
--- a/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
+++ b/ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d
@@ -11,7 +11,7 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+178 memsz 0x0+178 flags r-x
+         filesz 0x0+164 memsz 0x0+164 flags r-x
     LOAD off .*
          filesz .*
  DYNAMIC off .*
@@ -21,7 +21,7 @@ Program Header:
 #...
 Sections:
 #...
-  7 .got          0+14  0+21f0  0+21f0  0+1f0  2\*\*2
+  7 .got          0+14  0+21dc  0+21dc  0+1dc  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
 SYMBOL TABLE:
 #...
@@ -31,16 +31,16 @@ SYMBOL TABLE:
 
 #...
 Contents of section .got:
- 21f0 78210000 00000000 00000000 00000000  .*
- 2200 00000000                             .*
+ 21dc 64210000 00000000 00000000 00000000  .*
+ 21ec 00000000                             .*
 
 Disassembly of section \.text:
 
-0+168 <_start>:
- 168:	41b2                	moveq 1,\$r11
+0+154 <_start>:
+.*:	41b2                	moveq 1,\$r11
 	\.\.\.
 
-0+16c <do_test>:
- 16c:	2f0e 0c00 0000      	add\.d c <bar\+0x8>,\$r0
- 172:	1f1e 1000           	add\.w 0x10,\$r1
+0+158 <do_test>:
+.*:	2f0e 0c00 0000      	add\.d c <bar\+0x8>,\$r0
+.*:	1f1e 1000           	add\.w 0x10,\$r1
 	\.\.\.
diff --git a/ld/testsuite/ld-cris/tls-gd-1.d b/ld/testsuite/ld-cris/tls-gd-1.d
index 30ab7ef..4fbd79c 100644
--- a/ld/testsuite/ld-cris/tls-gd-1.d
+++ b/ld/testsuite/ld-cris/tls-gd-1.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+144 memsz 0x0+144 flags r-x
-    LOAD off    0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*13
+         filesz 0x0+130 memsz 0x0+130 flags r-x
+    LOAD off    0x0+130 vaddr 0x0+2130 paddr 0x0+2130 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1c8 vaddr 0x0+21c8 paddr 0x0+21c8 align 2\*\*2
+ DYNAMIC off    0x0+1b4 vaddr 0x0+21b4 paddr 0x0+21b4 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*2
+     TLS off    0x0+130 vaddr 0x0+2130 paddr 0x0+2130 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+d
   SYMENT               0x0+10
-  RELA                 0x0+134
+  RELA                 0x0+120
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -42,13 +42,13 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2244 R_CRIS_DTP        x
+0+2230 R_CRIS_DTP        x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0140 5fae0c00                             .*
+ 012c 5fae0c00                             .*
 #...
 Contents of section \.got:
- 2238 c8210+ 0+ 0+ 0+  .*
- 2248 0+                             .*
+ 2224 b4210+ 0+ 0+ 0+  .*
+ 2234 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-1h.d b/ld/testsuite/ld-cris/tls-gd-1h.d
index b323312..b95cc2b 100644
--- a/ld/testsuite/ld-cris/tls-gd-1h.d
+++ b/ld/testsuite/ld-cris/tls-gd-1h.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+148 memsz 0x0+148 flags r-x
-    LOAD off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*13
+         filesz 0x0+134 memsz 0x0+134 flags r-x
+    LOAD off    0x0+134 vaddr 0x0+2134 paddr 0x0+2134 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1cc vaddr 0x0+21cc paddr 0x0+21cc align 2\*\*2
+ DYNAMIC off    0x0+1b8 vaddr 0x0+21b8 paddr 0x0+21b8 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*2
+     TLS off    0x0+134 vaddr 0x0+2134 paddr 0x0+2134 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+12
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2248 R_CRIS_DTP        \*ABS\*\+0x0+80
+0+2234 R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 5fae0c00                             .*
+ 0130 5fae0c00                             .*
 #...
 Contents of section \.got:
- 223c cc210+ 0+ 0+ 0+  .*
- 224c 0+                             .*
+ 2228 b8210+ 0+ 0+ 0+  .*
+ 2238 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-2.d b/ld/testsuite/ld-cris/tls-gd-2.d
index b792eaa..1840a58 100644
--- a/ld/testsuite/ld-cris/tls-gd-2.d
+++ b/ld/testsuite/ld-cris/tls-gd-2.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+168 memsz 0x0+168 flags r-x
-    LOAD off    0x0+168 vaddr 0x0+2168 paddr 0x0+2168 align 2\*\*13
+         filesz 0x0+154 memsz 0x0+154 flags r-x
+    LOAD off    0x0+154 vaddr 0x0+2154 paddr 0x0+2154 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1ec vaddr 0x0+21ec paddr 0x0+21ec align 2\*\*2
+ DYNAMIC off    0x0+1d8 vaddr 0x0+21d8 paddr 0x0+21d8 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+168 vaddr 0x0+2168 paddr 0x0+2168 align 2\*\*2
+     TLS off    0x0+154 vaddr 0x0+2154 paddr 0x0+2154 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+140
-  SYMTAB               0x0+e0
+  STRTAB               0x0+12c
+  SYMTAB               0x0+dc
   STRSZ                0x0+14
   SYMENT               0x0+10
-  RELA                 0x0+154
+  RELA                 0x0+140
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -42,13 +42,13 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2268 R_CRIS_DTP        x
+0+2254 R_CRIS_DTP        x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0160 6fae0c00 00000000              .*
+ 014c 6fae0c00 00000000              .*
 #...
 Contents of section \.got:
- 225c ec210+ 0+ 0+ 0+  .*
- 226c 0+                             .*
+ 2248 d8210+ 0+ 0+ 0+  .*
+ 2258 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-2h.d b/ld/testsuite/ld-cris/tls-gd-2h.d
index 211d830..c881448 100644
--- a/ld/testsuite/ld-cris/tls-gd-2h.d
+++ b/ld/testsuite/ld-cris/tls-gd-2h.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+14c memsz 0x0+14c flags r-x
-    LOAD off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*13
+         filesz 0x0+138 memsz 0x0+138 flags r-x
+    LOAD off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1d0 vaddr 0x0+21d0 paddr 0x0+21d0 align 2\*\*2
+ DYNAMIC off    0x0+1bc vaddr 0x0+21bc paddr 0x0+21bc align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
+     TLS off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+12
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+224c R_CRIS_DTP        \*ABS\*\+0x0+80
+0+2238 R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 6fae0c00 00000000              .*
+ 0130 6fae0c00 00000000              .*
 #...
 Contents of section \.got:
- 2240 d0210+ 0+ 0+ 0+  .*
- 2250 0+                             .*
+ 222c bc210+ 0+ 0+ 0+  .*
+ 223c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ie-10.d b/ld/testsuite/ld-cris/tls-ie-10.d
index 9a27cb6..432b864 100644
--- a/ld/testsuite/ld-cris/tls-ie-10.d
+++ b/ld/testsuite/ld-cris/tls-ie-10.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+16c memsz 0x0+16c flags r-x
-    LOAD off    0x0+16c vaddr 0x0+216c paddr 0x0+216c align 2\*\*13
+         filesz 0x0+158 memsz 0x0+158 flags r-x
+    LOAD off    0x0+158 vaddr 0x0+2158 paddr 0x0+2158 align 2\*\*13
          filesz 0x0+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+1f0 vaddr 0x0+21f0 paddr 0x0+21f0 align 2\*\*2
+ DYNAMIC off    0x0+1dc vaddr 0x0+21dc paddr 0x0+21dc align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+16c vaddr 0x0+216c paddr 0x0+216c align 2\*\*2
+     TLS off    0x0+158 vaddr 0x0+2158 paddr 0x0+2158 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+140
-  SYMTAB               0x0+e0
+  STRTAB               0x0+12c
+  SYMTAB               0x0+dc
   STRSZ                0x0+15
   SYMENT               0x0+10
-  RELA                 0x0+158
+  RELA                 0x0+144
   RELASZ               0x0+c
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -43,12 +43,12 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2274 R_CRIS_32_TPREL   x
+0+2260 R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0164 6fae0c00 00000000                    .*
+ 0150 6fae0c00 00000000                    .*
 #...
 Contents of section \.got:
- 2268 f0210+ 0+ 0+ 0+  .*
+ 2254 dc210+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-cris/tls-ie-11.d b/ld/testsuite/ld-cris/tls-ie-11.d
index 4264777..c4ef790 100644
--- a/ld/testsuite/ld-cris/tls-ie-11.d
+++ b/ld/testsuite/ld-cris/tls-ie-11.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+190 memsz 0x0+190 flags r-x
-    LOAD off    0x0+190 vaddr 0x0+2190 paddr 0x0+2190 align 2\*\*13
+         filesz 0x0+17c memsz 0x0+17c flags r-x
+    LOAD off    0x0+17c vaddr 0x0+217c paddr 0x0+217c align 2\*\*13
          filesz 0x0+114 memsz 0x0+114 flags rw-
- DYNAMIC off    0x0+218 vaddr 0x0+2218 paddr 0x0+2218 align 2\*\*2
+ DYNAMIC off    0x0+204 vaddr 0x0+2204 paddr 0x0+2204 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+190 vaddr 0x0+2190 paddr 0x0+2190 align 2\*\*2
+     TLS off    0x0+17c vaddr 0x0+217c paddr 0x0+217c align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+154
-  SYMTAB               0x0+e4
+  STRTAB               0x0+140
+  SYMTAB               0x0+e0
   STRSZ                0x0+17
   SYMENT               0x0+10
-  RELA                 0x0+16c
+  RELA                 0x0+158
   RELASZ               0x0+18
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -47,14 +47,14 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+229c R_CRIS_32_TPREL   x2
-0+22a0 R_CRIS_32_TPREL   x1
+0+2288 R_CRIS_32_TPREL   x2
+0+228c R_CRIS_32_TPREL   x1
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0184 6fae1000 00006fbe 0c000000           .*
+ 0170 6fae1000 00006fbe 0c000000           .*
 #...
 Contents of section \.got:
- 2290 18220+ 0+ 0+ 0+  .*
- 22a0 00000000                             .*
+ 227c 04220+ 0+ 0+ 0+  .*
+ 228c 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-ie-8.d b/ld/testsuite/ld-cris/tls-ie-8.d
index f1e6edd..29c46f0 100644
--- a/ld/testsuite/ld-cris/tls-ie-8.d
+++ b/ld/testsuite/ld-cris/tls-ie-8.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+164 memsz 0x0+164 flags r-x
-    LOAD off    0x0+164 vaddr 0x0+2164 paddr 0x0+2164 align 2\*\*13
+         filesz 0x0+150 memsz 0x0+150 flags r-x
+    LOAD off    0x0+150 vaddr 0x0+2150 paddr 0x0+2150 align 2\*\*13
          filesz 0x0+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+1e8 vaddr 0x0+21e8 paddr 0x0+21e8 align 2\*\*2
+ DYNAMIC off    0x0+1d4 vaddr 0x0+21d4 paddr 0x0+21d4 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+164 vaddr 0x0+2164 paddr 0x0+2164 align 2\*\*2
+     TLS off    0x0+150 vaddr 0x0+2150 paddr 0x0+2150 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+140
-  SYMTAB               0x0+e0
+  STRTAB               0x0+12c
+  SYMTAB               0x0+dc
   STRSZ                0x0+13
   SYMENT               0x0+10
-  RELA                 0x0+154
+  RELA                 0x0+140
   RELASZ               0x0+c
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -43,12 +43,12 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+226c R_CRIS_32_TPREL   x
+0+2258 R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0160 5fae0c00                             .*
+ 014c 5fae0c00                             .*
 #...
 Contents of section \.got:
- 2260 e8210+ 0+ 0+ 0+  .*
+ 224c d4210+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-cris/tls-ie-9.d b/ld/testsuite/ld-cris/tls-ie-9.d
index 0b55fb5..0117b93 100644
--- a/ld/testsuite/ld-cris/tls-ie-9.d
+++ b/ld/testsuite/ld-cris/tls-ie-9.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+18c memsz 0x0+18c flags r-x
-    LOAD off    0x0+18c vaddr 0x0+218c paddr 0x0+218c align 2\*\*13
+         filesz 0x0+178 memsz 0x0+178 flags r-x
+    LOAD off    0x0+178 vaddr 0x0+2178 paddr 0x0+2178 align 2\*\*13
          filesz 0x0+114 memsz 0x0+114 flags rw-
- DYNAMIC off    0x0+214 vaddr 0x0+2214 paddr 0x0+2214 align 2\*\*2
+ DYNAMIC off    0x0+200 vaddr 0x0+2200 paddr 0x0+2200 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+18c vaddr 0x0+218c paddr 0x0+218c align 2\*\*2
+     TLS off    0x0+178 vaddr 0x0+2178 paddr 0x0+2178 align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+154
-  SYMTAB               0x0+e4
+  STRTAB               0x0+140
+  SYMTAB               0x0+e0
   STRSZ                0x0+18
   SYMENT               0x0+10
-  RELA                 0x0+16c
+  RELA                 0x0+158
   RELASZ               0x0+18
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -47,14 +47,14 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2298 R_CRIS_32_TPREL   x2
-0+229c R_CRIS_32_TPREL   x1
+0+2284 R_CRIS_32_TPREL   x2
+0+2288 R_CRIS_32_TPREL   x1
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0184 5fae1000 5fbe0c00                    .*
+ 0170 5fae1000 5fbe0c00                    .*
 #...
 Contents of section \.got:
- 228c 14220+ 0+ 0+ 0+  .*
- 229c 00000000                             .*
+ 2278 00220+ 0+ 0+ 0+  .*
+ 2288 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index e6b49fa..f007ea4 100644
--- a/ld/testsuite/ld-cris/tls-js1.d
+++ b/ld/testsuite/ld-cris/tls-js1.d
@@ -16,17 +16,17 @@
 # Making sure .rela.plt has the right contents; no R_CRIS_NONE entries.
 
 #...
-  .* .got[ 	]+PROGBITS[ 	]+0+22f8 0+2f8 0+20 04  WA  0   0  4
+  .* .got[ 	]+PROGBITS[ 	]+0+22e4 0+2e4 0+20 04  WA  0   0  4
 #...
-Relocation section '\.rela\.dyn' at offset 0x1bc contains 2 entries:
+Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-00002304  0000001e R_CRIS_DTPMOD +0
-00002314  0000050a R_CRIS_GLOB_DAT   00002318   expobj \+ 0
+000022f0  0000001e R_CRIS_DTPMOD +0
+00002300  0000040a R_CRIS_GLOB_DAT   00002304   expobj \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x1d4 contains 2 entries:
+Relocation section '\.rela\.plt' at offset .* contains 2 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-0000230c  0000030b R_CRIS_JUMP_SLOT  00000246   dsofn4 \+ 0
-00002310  0000090b R_CRIS_JUMP_SLOT  0000025e   dsofn \+ 0
+000022f8  0000020b R_CRIS_JUMP_SLOT  00000232   dsofn4 \+ 0
+000022fc  0000080b R_CRIS_JUMP_SLOT  0000024a   dsofn \+ 0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 #pass
diff --git a/ld/testsuite/ld-cris/tls-ld-4.d b/ld/testsuite/ld-cris/tls-ld-4.d
index 54d51d8..a396a58 100644
--- a/ld/testsuite/ld-cris/tls-ld-4.d
+++ b/ld/testsuite/ld-cris/tls-ld-4.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+148 memsz 0x0+148 flags r-x
-    LOAD off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*13
+         filesz 0x0+134 memsz 0x0+134 flags r-x
+    LOAD off    0x0+134 vaddr 0x0+2134 paddr 0x0+2134 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1cc vaddr 0x0+21cc paddr 0x0+21cc align 2\*\*2
+ DYNAMIC off    0x0+1b8 vaddr 0x0+21b8 paddr 0x0+21b8 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*2
+     TLS off    0x0+134 vaddr 0x0+2134 paddr 0x0+2134 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2248 R_CRIS_DTPMOD     \*ABS\*
+0+2234 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 5fae8000                             .*
+ 0130 5fae8000                             .*
 #...
 Contents of section \.got:
- 223c cc210+ 0+ 0+ 0+  .*
- 224c 0+                             .*
+ 2228 b8210+ 0+ 0+ 0+  .*
+ 2238 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-5.d b/ld/testsuite/ld-cris/tls-ld-5.d
index 9db1255..287b5ee 100644
--- a/ld/testsuite/ld-cris/tls-ld-5.d
+++ b/ld/testsuite/ld-cris/tls-ld-5.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+14c memsz 0x0+14c flags r-x
-    LOAD off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*13
+         filesz 0x0+138 memsz 0x0+138 flags r-x
+    LOAD off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*13
          filesz 0x0+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+1d4 vaddr 0x0+21d4 paddr 0x0+21d4 align 2\*\*2
+ DYNAMIC off    0x0+1c0 vaddr 0x0+21c0 paddr 0x0+21c0 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
+     TLS off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -39,13 +39,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2250 R_CRIS_DTPMOD     \*ABS\*
+0+223c R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 5fae8000 5fbe8400              .*
+ 0130 5fae8000 5fbe8400              .*
 #...
 Contents of section \.got:
- 2244 d4210+ 0+ 0+ 0+  .*
- 2254 0+                             .*
+ 2230 c0210+ 0+ 0+ 0+  .*
+ 2240 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-6.d b/ld/testsuite/ld-cris/tls-ld-6.d
index 43cf43f..43bb17e 100644
--- a/ld/testsuite/ld-cris/tls-ld-6.d
+++ b/ld/testsuite/ld-cris/tls-ld-6.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+14c memsz 0x0+14c flags r-x
-    LOAD off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*13
+         filesz 0x0+138 memsz 0x0+138 flags r-x
+    LOAD off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*13
          filesz 0x0+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+1d0 vaddr 0x0+21d0 paddr 0x0+21d0 align 2\*\*2
+ DYNAMIC off    0x0+1bc vaddr 0x0+21bc paddr 0x0+21bc align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
+     TLS off    0x0+138 vaddr 0x0+2138 paddr 0x0+2138 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+224c R_CRIS_DTPMOD     \*ABS\*
+0+2238 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 6fae8000 00000000              .*
+ 0130 6fae8000 00000000              .*
 #...
 Contents of section \.got:
- 2240 d0210+ 0+ 0+ 0+  .*
- 2250 0+                             .*
+ 222c bc210+ 0+ 0+ 0+  .*
+ 223c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-7.d b/ld/testsuite/ld-cris/tls-ld-7.d
index 7be8b87..cd3a2f7 100644
--- a/ld/testsuite/ld-cris/tls-ld-7.d
+++ b/ld/testsuite/ld-cris/tls-ld-7.d
@@ -12,21 +12,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+150 memsz 0x0+150 flags r-x
-    LOAD off    0x0+150 vaddr 0x0+2150 paddr 0x0+2150 align 2\*\*13
+         filesz 0x0+13c memsz 0x0+13c flags r-x
+    LOAD off    0x0+13c vaddr 0x0+213c paddr 0x0+213c align 2\*\*13
          filesz 0x0+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+1d8 vaddr 0x0+21d8 paddr 0x0+21d8 align 2\*\*2
+ DYNAMIC off    0x0+1c4 vaddr 0x0+21c4 paddr 0x0+21c4 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+150 vaddr 0x0+2150 paddr 0x0+2150 align 2\*\*2
+     TLS off    0x0+13c vaddr 0x0+213c paddr 0x0+213c align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+124
-  SYMTAB               0x0+d4
+  STRTAB               0x0+110
+  SYMTAB               0x0+d0
   STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+138
+  RELA                 0x0+124
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -39,13 +39,13 @@ SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2254 R_CRIS_DTPMOD     \*ABS\*
+0+2240 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0144 6fae80+ 0+6fbe 840+     .*
+ 0130 6fae80+ 0+6fbe 840+     .*
 #...
 Contents of section \.got:
- 2248 d8210+ 0+ 0+ 0+  .*
- 2258 0+                             .*
+ 2234 c4210+ 0+ 0+ 0+  .*
+ 2244 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgd-14.d b/ld/testsuite/ld-cris/tls-ldgd-14.d
index 0cbd687..1c3ca02 100644
--- a/ld/testsuite/ld-cris/tls-ldgd-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-14.d
@@ -17,21 +17,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+1dc memsz 0x0+1dc flags r-x
-    LOAD off    0x0+1dc vaddr 0x0+21dc paddr 0x0+21dc align 2\*\*13
+         filesz 0x0+1c8 memsz 0x0+1c8 flags r-x
+    LOAD off    0x0+1c8 vaddr 0x0+21c8 paddr 0x0+21c8 align 2\*\*13
          filesz 0x0+124 memsz 0x0+124 flags rw-
- DYNAMIC off    0x0+26c vaddr 0x0+226c paddr 0x0+226c align 2\*\*2
+ DYNAMIC off    0x0+258 vaddr 0x0+2258 paddr 0x0+2258 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1dc vaddr 0x0+21dc paddr 0x0+21dc align 2\*\*2
+     TLS off    0x0+1c8 vaddr 0x0+21c8 paddr 0x0+21c8 align 2\*\*2
          filesz 0x0+90 memsz 0x0+90 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+17c
-  SYMTAB               0x0+ec
+  STRTAB               0x0+168
+  SYMTAB               0x0+e8
   STRSZ                0x0+2a
   SYMENT               0x0+10
-  RELA                 0x0+1a8
+  RELA                 0x0+194
   RELASZ               0x0+24
   RELAENT              0x0+c
 private flags = 0:
@@ -55,17 +55,17 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22e8 R_CRIS_DTPMOD     \*ABS\*
-0+22f0 R_CRIS_DTP        x
-0+22f8 R_CRIS_DTP        z
+0+22d4 R_CRIS_DTPMOD     \*ABS\*
+0+22dc R_CRIS_DTP        x
+0+22e4 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01cc 5fae8800 5fbe8c00 5fae1400 5fae1c00  .*
+ 01b8 5fae8800 5fbe8c00 5fae1400 5fae1c00  .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 22dc 6c220+ 0+ 0+ 0+  .*
- 22ec 0+ 0+ 0+ 0+  .*
- 22fc 0+                             .*
+ 22c8 58220+ 0+ 0+ 0+  .*
+ 22d8 0+ 0+ 0+ 0+  .*
+ 22e8 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgd-15.d b/ld/testsuite/ld-cris/tls-ldgd-15.d
index 54bf280..32afffa 100644
--- a/ld/testsuite/ld-cris/tls-ldgd-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-15.d
@@ -17,21 +17,21 @@
 
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
-         filesz 0x0+1e8 memsz 0x0+1e8 flags r-x
-    LOAD off    0x0+1e8 vaddr 0x0+21e8 paddr 0x0+21e8 align 2\*\*13
+         filesz 0x0+1d4 memsz 0x0+1d4 flags r-x
+    LOAD off    0x0+1d4 vaddr 0x0+21d4 paddr 0x0+21d4 align 2\*\*13
          filesz 0x0+124 memsz 0x0+124 flags rw-
- DYNAMIC off    0x0+278 vaddr 0x0+2278 paddr 0x0+2278 align 2\*\*2
+ DYNAMIC off    0x0+264 vaddr 0x0+2264 paddr 0x0+2264 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1e8 vaddr 0x0+21e8 paddr 0x0+21e8 align 2\*\*2
+     TLS off    0x0+1d4 vaddr 0x0+21d4 paddr 0x0+21d4 align 2\*\*2
          filesz 0x0+90 memsz 0x0+90 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+17c
-  SYMTAB               0x0+ec
+  STRTAB               0x0+168
+  SYMTAB               0x0+e8
   STRSZ                0x0+2a
   SYMENT               0x0+10
-  RELA                 0x0+1a8
+  RELA                 0x0+194
   RELASZ               0x0+24
   RELAENT              0x0+c
 private flags = 0:
@@ -55,18 +55,18 @@ DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22f4 R_CRIS_DTPMOD     \*ABS\*
-0+22fc R_CRIS_DTP        x
-0+2304 R_CRIS_DTP        z
+0+22e0 R_CRIS_DTPMOD     \*ABS\*
+0+22e8 R_CRIS_DTP        x
+0+22f0 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01cc 6fae8800 00006fbe 8c000000 6fae1400  .*
- 01dc 0+ 6fae1c00 0+           .*
+ 01b8 6fae8800 00006fbe 8c000000 6fae1400  .*
+ 01c8 0+ 6fae1c00 0+           .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 22e8 78220+ 0+ 0+ 0+  .*
- 22f8 0+ 0+ 0+ 0+  .*
- 2308 0+                             .*
+ 22d4 64220+ 0+ 0+ 0+  .*
+ 22e4 0+ 0+ 0+ 0+  .*
+ 22f4 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-14.d b/ld/testsuite/ld-cris/tls-ldgdx-14.d
index 3b62729..0389fb6 100644
--- a/ld/testsuite/ld-cris/tls-ldgdx-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-14.d
@@ -39,17 +39,17 @@ DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000022e4 R_CRIS_DTPMOD     \*ABS\*
-000022ec R_CRIS_DTP        x
-000022f4 R_CRIS_DTP        z
+000022d0 R_CRIS_DTPMOD     \*ABS\*
+000022d8 R_CRIS_DTP        x
+000022e0 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01c8 5fae8000 5fbe8400 5fae1400 5fae1c00  .*
+ 01b4 5fae8000 5fbe8400 5fae1400 5fae1c00  .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 22d8 60220+ 0+ 0+ 0+  .*
- 22e8 0+ 0+ 0+ 0+  .*
- 22f8 0+                             .*
+ 22c4 4c220+ 0+ 0+ 0+  .*
+ 22d4 0+ 0+ 0+ 0+  .*
+ 22e4 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-15.d b/ld/testsuite/ld-cris/tls-ldgdx-15.d
index 4ecfa6b..97f2351 100644
--- a/ld/testsuite/ld-cris/tls-ldgdx-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-15.d
@@ -39,18 +39,18 @@ DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000022f0 R_CRIS_DTPMOD     \*ABS\*
-000022f8 R_CRIS_DTP        x
-00002300 R_CRIS_DTP        z
+000022dc R_CRIS_DTPMOD     \*ABS\*
+000022e4 R_CRIS_DTP        x
+000022ec R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01c8 6fae8000 00006fbe 84000000 6fae1400  .*
- 01d8 0+ 6fae1c00 0+           .*
+ 01b4 6fae8000 00006fbe 84000000 6fae1400  .*
+ 01c4 0+ 6fae1c00 0+           .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 22e4 6c220+ 0+ 0+ 0+  .*
- 22f4 0+ 0+ 0+ 0+  .*
- 2304 0+                             .*
+ 22d0 58220+ 0+ 0+ 0+  .*
+ 22e0 0+ 0+ 0+ 0+  .*
+ 22f0 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-local-54.d b/ld/testsuite/ld-cris/tls-local-54.d
index f2a100f..693f08d 100644
--- a/ld/testsuite/ld-cris/tls-local-54.d
+++ b/ld/testsuite/ld-cris/tls-local-54.d
@@ -15,13 +15,13 @@ Program Header:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0000222c R_CRIS_DTP        \*ABS\*\+0x0000002a
+00002218 R_CRIS_DTP        \*ABS\*\+0x0000002a
 
 Contents of section .hash:
 #...
 Contents of section \.text:
- 0128 6fae0c00 00000000                    .*
+ 0114 6fae0c00 00000000                    .*
 #...
 Contents of section \.got:
- 2220 b0210000 0+ 0+ 0+  .*
- 2230 0+                             .*
+ 220c 9c210000 0+ 0+ 0+  .*
+ 221c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-local-60.d b/ld/testsuite/ld-cris/tls-local-60.d
index fb680ea..2d99e93 100644
--- a/ld/testsuite/ld-cris/tls-local-60.d
+++ b/ld/testsuite/ld-cris/tls-local-60.d
@@ -19,15 +19,15 @@ Program Header:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000022c8 R_CRIS_32_TPREL   \*ABS\*\+0x0+4
-000022cc R_CRIS_DTP        \*ABS\*\+0x0+4
+000022b4 R_CRIS_32_TPREL   \*ABS\*\+0x0+4
+000022b8 R_CRIS_DTP        \*ABS\*\+0x0+4
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01ac 6fae1000 00006fae 0c000000 5fae1000  .*
- 01bc 5fae0c00                             .*
+ 0198 6fae1000 00006fae 0c000000 5fae1000  .*
+ 01a8 5fae0c00                             .*
 #...
 Contents of section \.got:
- 22bc 44220+ 0+ 0+ 040+  .*
- 22cc 0+ 0+                    .*
+ 22a8 30220+ 0+ 0+ 040+  .*
+ 22b8 0+ 0+                    .*
diff --git a/ld/testsuite/ld-cris/tls-local-61.d b/ld/testsuite/ld-cris/tls-local-61.d
index 029810b..640056b 100644
--- a/ld/testsuite/ld-cris/tls-local-61.d
+++ b/ld/testsuite/ld-cris/tls-local-61.d
@@ -18,15 +18,15 @@ Program Header:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000022b0 R_CRIS_32_TPREL   \*ABS\*
-000022b4 R_CRIS_DTP        \*ABS\*
+0000229c R_CRIS_32_TPREL   \*ABS\*
+000022a0 R_CRIS_DTP        \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0198 6fae1000 00006fae 0c000000 5fae1000  .*
- 01a8 5fae0c00                             .*
+ 0184 6fae1000 00006fae 0c000000 5fae1000  .*
+ 0194 5fae0c00                             .*
 #...
 Contents of section \.got:
- 22a4 2c220+ 0+ 0+ 0+  .*
- 22b4 0+ 0+                    .*
+ 2290 18220+ 0+ 0+ 0+  .*
+ 22a0 0+ 0+                    .*
diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index 2c16747..7fde60a 100644
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -10,11 +10,11 @@
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-000021b4  0000001c R_CRIS_32_TPREL[ ]+0
+000021a0  0000001c R_CRIS_32_TPREL[ ]+0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
-Symbol table '.dynsym' contains 4 entries:
+Symbol table '.dynsym' contains 3 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
 #...
 Symbol table '.symtab' contains 13 entries:
@@ -22,10 +22,10 @@ Symbol table '.symtab' contains 13 entries:
      .: 00000000 +4 +TLS +LOCAL +DEFAULT +6 x
 #...
 Hex dump of section '.text':
-  0x00000128 5fae0c00                            .*
+  0x00000114 5fae0c00                            .*
 #...
 Hex dump of section '.tdata':
-  0x0000212c 280+                            .*
+  0x00002118 280+                            .*
 #...
 Hex dump of section '.got':
-  0x0+21a8 30210000 0+ 0+ 0+ .*
+  0x0+2194 1c210000 0+ 0+ 0+ .*
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 5f92698..ec0b0ea 100644
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -12,11 +12,11 @@
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00002234  0000001c R_CRIS_32_TPREL[ ]+80
+00002220  0000001c R_CRIS_32_TPREL[ ]+80
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
-Symbol table '.dynsym' contains 4 entries:
+Symbol table '.dynsym' contains 3 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
 #...
 Symbol table '.symtab' contains [0-9]+ entries:
@@ -24,14 +24,14 @@ Symbol table '.symtab' contains [0-9]+ entries:
     ..: 00000080 +4 +TLS +LOCAL +DEFAULT +6 x
 #...
 Hex dump of section '.text':
-  0x00000128 5fae0c00                            .*
+  0x00000114 5fae0c00                            .*
 #...
 Hex dump of section '.tdata':
-  0x0000212c 2f0+ 0+ 0+ 0+ .*
-  0x0000213c 0+ 0+ 0+ 0+ .*
+  0x00002118 2f0+ 0+ 0+ 0+ .*
+  0x00002128 0+ 0+ 0+ 0+ .*
 #...
-  0x0000219c 0+ 0+ 0+ 0+ .*
-  0x000021ac 280+                            .*
+  0x00002188 0+ 0+ 0+ 0+ .*
+  0x00002198 280+                            .*
 #...
 Hex dump of section '.got':
-  0x0+2228 b0210000 0+ 0+ 80+ .*
+  0x0+2214 9c210000 0+ 0+ 80+ .*
diff --git a/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
index 8ab8c2a..77af273 100644
--- a/ld/testsuite/ld-cris/tls-ok-30.d
+++ b/ld/testsuite/ld-cris/tls-ok-30.d
@@ -11,19 +11,19 @@
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000b38bc R_CRIS_DTP        x2814
+000b38a8 R_CRIS_DTP        x2814
 #...
-000b82fc R_CRIS_DTP        x8190
+000b82e8 R_CRIS_DTP        x8190
 #...
-000c12b4 R_CRIS_DTP        x0
+000c12a0 R_CRIS_DTP        x0
 #...
-000c38ac R_CRIS_DTP        x1345
+000c3898 R_CRIS_DTP        x1345
 
 Contents of section .got:
- b38b0 40380b00 00000000 00000000 00000000  .*
- b38c0 00000000 00000000 00000000 00000000  .*
+ b389c 2c380b00 00000000 00000000 00000000  .*
+ b38ac 00000000 00000000 00000000 00000000  .*
 #...
- c3890 00000000 00000000 00000000 00000000  .*
- c38a0 00000000 00000000 00000000 00000000  .*
- c38b0 00000000                             .*
+ c387c 00000000 00000000 00000000 00000000  .*
+ c388c 00000000 00000000 00000000 00000000  .*
+ c389c 00000000                             .*
 #PASS
diff --git a/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
index e633120..e6f3992 100644
--- a/ld/testsuite/ld-cris/tls-ok-32.d
+++ b/ld/testsuite/ld-cris/tls-ok-32.d
@@ -10,14 +10,14 @@
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0000a1c4 R_CRIS_DTPMOD     \*ABS\*
+0000a1b0 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.text:
- 0144 5faeff7f                             .*
+ 0130 5faeff7f                             .*
 Contents of section \.tdata:
- 2148 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
+ 2134 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
 #...
- a138 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
+ a124 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
 Contents of section \.got:
- a1b8 48a10000 00000000 00000000 00000000  .*
- a1c8 00000000                             .*
+ a1a4 34a10000 00000000 00000000 00000000  .*
+ a1b4 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
index a960c69..302d6bb 100644
--- a/ld/testsuite/ld-cris/tls-ok-34.d
+++ b/ld/testsuite/ld-cris/tls-ok-34.d
@@ -12,17 +12,17 @@
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000b381c R_CRIS_32_TPREL   x2814
+000b3808 R_CRIS_32_TPREL   x2814
 #...
-000b4808 R_CRIS_32_TPREL   x8188
+000b47f4 R_CRIS_32_TPREL   x8188
 #...
-000ba510 R_CRIS_32_TPREL   x0
+000ba4fc R_CRIS_32_TPREL   x0
 #...
-000bb80c R_CRIS_32_TPREL   x1345
+000bb7f8 R_CRIS_32_TPREL   x1345
 
 Contents of section .got:
- b3810 98370b00 00000000 00000000 00000000  .*
- b3820 00000000 00000000 00000000 00000000  .*
+ b37fc 84370b00 00000000 00000000 00000000  .*
+ b380c 00000000 00000000 00000000 00000000  .*
 #...
- bb7f0 00000000 00000000 00000000 00000000  .*
- bb800 00000000 00000000 00000000 00000000  .*
+ bb7dc 00000000 00000000 00000000 00000000  .*
+ bb7ec 00000000 00000000 00000000 00000000  .*