[13/13] ld/cris: Update tests for _edata, __bss_start, and _end changes

Message ID 20180601184357.10746-14-hjl.tools@gmail.com
State New
Headers show
Series
  • Define _edata, __bss_start, and _end only for executables
Related show

Commit Message

H.J. Lu June 1, 2018, 6:43 p.m.
Since _edata, __bss_start, and _end are no longer defined in shared
libraries, adjust linker tests for address changes.

	PR ld/23161
	* testsuite/ld-cris/dso-pltdis1.d: Updated.
	* testsuite/ld-cris/dso-pltdis2.d: Likewise.
	* testsuite/ld-cris/dso12-pltdis.d: Likewise.
	* testsuite/ld-cris/gotplt1.d: Likewise.
	* testsuite/ld-cris/gotplt2.d: Likewise.
	* testsuite/ld-cris/gotplt3.d: Likewise.
	* testsuite/ld-cris/hiddef1.d: Likewise.
	* testsuite/ld-cris/libdso-1.d: Likewise.
	* testsuite/ld-cris/libdso-10.d: Likewise.
	* testsuite/ld-cris/libdso-11.d: Likewise.
	* testsuite/ld-cris/libdso-12.d: Likewise.
	* testsuite/ld-cris/libdso-12b.d: Likewise.
	* testsuite/ld-cris/libdso-12c.d: Likewise.
	* testsuite/ld-cris/libdso-13.d: Likewise.
	* testsuite/ld-cris/libdso-13b.d: Likewise.
	* testsuite/ld-cris/libdso-14.d: Likewise.
	* testsuite/ld-cris/libdso-15.d: Likewise.
	* testsuite/ld-cris/libdso-15b.d: Likewise.
	* testsuite/ld-cris/libdso-1c.d: Likewise.
	* testsuite/ld-cris/libdso-1d.d: Likewise.
	* testsuite/ld-cris/libdso-2.d: Likewise.
	* testsuite/ld-cris/pic-gc-72.d: Likewise.
	* testsuite/ld-cris/pic-gc-73.d: Likewise.
	* testsuite/ld-cris/pr16044.d: Likewise.
	* testsuite/ld-cris/pv32-1.d: Likewise.
	* testsuite/ld-cris/tls-dso-dtpoffd2.d: Likewise.
	* testsuite/ld-cris/tls-dso-dtpoffd4.d: Likewise.
	* testsuite/ld-cris/tls-dso-tpoffgotcomm1.d: Likewise.
	* testsuite/ld-cris/tls-gc-71.d: Likewise.
	* testsuite/ld-cris/tls-gd-1.d: Likewise.
	* testsuite/ld-cris/tls-gd-1h.d: Likewise.
	* testsuite/ld-cris/tls-gd-2.d: Likewise.
	* testsuite/ld-cris/tls-gd-2h.d: Likewise.
	* testsuite/ld-cris/tls-ie-10.d: Likewise.
	* testsuite/ld-cris/tls-ie-11.d: Likewise.
	* testsuite/ld-cris/tls-ie-78.d: Likewise.
	* testsuite/ld-cris/tls-ie-8.d: Likewise.
	* testsuite/ld-cris/tls-ie-9.d: Likewise.
	* testsuite/ld-cris/tls-js1.d: Likewise.
	* testsuite/ld-cris/tls-ld-4.d: Likewise.
	* testsuite/ld-cris/tls-ld-5.d: Likewise.
	* testsuite/ld-cris/tls-ld-6.d: Likewise.
	* testsuite/ld-cris/tls-ld-7.d: Likewise.
	* testsuite/ld-cris/tls-ldgd-14.d: Likewise.
	* testsuite/ld-cris/tls-ldgd-15.d: Likewise.
	* testsuite/ld-cris/tls-ldgdex-14.d: Likewise.
	* testsuite/ld-cris/tls-ldgdex-15.d: Likewise.
	* testsuite/ld-cris/tls-ldgdx-14.d: Likewise.
	* testsuite/ld-cris/tls-ldgdx-15.d: Likewise.
	* testsuite/ld-cris/tls-legdx-16.d: Likewise.
	* testsuite/ld-cris/tls-legdx-17.d: Likewise.
	* testsuite/ld-cris/tls-local-54.d: Likewise.
	* testsuite/ld-cris/tls-local-60.d: Likewise.
	* testsuite/ld-cris/tls-local-61.d: Likewise.
	* testsuite/ld-cris/tls-local-63.d: Likewise.
	* testsuite/ld-cris/tls-local-64.d: Likewise.
	* testsuite/ld-cris/tls-ok-30.d: Likewise.
	* testsuite/ld-cris/tls-ok-32.d: Likewise.
	* testsuite/ld-cris/tls-ok-34.d: Likewise.
	* testsuite/ld-cris/tls-und-38.d: Likewise.
	* testsuite/ld-cris/tls-und-42.d: Likewise.
	* testsuite/ld-cris/tls-und-46.d: Likewise.
	* testsuite/ld-cris/tls-und-50.d: Likewise.
	* testsuite/ld-cris/weakhiddso.d: Likewise.
	* testsuite/ld-cris/weakref2.d: Likewise.
---
 ld/testsuite/ld-cris/dso-pltdis1.d           | 62 ++++++++---------
 ld/testsuite/ld-cris/dso-pltdis2.d           | 66 +++++++++---------
 ld/testsuite/ld-cris/dso12-pltdis.d          | 70 ++++++++++----------
 ld/testsuite/ld-cris/gotplt1.d               | 38 +++++------
 ld/testsuite/ld-cris/gotplt2.d               | 24 +++----
 ld/testsuite/ld-cris/gotplt3.d               | 26 ++++----
 ld/testsuite/ld-cris/hiddef1.d               |  4 +-
 ld/testsuite/ld-cris/libdso-1.d              |  2 +-
 ld/testsuite/ld-cris/libdso-10.d             | 24 +++----
 ld/testsuite/ld-cris/libdso-11.d             | 18 ++---
 ld/testsuite/ld-cris/libdso-12.d             | 52 +++++++--------
 ld/testsuite/ld-cris/libdso-12b.d            | 52 +++++++--------
 ld/testsuite/ld-cris/libdso-12c.d            | 36 +++++-----
 ld/testsuite/ld-cris/libdso-13.d             |  4 +-
 ld/testsuite/ld-cris/libdso-13b.d            |  2 +-
 ld/testsuite/ld-cris/libdso-14.d             |  8 +--
 ld/testsuite/ld-cris/libdso-15.d             | 14 ++--
 ld/testsuite/ld-cris/libdso-15b.d            | 20 +++---
 ld/testsuite/ld-cris/libdso-1c.d             | 20 +++---
 ld/testsuite/ld-cris/libdso-1d.d             | 26 ++++----
 ld/testsuite/ld-cris/libdso-2.d              | 13 ++--
 ld/testsuite/ld-cris/pic-gc-72.d             |  8 +--
 ld/testsuite/ld-cris/pic-gc-73.d             |  6 +-
 ld/testsuite/ld-cris/pr16044.d               | 11 ++-
 ld/testsuite/ld-cris/pv32-1.d                | 35 +++++-----
 ld/testsuite/ld-cris/tls-dso-dtpoffd2.d      |  8 +--
 ld/testsuite/ld-cris/tls-dso-dtpoffd4.d      |  8 +--
 ld/testsuite/ld-cris/tls-dso-tpoffgotcomm1.d | 18 ++---
 ld/testsuite/ld-cris/tls-gc-71.d             | 13 ++--
 ld/testsuite/ld-cris/tls-gd-1.d              | 24 +++----
 ld/testsuite/ld-cris/tls-gd-1h.d             | 24 +++----
 ld/testsuite/ld-cris/tls-gd-2.d              | 24 +++----
 ld/testsuite/ld-cris/tls-gd-2h.d             | 24 +++----
 ld/testsuite/ld-cris/tls-ie-10.d             | 22 +++---
 ld/testsuite/ld-cris/tls-ie-11.d             | 26 ++++----
 ld/testsuite/ld-cris/tls-ie-78.d             |  6 +-
 ld/testsuite/ld-cris/tls-ie-8.d              | 22 +++---
 ld/testsuite/ld-cris/tls-ie-9.d              | 26 ++++----
 ld/testsuite/ld-cris/tls-js1.d               | 14 ++--
 ld/testsuite/ld-cris/tls-ld-4.d              | 24 +++----
 ld/testsuite/ld-cris/tls-ld-5.d              | 24 +++----
 ld/testsuite/ld-cris/tls-ld-6.d              | 24 +++----
 ld/testsuite/ld-cris/tls-ld-7.d              | 24 +++----
 ld/testsuite/ld-cris/tls-ldgd-14.d           | 30 ++++-----
 ld/testsuite/ld-cris/tls-ldgd-15.d           | 32 ++++-----
 ld/testsuite/ld-cris/tls-ldgdex-14.d         | 14 ++--
 ld/testsuite/ld-cris/tls-ldgdex-15.d         | 14 ++--
 ld/testsuite/ld-cris/tls-ldgdx-14.d          | 14 ++--
 ld/testsuite/ld-cris/tls-ldgdx-15.d          | 16 ++---
 ld/testsuite/ld-cris/tls-legdx-16.d          | 12 ++--
 ld/testsuite/ld-cris/tls-legdx-17.d          | 12 ++--
 ld/testsuite/ld-cris/tls-local-54.d          |  8 +--
 ld/testsuite/ld-cris/tls-local-60.d          | 12 ++--
 ld/testsuite/ld-cris/tls-local-61.d          | 12 ++--
 ld/testsuite/ld-cris/tls-local-63.d          | 12 ++--
 ld/testsuite/ld-cris/tls-local-64.d          | 16 ++---
 ld/testsuite/ld-cris/tls-ok-30.d             | 18 ++---
 ld/testsuite/ld-cris/tls-ok-32.d             | 12 ++--
 ld/testsuite/ld-cris/tls-ok-34.d             | 16 ++---
 ld/testsuite/ld-cris/tls-und-38.d            |  6 +-
 ld/testsuite/ld-cris/tls-und-42.d            |  4 +-
 ld/testsuite/ld-cris/tls-und-46.d            |  6 +-
 ld/testsuite/ld-cris/tls-und-50.d            |  4 +-
 ld/testsuite/ld-cris/weakhiddso.d            | 13 ++--
 ld/testsuite/ld-cris/weakref2.d              |  2 +-
 65 files changed, 633 insertions(+), 648 deletions(-)

-- 
2.17.0

Patch

diff --git a/ld/testsuite/ld-cris/dso-pltdis1.d b/ld/testsuite/ld-cris/dso-pltdis1.d
index 241328c1db..efc4d94aaf 100644
--- a/ld/testsuite/ld-cris/dso-pltdis1.d
+++ b/ld/testsuite/ld-cris/dso-pltdis1.d
@@ -20,42 +20,42 @@ 
 
 Disassembly of section \.plt:
 
-0+1b4 <.*>:
- 1b4:	84e2                	subq 4,\$sp
- 1b6:	0401                	addoq 4,\$r0,\$acr
- 1b8:	7e7a                	move \$mof,\[\$sp\]
- 1ba:	3f7a                	move \[\$acr\],\$mof
- 1bc:	04f2                	addq 4,\$acr
- 1be:	6ffa                	move\.d \[\$acr\],\$acr
- 1c0:	bf09                	jump \$acr
- 1c2:	b005                	nop 
+0+160 <.*>:
+ 160:	84e2                	subq 4,\$sp
+ 162:	0401                	addoq 4,\$r0,\$acr
+ 164:	7e7a                	move \$mof,\[\$sp\]
+ 166:	3f7a                	move \[\$acr\],\$mof
+ 168:	04f2                	addq 4,\$acr
+ 16a:	6ffa                	move\.d \[\$acr\],\$acr
+ 16c:	bf09                	jump \$acr
+ 16e:	b005                	nop 
 	\.\.\.
 #...
- 1ce:	6f0d ..00 0000      	addo\.d .*
- 1d4:	6ffa                	move\.d \[\$acr\],\$acr
- 1d6:	bf09                	jump \$acr
- 1d8:	b005                	nop 
- 1da:	3f7e .... ....      	move .*,\$mof
- 1e0:	bf0e .... ....      	ba .*
- 1e6:	b005                	nop 
+ 17a:	6f0d ..00 0000      	addo\.d .*
+ 180:	6ffa                	move\.d \[\$acr\],\$acr
+ 182:	bf09                	jump \$acr
+ 184:	b005                	nop 
+ 186:	3f7e .... ....      	move .*,\$mof
+ 18c:	bf0e .... ....      	ba .*
+ 192:	b005                	nop 
 
-0+1e8 <dsofn@plt>:
- 1e8:	6f0d ..00 0000      	addo\.d .*
- 1ee:	6ffa                	move\.d \[\$acr\],\$acr
- 1f0:	bf09                	jump \$acr
- 1f2:	b005                	nop 
- 1f4:	3f7e .... ....      	move .*,\$mof
- 1fa:	bf0e baff ffff      	ba 1b4 <.*>
- 200:	b005                	nop 
+0+194 <dsofn@plt>:
+ 194:	6f0d ..00 0000      	addo\.d .*
+ 19a:	6ffa                	move\.d \[\$acr\],\$acr
+ 19c:	bf09                	jump \$acr
+ 19e:	b005                	nop 
+ 1a0:	3f7e .... ....      	move .*,\$mof
+ 1a6:	bf0e baff ffff      	ba 160 <.*>
+ 1ac:	b005                	nop 
 
 Disassembly of section \.text:
 #...
-0+202 <dsofn3>:
- 202:	bfbe e6ff ffff      	bsr 1e8 <dsofn@plt>
- 208:	b005                	nop 
+0+1ae <dsofn3>:
+ 1ae:	bfbe e6ff ffff      	bsr 194 <dsofn@plt>
+ 1b4:	b005                	nop 
 
-0+20a <dsofn4>:
- 20a:	7f0d ae20 0000      	lapc 22b8 <_GLOBAL_OFFSET_TABLE_>,\$r0
- 210:	5f0d 1400           	addo\.w 0x14,\$r0,\$acr
- 214:	bfbe baff ffff      	bsr 1ce <.*>
+0+1b6 <dsofn4>:
+ 1b6:	7f0d ae20 0000      	lapc 2264 <_GLOBAL_OFFSET_TABLE_>,\$r0
+ 1bc:	5f0d 1400           	addo\.w 0x14,\$r0,\$acr
+ 1c0:	bfbe baff ffff      	bsr 17a <.*>
 #pass
diff --git a/ld/testsuite/ld-cris/dso-pltdis2.d b/ld/testsuite/ld-cris/dso-pltdis2.d
index 1acea4e072..c6f53fd26e 100644
--- a/ld/testsuite/ld-cris/dso-pltdis2.d
+++ b/ld/testsuite/ld-cris/dso-pltdis2.d
@@ -12,43 +12,43 @@ 
 
 Disassembly of section \.plt:
 
-0+1b4 <.*>:
-
- 1b4:	84e2                	subq 4,\$sp
- 1b6:	0401                	addoq 4,\$r0,\$acr
- 1b8:	7e7a                	move \$mof,\[\$sp\]
- 1ba:	3f7a                	move \[\$acr\],\$mof
- 1bc:	04f2                	addq 4,\$acr
- 1be:	6ffa                	move\.d \[\$acr\],\$acr
- 1c0:	bf09                	jump \$acr
- 1c2:	b005                	nop 
+0+160 <.*>:
+
+ 160:	84e2                	subq 4,\$sp
+ 162:	0401                	addoq 4,\$r0,\$acr
+ 164:	7e7a                	move \$mof,\[\$sp\]
+ 166:	3f7a                	move \[\$acr\],\$mof
+ 168:	04f2                	addq 4,\$acr
+ 16a:	6ffa                	move\.d \[\$acr\],\$acr
+ 16c:	bf09                	jump \$acr
+ 16e:	b005                	nop 
 	\.\.\.
 
-000001ce <dsofn4@plt>:
- 1ce:	6f0d ..00 0000      	addo\.d .*
- 1d4:	6ffa                	move\.d \[\$acr\],\$acr
- 1d6:	bf09                	jump \$acr
- 1d8:	b005                	nop 
- 1da:	3f7e .... ....      	move .*,\$mof
- 1e0:	bf0e .... ....      	ba .*
- 1e6:	b005                	nop 
+0000017a <dsofn4@plt>:
+ 17a:	6f0d ..00 0000      	addo\.d .*
+ 180:	6ffa                	move\.d \[\$acr\],\$acr
+ 182:	bf09                	jump \$acr
+ 184:	b005                	nop 
+ 186:	3f7e .... ....      	move .*,\$mof
+ 18c:	bf0e .... ....      	ba .*
+ 192:	b005                	nop 
 #...
- 1e8:	6f0d ..00 0000      	addo\.d .*
- 1ee:	6ffa                	move\.d \[\$acr\],\$acr
- 1f0:	bf09                	jump \$acr
- 1f2:	b005                	nop 
- 1f4:	3f7e .... ....      	move .*,\$mof
- 1fa:	bf0e .... ....      	ba .*
- 200:	b005                	nop 
+ 194:	6f0d ..00 0000      	addo\.d .*
+ 19a:	6ffa                	move\.d \[\$acr\],\$acr
+ 19c:	bf09                	jump \$acr
+ 19e:	b005                	nop 
+ 1a0:	3f7e .... ....      	move .*,\$mof
+ 1a6:	bf0e .... ....      	ba .*
+ 1ac:	b005                	nop 
 
 Disassembly of section \.text:
 #...
-0+202 <dsofn3>:
- 202:	bfbe e6ff ffff      	bsr 1e8 <.*>
- 208:	b005                	nop 
-
-0+20a <dsofn4>:
- 20a:	7f0d ae20 0000      	lapc 22b8 <_GLOBAL_OFFSET_TABLE_>,\$r0
- 210:	5f0d ..00           	addo\.w 0x..,\$r0,\$acr
- 214:	bfbe baff ffff      	bsr 1ce <dsofn4@plt>
+0+1ae <dsofn3>:
+ 1ae:	bfbe e6ff ffff      	bsr 194 <.*>
+ 1b4:	b005                	nop 
+
+0+1b6 <dsofn4>:
+ 1b6:	7f0d ae20 0000      	lapc 2264 <_GLOBAL_OFFSET_TABLE_>,\$r0
+ 1bc:	5f0d ..00           	addo\.w 0x..,\$r0,\$acr
+ 1c0:	bfbe baff ffff      	bsr 17a <dsofn4@plt>
 #pass
diff --git a/ld/testsuite/ld-cris/dso12-pltdis.d b/ld/testsuite/ld-cris/dso12-pltdis.d
index 0bfb846cfc..429f91e2d1 100644
--- a/ld/testsuite/ld-cris/dso12-pltdis.d
+++ b/ld/testsuite/ld-cris/dso12-pltdis.d
@@ -11,44 +11,44 @@ 
 
 Disassembly of section \.plt:
 
-0+1e4 <.plt>:
-
- 1e4:	84e2                	subq 4,\$sp
- 1e6:	0401                	addoq 4,\$r0,\$acr
- 1e8:	7e7a                	move \$mof,\[\$sp\]
- 1ea:	3f7a                	move \[\$acr\],\$mof
- 1ec:	04f2                	addq 4,\$acr
- 1ee:	6ffa                	move\.d \[\$acr\],\$acr
- 1f0:	bf09                	jump \$acr
- 1f2:	b005                	nop 
+0+198 <.plt>:
+
+ 198:	84e2                	subq 4,\$sp
+ 19a:	0401                	addoq 4,\$r0,\$acr
+ 19c:	7e7a                	move \$mof,\[\$sp\]
+ 19e:	3f7a                	move \[\$acr\],\$mof
+ 1a0:	04f2                	addq 4,\$acr
+ 1a2:	6ffa                	move\.d \[\$acr\],\$acr
+ 1a4:	bf09                	jump \$acr
+ 1a6:	b005                	nop 
 	\.\.\.
 
-0+1fe <dsofn4@plt>:
- 1fe:	6f0d 0c00 0000      	addo\.d c <.*>,\$r0,\$acr
- 204:	6ffa                	move\.d \[\$acr\],\$acr
- 206:	bf09                	jump \$acr
- 208:	b005                	nop 
- 20a:	3f7e 0000 0000      	move 0 <.*>,\$mof
- 210:	bf0e d4ff ffff      	ba 1e4 <.*>
- 216:	b005                	nop 
-
-0+218 <dsofn@plt>:
- 218:	6f0d 1000 0000      	addo\.d 10 <.*>,\$r0,\$acr
- 21e:	6ffa                	move\.d \[\$acr\],\$acr
- 220:	bf09                	jump \$acr
- 222:	b005                	nop 
- 224:	3f7e 0c00 0000      	move c <.*>,\$mof
- 22a:	bf0e baff ffff      	ba 1e4 <.*>
- 230:	b005                	nop 
+0+1b2 <dsofn4@plt>:
+ 1b2:	6f0d 0c00 0000      	addo\.d c <.*>,\$r0,\$acr
+ 1b8:	6ffa                	move\.d \[\$acr\],\$acr
+ 1ba:	bf09                	jump \$acr
+ 1bc:	b005                	nop 
+ 1be:	3f7e 0000 0000      	move 0 <.*>,\$mof
+ 1c4:	bf0e d4ff ffff      	ba 198 <.*>
+ 1ca:	b005                	nop 
+
+0+1cc <dsofn@plt>:
+ 1cc:	6f0d 1000 0000      	addo\.d 10 <.*>,\$r0,\$acr
+ 1d2:	6ffa                	move\.d \[\$acr\],\$acr
+ 1d4:	bf09                	jump \$acr
+ 1d6:	b005                	nop 
+ 1d8:	3f7e 0c00 0000      	move c <.*>,\$mof
+ 1de:	bf0e baff ffff      	ba 198 <.*>
+ 1e4:	b005                	nop 
 
 Disassembly of section \.text:
 #...
-0+236 <dsofn3>:
- 236:	bfbe e2ff ffff      	bsr 218 <dsofn@plt>
- 23c:	b005                	nop 
-
-0+23e <dsofn4>:
- 23e:	7f0d a620 0000      	lapc 22e4 <_GLOBAL_OFFSET_TABLE_>,\$r0
- 244:	5f0d 1400           	addo\.w 0x14,\$r0,\$acr
- 248:	bfbe b6ff ffff      	bsr 1fe <dsofn4@plt>
+0+1ea <dsofn3>:
+ 1ea:	bfbe e2ff ffff      	bsr 1cc <dsofn@plt>
+ 1f0:	b005                	nop 
+
+0+1f2 <dsofn4>:
+ 1f2:	7f0d a620 0000      	lapc 2298 <_GLOBAL_OFFSET_TABLE_>,\$r0
+ 1f8:	5f0d 1400           	addo\.w 0x14,\$r0,\$acr
+ 1fc:	bfbe b6ff ffff      	bsr 1b2 <dsofn4@plt>
 #pass
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index 0f5472fd2d..28724d7004 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 
-00082280 R_CRIS_JUMP_SLOT  dsofn
+00082224 R_CRIS_JUMP_SLOT  dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.plt:
- 80190 80220800 0b040000 00000000           .*
+ 80134 24220800 0b010000 00000000           .*
 Contents of section \.plt:
- 8019c fce17e7e 7f0d7822 0800307a 7f0d7c22  .*
- 801ac 08003009 7f0d8022 08003009 3f7e0000  .*
- 801bc 00002ffe d8ffffff                    .*
+ 80140 fce17e7e 7f0d1c22 0800307a 7f0d2022  .*
+ 80150 08003009 7f0d2422 08003009 3f7e0000  .*
+ 80160 00002ffe d8ffffff                    .*
 Contents of section \.text:
- 801c4 5f1d0c00 30096f1d 0c000000 30090000  .*
- 801d4 6f0d1000 0000611a 6f2eb001 08000000  .*
- 801e4 6f3e70df ffff0000                    .*
+ 80168 5f1d0c00 30096f1d 0c000000 30090000  .*
+ 80178 6f0d1000 0000611a 6f2e5401 08000000  .*
+ 80188 6f3e70df ffff0000                    .*
 Contents of section \.dynamic:
- 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                    .*
+ 82190 01000000 01000000 04000000 e4000800  .*
+ 821a0 05000000 18010800 06000000 f8000800  .*
+ 821b0 0a000000 1a000000 0b000000 10000000  .*
+ 821c0 15000000 00000000 03000000 18220800  .*
+ 821d0 02000000 0c000000 14000000 07000000  .*
+ 821e0 17000000 34010800 00000000 00000000  .*
+ 821f0 00000000 00000000 00000000 00000000  .*
+ 82200 00000000 00000000 00000000 00000000  .*
+ 82210 00000000 00000000                    .*
 Contents of section \.got:
- 82274 ec210800 00000000 00000000 b8010800  .*
- 82284 b0010800                             .*
+ 82218 90210800 00000000 00000000 5c010800  .*
+ 82228 54010800                             .*
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index 3a281112c0..9f618d2e14 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 
-00002230 R_CRIS_GLOB_DAT   dsofn
+000021e4 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.got:
- 0188 30220000 0a080000 00000000           .*
+ 013c e4210000 0a050000 00000000           .*
 Contents of section \.text:
- 0194 5f1d0c00 30096f1d 0c000000 30090000  .*
- 01a4 6f0d0c00 0000611a 6f3e88df ffff0000  .*
+ 0148 5f1d0c00 30096f1d 0c000000 30090000  .*
+ 0158 6f0d0c00 0000611a 6f3e88df ffff0000  .*
 Contents of section \.dynamic:
- 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  .*
+ 2168 04000000 94000000 05000000 20010000  .*
+ 2178 06000000 c0000000 0a000000 19000000  .*
+ 2188 0b000000 10000000 07000000 3c010000  .*
+ 2198 08000000 0c000000 09000000 0c000000  .*
+ 21a8 00000000 00000000 00000000 00000000  .*
+ 21b8 00000000 00000000 00000000 00000000  .*
+ 21c8 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 2224 b4210000 00000000 00000000 00000000  .*
+ 21d8 68210000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index 727a17cf76..331626f17b 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 
-00002234 R_CRIS_GLOB_DAT   dsofn
+000021e8 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.got:
- 0188 34220000 0a080000 00000000           .*
+ 013c e8210000 0a050000 00000000           .*
 Contents of section \.text:
- 0194 5f1d0c00 30096f1d 0c000000 30090000  .*
- 01a4 6f0d0c00 0000611a 6f3e84df ffff0000  .*
- 01b4 0f050000                             .*
+ 0148 5f1d0c00 30096f1d 0c000000 30090000  .*
+ 0158 6f0d0c00 0000611a 6f3e84df ffff0000  .*
+ 0168 0f050000                             .*
 Contents of section \.dynamic:
- 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  .*
+ 216c 04000000 94000000 05000000 20010000  .*
+ 217c 06000000 c0000000 0a000000 19000000  .*
+ 218c 0b000000 10000000 07000000 3c010000  .*
+ 219c 08000000 0c000000 09000000 0c000000  .*
+ 21ac 00000000 00000000 00000000 00000000  .*
+ 21bc 00000000 00000000 00000000 00000000  .*
+ 21cc 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 2228 b8210000 00000000 00000000 00000000  .*
+ 21dc 6c210000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index 3d158d1466..602f1bfe46 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 entry:
 #...
 [0-9a-f]+  0+c R_CRIS_RELATIVE +[0-9a-f]+
 #...
-Symbol table '\.dynsym' contains 6 entries:
+Symbol table '\.dynsym' contains 3 entries:
 #...
-Symbol table '\.symtab' contains 18 entries:
+Symbol table '\.symtab' contains 15 entries:
 #pass
diff --git a/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d
index aa41d4f1d7..2ad44af2c4 100644
--- a/ld/testsuite/ld-cris/libdso-1.d
+++ b/ld/testsuite/ld-cris/libdso-1.d
@@ -9,5 +9,5 @@ 
 
 DYNAMIC SYMBOL TABLE:
 #...
-00000[12].[02468ace] g    DF .text	0+2 dsofn
+000000.[02468ace] g    DF .text	0+2 dsofn
 #pass
diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index 83a14648d3..ee7f7e14ca 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+144 memsz 0x0+144 flags r-x
-    LOAD off    0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*13
+         filesz 0x0+e8 memsz 0x0+e8 flags r-x
+    LOAD off    0x0+e8 vaddr 0x0+20e8 paddr 0x0+20e8 align 2\*\*13
          filesz 0x0+64 memsz 0x0+64 flags rw-
- DYNAMIC off    0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*2
+ DYNAMIC off    0x0+e8 vaddr 0x0+20e8 paddr 0x0+20e8 align 2\*\*2
          filesz 0x0+58 memsz 0x0+58 flags rw-
 Dynamic Section:
   HASH.*0x0*94
-  STRTAB.*0x0*120
-  SYMTAB.*0x0*c0
-  STRSZ.*0x0*1f
+  STRTAB.*0x0*dc
+  SYMTAB.*0x0*ac
+  STRSZ.*0x0*7
   SYMENT.*0x0*10
 private flags = 2: \[v32\]
 Sections:
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 \.hash         0+2c  0+94  0+94  0+94  2\*\*2
+  0 \.hash         0+18  0+94  0+94  0+94  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
-  1 \.dynsym       0+60  0+c0  0+c0  0+c0  2\*\*2
+  1 \.dynsym       0+30  0+ac  0+ac  0+ac  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
-  2 \.dynstr       0+1f  0+120  0+120  0+120  2\*\*0
+  2 \.dynstr       0+7  0+dc  0+dc  0+dc  2\*\*0
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
-  3 \.text         0+4  0+140  0+140  0+140  2\*\*1
+  3 \.text         0+4  0+e4  0+e4  0+e4  2\*\*1
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  4 \.dynamic      0+58  0+2144  0+2144  0+144  2\*\*2
+  4 \.dynamic      0+58  0+20e8  0+20e8  0+e8  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
-  5 \.got          0+c  0+219c  0+219c  0+19c  2\*\*2
+  5 \.got          0+c  0+2140  0+2140  0+140  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 b462433b5b..b8e3742d70 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+1a0 g    DF \.text	0+8 dsofn3
+0+144 g    DF \.text	0+8 dsofn3
 #...
-0+19c g    DF \.text	0+2 dsofn
+0+140 g    DF \.text	0+2 dsofn
 #...
 Contents of section \.rela\.plt:
- 015c 2c220000 0b060000 00000000           .*
+ 0100 d0210000 0b030000 00000000           .*
 Contents of section \.plt:
- 0168 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
- 0178 00000000 00000000 00006f0d 0c000000  .*
- 0188 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
- 0198 ffffb005                             .*
+ 010c 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
+ 011c 00000000 00000000 00006f0d 0c000000  .*
+ 012c 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
+ 013c ffffb005                             .*
 Contents of section \.text:
- 019c b0050000 bfbee2ff ffffb005           .*
+ 0140 b0050000 bfbee2ff ffffb005           .*
 Contents of section \.dynamic:
 #...
 Contents of section \.got:
- 2220 a8210000 00000000 00000000 8e010000  .*
+ 21c4 4c210000 00000000 00000000 32010000  .*
diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index eba3ef4c79..7fe83427be 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+23e g    DF \.text	0+12 dsofn4
-0+234 g    DF \.text	0+2 expfn
-0+22fc g    DO \.data	0+4 expobj
+0+1f2 g    DF \.text	0+12 dsofn4
+0+1e8 g    DF \.text	0+2 expfn
+0+22b0 g    DO \.data	0+4 expobj
 #...
-0+236 g    DF \.text	0+8 dsofn3
+0+1ea g    DF \.text	0+8 dsofn3
 #...
 0+      D  \*UND\*	0+ dsofn
 #...
 Contents of section \.rela\.got:
- 01c0 f8220000 0a040000 00000000           .*
+ 0174 ac220000 0a040000 00000000           .*
 Contents of section \.rela\.plt:
- 01cc f0220000 0b020000 00000000 f4220000  .*
- 01dc 0b0a0000 00000000                    .*
+ 0180 a4220000 0b020000 00000000 a8220000  .*
+ 0190 0b070000 00000000                    .*
 Contents of section \.plt:
- 01e4 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
- 01f4 00000000 00000000 00006f0d 0c000000  .*
- 0204 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
- 0214 ffffb005 6f0d1000 00006ffa bf09b005  .*
- 0224 3f7e0c00 0000bf0e baffffff b005      .*
+ 0198 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
+ 01a8 00000000 00000000 00006f0d 0c000000  .*
+ 01b8 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
+ 01c8 ffffb005 6f0d1000 00006ffa bf09b005  .*
+ 01d8 3f7e0c00 0000bf0e baffffff b005      .*
 Contents of section \.text:
- 0232 b005b005 bfbee2ff ffffb005 7f0da620  .*
- 0242 00005f0d 1400bfbe b6ffffff b0050000  .*
+ 01e6 b005b005 bfbee2ff ffffb005 7f0da620  .*
+ 01f6 00005f0d 1400bfbe b6ffffff b0050000  .*
 Contents of section \.dynamic:
- 2254 04000000 94000000 05000000 84010000  .*
- 2264 06000000 d4000000 0a000000 3a000000  .*
- 2274 0b000000 10000000 03000000 e4220000  .*
- 2284 02000000 18000000 14000000 07000000  .*
- 2294 17000000 cc010000 07000000 c0010000  .*
- 22a4 08000000 0c000000 09000000 0c000000  .*
- 22b4 00000000 00000000 00000000 00000000  .*
- 22c4 00000000 00000000 00000000 00000000  .*
- 22d4 00000000 00000000 00000000 00000000  .*
+ 2208 04000000 94000000 05000000 48010000  .*
+ 2218 06000000 c8000000 0a000000 29000000  .*
+ 2228 0b000000 10000000 03000000 98220000  .*
+ 2238 02000000 18000000 14000000 07000000  .*
+ 2248 17000000 80010000 07000000 74010000  .*
+ 2258 08000000 0c000000 09000000 0c000000  .*
+ 2268 00000000 00000000 00000000 00000000  .*
+ 2278 00000000 00000000 00000000 00000000  .*
+ 2288 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 22e4 54220000 00000000 00000000 0a020000  .*
- 22f4 24020000 00000000                    .*
+ 2298 08220000 00000000 00000000 be010000  .*
+ 22a8 d8010000 00000000                    .*
 Contents of section \.data:
- 22fc 00000000                             .*
+ 22b0 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-12b.d b/ld/testsuite/ld-cris/libdso-12b.d
index fb63d842cd..215d1886c3 100644
--- a/ld/testsuite/ld-cris/libdso-12b.d
+++ b/ld/testsuite/ld-cris/libdso-12b.d
@@ -11,40 +11,40 @@ 
 
 DYNAMIC SYMBOL TABLE:
 #...
-0+23e g    DF \.text	0+12 dsofn4
-0+234 g    DF \.text	0+2 expfn
-0+22fc g    DO \.data	0+4 expobj
+0+1f2 g    DF \.text	0+12 dsofn4
+0+1e8 g    DF \.text	0+2 expfn
+0+22b0 g    DO \.data	0+4 expobj
 #...
-0+236 g    DF \.text	0+8 dsofn3
+0+1ea g    DF \.text	0+8 dsofn3
 #...
 0+      D  \*UND\*	0+ dsofn
 #...
 Contents of section \.rela\.dyn:
- 01c0 f8220000 0a040000 00000000           .*
+ 0174 ac220000 0a040000 00000000           .*
 Contents of section \.rela\.plt:
- 01cc f0220000 0b020000 00000000 f4220000  .*
- 01dc 0b0a0000 00000000                    .*
+ 0180 a4220000 0b020000 00000000 a8220000  .*
+ 0190 0b070000 00000000                    .*
 Contents of section \.plt:
- 01e4 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
- 01f4 00000000 00000000 00006f0d 0c000000  .*
- 0204 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
- 0214 ffffb005 6f0d1000 00006ffa bf09b005  .*
- 0224 3f7e0c00 0000bf0e baffffff b005      .*
+ 0198 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
+ 01a8 00000000 00000000 00006f0d 0c000000  .*
+ 01b8 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
+ 01c8 ffffb005 6f0d1000 00006ffa bf09b005  .*
+ 01d8 3f7e0c00 0000bf0e baffffff b005      .*
 Contents of section \.text:
- 0232 b005b005 bfbee2ff ffffb005 7f0da620  .*
- 0242 00005f0d 1400bfbe b6ffffff b0050000  .*
+ 01e6 b005b005 bfbee2ff ffffb005 7f0da620  .*
+ 01f6 00005f0d 1400bfbe b6ffffff b0050000  .*
 Contents of section \.dynamic:
- 2254 04000000 94000000 05000000 84010000  .*
- 2264 06000000 d4000000 0a000000 3a000000  .*
- 2274 0b000000 10000000 03000000 e4220000  .*
- 2284 02000000 18000000 14000000 07000000  .*
- 2294 17000000 cc010000 07000000 c0010000  .*
- 22a4 08000000 0c000000 09000000 0c000000  .*
- 22b4 00000000 00000000 00000000 00000000  .*
- 22c4 00000000 00000000 00000000 00000000  .*
- 22d4 00000000 00000000 00000000 00000000  .*
+ 2208 04000000 94000000 05000000 48010000  .*
+ 2218 06000000 c8000000 0a000000 29000000  .*
+ 2228 0b000000 10000000 03000000 98220000  .*
+ 2238 02000000 18000000 14000000 07000000  .*
+ 2248 17000000 80010000 07000000 74010000  .*
+ 2258 08000000 0c000000 09000000 0c000000  .*
+ 2268 00000000 00000000 00000000 00000000  .*
+ 2278 00000000 00000000 00000000 00000000  .*
+ 2288 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 22e4 54220000 00000000 00000000 0a020000  .*
- 22f4 24020000 00000000                    .*
+ 2298 08220000 00000000 00000000 be010000  .*
+ 22a8 d8010000 00000000                    .*
 Contents of section \.data:
- 22fc 00000000                             .*
+ 22b0 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-12c.d b/ld/testsuite/ld-cris/libdso-12c.d
index 5936956b7c..949a0e7c10 100644
--- a/ld/testsuite/ld-cris/libdso-12c.d
+++ b/ld/testsuite/ld-cris/libdso-12c.d
@@ -14,28 +14,28 @@ 
 
 DYNAMIC SYMBOL TABLE:
 #...
-0+202 g[ 	]+DF \.text	0+2  Base[ 	]+expfn
-0+22bc g[ 	]+DO \.data	0+4  Base[ 	]+expobj
+0+1ae g[ 	]+DF \.text	0+2  Base[ 	]+expfn
+0+2268 g[ 	]+DO \.data	0+4  Base[ 	]+expobj
 #...
-0+204 g[ 	]+DF \.text	0+8  Base[ 	]+dsofn3
+0+1b0 g[ 	]+DF \.text	0+8  Base[ 	]+dsofn3
 #...
 Contents of section \.rela\.dyn:
- 01f4 b8220000 0a040000 00000000           .*
+ 01a0 64220000 0a040000 00000000           .*
 Contents of section \.text:
- 0200 b005b005 bfbe1c00 0000b005 7f0da020  .*
- 0210 00005f0d 0c00bfbe f6ffffff b0050000  .*
- 0220 b0050000                             .*
+ 01ac b005b005 bfbe1c00 0000b005 7f0da020  .*
+ 01bc 00005f0d 0c00bfbe f6ffffff b0050000  .*
+ 01cc b0050000                             .*
 Contents of section .dynamic:
- 2224 04000000 94000000 05000000 70010000  .*
- 2234 06000000 d0000000 0a000000 37000000  .*
- 2244 0b000000 10000000 07000000 f4010000  .*
- 2254 08000000 0c000000 09000000 0c000000  .*
- 2264 fcffff6f bc010000 fdffff6f 02000000  .*
- 2274 f0ffff6f a8010000 00000000 00000000  .*
- 2284 00000000 00000000 00000000 00000000  .*
- 2294 00000000 00000000 00000000 00000000  .*
- 22a4 00000000 00000000                    .*
+ 21d0 04000000 94000000 05000000 34010000  .*
+ 21e0 06000000 c4000000 0a000000 26000000  .*
+ 21f0 0b000000 10000000 07000000 a0010000  .*
+ 2200 08000000 0c000000 09000000 0c000000  .*
+ 2210 fcffff6f 68010000 fdffff6f 02000000  .*
+ 2220 f0ffff6f 5a010000 00000000 00000000  .*
+ 2230 00000000 00000000 00000000 00000000  .*
+ 2240 00000000 00000000 00000000 00000000  .*
+ 2250 00000000 00000000                    .*
 Contents of section \.got:
- 22ac 24220000 00000000 00000000 00000000  .*
+ 2258 d0210000 00000000 00000000 00000000  .*
 Contents of section \.data:
- 22bc 00000000                             .*
+ 2268 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index 11ee52cc3c..b50a5afc97 100644
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -15,9 +15,9 @@ 
 Dynamic section at offset 0x[0-9a-f][0-9a-f][0-9a-f] contains 11 entries:
   Tag[ 	]+Type[ 	]+Name/Value
  0x0+4 \(HASH\)[ 	]+0x94
- 0x0+5 \(STRTAB\)[ 	]+0x[12][0-9a-f][0-9a-f]
+ 0x0+5 \(STRTAB\)[ 	]+0x[0-9a-f][0-9a-f]
  0x0+6 \(SYMTAB\)[ 	]+0x[0-9a-f][0-9a-f]
- 0x0+a \(STRSZ\)[ 	]+38 \(bytes\)
+ 0x0+a \(STRSZ\)[ 	]+14 \(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-13b.d b/ld/testsuite/ld-cris/libdso-13b.d
index 4008946282..1afa0ea9fb 100644
--- a/ld/testsuite/ld-cris/libdso-13b.d
+++ b/ld/testsuite/ld-cris/libdso-13b.d
@@ -8,7 +8,7 @@ 
 # script hiding the function called pcrel-without-plt.  There should
 # be no warning, no relocations in the output and no TEXTREL marking.
 
-Dynamic section at offset 0x1b0 contains 9 entries:
+Dynamic section at offset 0x150 contains 9 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\) .*
  0x00000005 \(STRTAB\) .*
diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index b60f5e5eb4..a697e9796f 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 0x16c contains 6 entries:
+Dynamic section at offset 0x110 contains 6 entries:
   Tag[ 	]+Type[ 	]+Name/Value
  0x0+4 \(HASH\)[ 	]+0x94
- 0x0+5 \(STRTAB\)[ 	]+0x134
- 0x0+6 \(SYMTAB\)[ 	]+0xc4
- 0x0+a \(STRSZ\)[ 	]+38 \(bytes\)
+ 0x0+5 \(STRTAB\)[ 	]+0xf0
+ 0x0+6 \(SYMTAB\)[ 	]+0xb0
+ 0x0+a \(STRSZ\)[ 	]+14 \(bytes\)
  0x0+b \(SYMENT\)[ 	]+16 \(bytes\)
  0x0+ \(NULL\)[ 	]+0x0
 
diff --git a/ld/testsuite/ld-cris/libdso-15.d b/ld/testsuite/ld-cris/libdso-15.d
index 61b546b781..6a53b1f977 100644
--- a/ld/testsuite/ld-cris/libdso-15.d
+++ b/ld/testsuite/ld-cris/libdso-15.d
@@ -10,15 +10,15 @@ 
 
 DYNAMIC SYMBOL TABLE:
 #...
-0+2288 g[ 	]+DO .data[	 ]+0+4  TST3[ 	]+__expobj2
-0+20a g[ 	]+DF .text[	 ]+0+2  TST3[ 	]+__expfn2
-0+20a  w[ 	]+DF .text[	 ]+0+2  TST3[ 	]+expfn2
-0+2288  w[ 	]+DO .data[	 ]+0+4  TST3[ 	]+expobj2
+0+2238 g[ 	]+DO .data[	 ]+0+4  TST3[ 	]+__expobj2
+0+1ba g[ 	]+DF .text[	 ]+0+2  TST3[ 	]+__expfn2
+0+1ba  w[ 	]+DF .text[	 ]+0+2  TST3[ 	]+expfn2
+0+2238  w[ 	]+DO .data[	 ]+0+4  TST3[ 	]+expobj2
 #...
 Contents of section .text:
- 0208 0f050f05                             .*
+ 01b8 0f050f05                             .*
 #...
 Contents of section .got:
- 227c 0c220000 00000000 00000000           .*
+ 222c bc210000 00000000 00000000           .*
 Contents of section .data:
- 2288 00000000                             .*
+ 2238 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-15b.d b/ld/testsuite/ld-cris/libdso-15b.d
index 61ead5611f..4e2bddb252 100644
--- a/ld/testsuite/ld-cris/libdso-15b.d
+++ b/ld/testsuite/ld-cris/libdso-15b.d
@@ -22,17 +22,17 @@  DYNAMIC SYMBOL TABLE:
 0+[	 ]+DF \*UND\*[	 ]+0+  TST3[	 ]+expfn2
 #...
 Contents of section .rela.dyn:
- 01d4 fc220000 0a040000 00000000 00230000  .*
- 01e4 0a050000 00000000                    .*
+ 017c a4220000 0a040000 00000000 a8220000  .*
+ 018c 0a050000 00000000                    .*
 Contents of section .plt:
- 01ec fce17e7e 0401307a 08013009 00000000  .*
- 01fc 00000000 6f0d0c00 00003009 3f7e0000  .*
- 020c 00002ffe ecffffff 6f0d1000 00003009  .*
- 021c 3f7e0000 00002ffe ecffffff           .*
+ 0194 fce17e7e 0401307a 08013009 00000000  .*
+ 01a4 00000000 6f0d0c00 00003009 3f7e0000  .*
+ 01b4 00002ffe ecffffff 6f0d1000 00003009  .*
+ 01c4 3f7e0000 00002ffe ecffffff           .*
 Contents of section .text:
- 0228 6fae0c00 00006fae ccffffff 6fae1000  .*
- 0238 00006fae d4ffffff                    .*
+ 01d0 6fae0c00 00006fae ccffffff 6fae1000  .*
+ 01e0 00006fae d4ffffff                    .*
 #...
 Contents of section .got:
- 22f0 40220000 00000000 00000000 00000000  .*
- 2300 00000000                             .*
+ 2298 e8210000 00000000 00000000 00000000  .*
+ 22a8 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-1c.d b/ld/testsuite/ld-cris/libdso-1c.d
index 0588d396e5..f02dc5e446 100644
--- a/ld/testsuite/ld-cris/libdso-1c.d
+++ b/ld/testsuite/ld-cris/libdso-1c.d
@@ -19,17 +19,17 @@  DYNAMIC SYMBOL TABLE:
 0+[ 	]+DF \*UND\*	0+[ 	]+TST2[	 ]+expfn
 #...
 Contents of section .rela.dyn:
- 01a4 cc220000 0a030000 00000000 d0220000  .*
- 01b4 0a040000 00000000                    .*
+ 0140 68220000 0a020000 00000000 6c220000  .*
+ 0150 0a030000 00000000                    .*
 Contents of section .plt:
- 01bc fce17e7e 0401307a 08013009 00000000  .*
- 01cc 00000000 6f0d0c00 00003009 3f7e0000  .*
- 01dc 00002ffe ecffffff 6f0d1000 00003009  .*
- 01ec 3f7e0000 00002ffe ecffffff           .*
+ 0158 fce17e7e 0401307a 08013009 00000000  .*
+ 0168 00000000 6f0d0c00 00003009 3f7e0000  .*
+ 0178 00002ffe ecffffff 6f0d1000 00003009  .*
+ 0188 3f7e0000 00002ffe ecffffff           .*
 Contents of section .text:
- 01f8 6fae0c00 00006fae ccffffff 6fae1000  .*
- 0208 00006fae d4ffffff                    .*
+ 0194 6fae0c00 00006fae ccffffff 6fae1000  .*
+ 01a4 00006fae d4ffffff                    .*
 #...
 Contents of section .got:
- 22c0 10220000 00000000 00000000 00000000  .*
- 22d0 00000000                             .*
+ 225c ac210000 00000000 00000000 00000000  .*
+ 226c 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-1d.d b/ld/testsuite/ld-cris/libdso-1d.d
index a2a0ce5790..06e72fc279 100644
--- a/ld/testsuite/ld-cris/libdso-1d.d
+++ b/ld/testsuite/ld-cris/libdso-1d.d
@@ -13,24 +13,24 @@ 
 
 DYNAMIC SYMBOL TABLE:
 #...
-0+1f2  w   DF .text	0+2 expfn
-0+22a0  w   DO .data	0+4 expobj
+0+1a6  w   DF .text	0+2 expfn
+0+2254  w   DO .data	0+4 expobj
 #...
 Contents of section .rela.dyn:
- 0184 98220000 0a020000 00000000 9c220000  .*
- 0194 0a030000 00000000                    .*
+ 0138 4c220000 0a020000 00000000 50220000  .*
+ 0148 0a030000 00000000                    .*
 Contents of section .plt:
- 019c fce17e7e 0401307a 08013009 00000000  .*
- 01ac 00000000 6f0d0c00 00003009 3f7e0000  .*
- 01bc 00002ffe ecffffff 6f0d1000 00003009  .*
- 01cc 3f7e0000 00002ffe ecffffff           .*
+ 0150 fce17e7e 0401307a 08013009 00000000  .*
+ 0160 00000000 6f0d0c00 00003009 3f7e0000  .*
+ 0170 00002ffe ecffffff 6f0d1000 00003009  .*
+ 0180 3f7e0000 00002ffe ecffffff           .*
 Contents of section .text:
- 01d8 6fae1000 00006fae e0ffffff 6fae0c00  .*
- 01e8 00006fae c0ffffff 0f050f05           .*
+ 018c 6fae1000 00006fae e0ffffff 6fae0c00  .*
+ 019c 00006fae c0ffffff 0f050f05           .*
 Contents of section .dynamic:
 #...
 Contents of section .got:
- 228c f4210000 00000000 00000000 00000000  .*
- 229c 00000000                             .*
+ 2240 a8210000 00000000 00000000 00000000  .*
+ 2250 00000000                             .*
 Contents of section .data:
- 22a0 00000000                             .*
+ 2254 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 7285b3d40d..83d56a1768 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -36,7 +36,7 @@  Symbol table '\.dynsym' contains 4 entries:
  +2: 0+ +0 +OBJECT +GLOBAL +DEFAULT +ABS TST1
  +3: 0+154 +0 +FUNC +GLOBAL +DEFAULT +7 export_1@@TST1
 
-Symbol table '\.symtab' contains 18 entries:
+Symbol table '\.symtab' contains 15 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 
@@ -49,10 +49,7 @@  Symbol table '\.symtab' contains 18 entries:
  +8: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 
  +9: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 
  +10: 0+2..[046c] +0 +OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
- +11: 0+2..[046c] +0 +NOTYPE +LOCAL +DEFAULT +9 __bss_start
- +12: 0+2..[046c] +0 +NOTYPE +LOCAL +DEFAULT +9 _edata
- +13: 0+2..[046c] +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +14: 0+2..[046c] +0 +NOTYPE +LOCAL +DEFAULT +9 _end
- +15: 0+150 +2 +FUNC +LOCAL +DEFAULT +7 dsofn
- +16: 0+ +0 +OBJECT +GLOBAL +DEFAULT +ABS TST1
- +17: 0+154 +0 +FUNC +GLOBAL +DEFAULT +7 export_1
+ +11: 0+2..[046c] +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +12: 0+150 +2 +FUNC +LOCAL +DEFAULT +7 dsofn
+ +13: 0+ +0 +OBJECT +GLOBAL +DEFAULT +ABS TST1
+ +14: 0+154 +0 +FUNC +GLOBAL +DEFAULT +7 export_1
diff --git a/ld/testsuite/ld-cris/pic-gc-72.d b/ld/testsuite/ld-cris/pic-gc-72.d
index a471da5f34..65bd989650 100644
--- a/ld/testsuite/ld-cris/pic-gc-72.d
+++ b/ld/testsuite/ld-cris/pic-gc-72.d
@@ -19,11 +19,11 @@  Contents of section .dynsym:
 Contents of section .dynstr:
 #...
 Contents of section .text:
- 016e 0f050f05                             .*
+ 0121 0f050f05                             .*
 Contents of section .dynamic:
- 2174 .*
+ 2128 .*
 #...
 Contents of section .got:
- 21cc 74210000 00000000 00000000           .*
+ 2180 28210000 00000000 00000000           .*
 Contents of section .data:
- 21d8 00000000                             .*
+ 218c 00000000                             .*
diff --git a/ld/testsuite/ld-cris/pic-gc-73.d b/ld/testsuite/ld-cris/pic-gc-73.d
index 8fd7f388ab..7f599b92d9 100644
--- a/ld/testsuite/ld-cris/pic-gc-73.d
+++ b/ld/testsuite/ld-cris/pic-gc-73.d
@@ -17,10 +17,10 @@  Contents of section .dynsym:
 Contents of section .dynstr:
 #...
 Contents of section .text:
- 016e 0f050f05                             .*
+ 0121 0f050f05                             .*
 Contents of section .dynamic:
 #...
 Contents of section .got:
- 21cc 74210000 00000000 00000000           .*
+ 2180 28210000 00000000 00000000           .*
 Contents of section .data:
- 21d8 00000000                             .*
+ 218c 00000000                             .*
diff --git a/ld/testsuite/ld-cris/pr16044.d b/ld/testsuite/ld-cris/pr16044.d
index cde2d39abd..30988b86e4 100644
--- a/ld/testsuite/ld-cris/pr16044.d
+++ b/ld/testsuite/ld-cris/pr16044.d
@@ -25,19 +25,16 @@ 
 
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
  Offset[ 	]+Info[ 	]+Type[ 	]+Sym\.Value  Sym\. Name \+ Addend
-[0-9a-f]+  0+[0-9a-f]+ R_CRIS_RELATIVE[ 	]+184
+[0-9a-f]+  0+[0-9a-f]+ R_CRIS_RELATIVE[ 	]+128
 
-Symbol table '\.dynsym' contains 7 entries:
+Symbol table '\.dynsym' contains 4 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 +FUNC +GLOBAL +DEFAULT +5 export_1
- +3: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +7 __bss_start
- +4: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +7 _edata
- +5: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +7 _end
- +6: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 export_2
+ +3: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 export_2
 
 Symbol table '\.symtab' contains [0-9]+ entries:
 #...
- +[0-9]+: 0+184  +2 FUNC + LOCAL + DEFAULT + 5 dsofn
+ +[0-9]+: 0+128  +2 FUNC + LOCAL + DEFAULT + 5 dsofn
 #...
diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index c811744c2c..3b17e2352a 100644
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -8,33 +8,30 @@ 
 .*:     file format elf32-cris
 
 DYNAMIC SYMBOL TABLE:
-0+8021e      DF \*UND\*	0+ expfn
-0+82324 g    DO \.bss	0+4 expobj
-0+82324 g    D  \.bss	0+ __bss_start
-0+80238      DF \*UND\*	0+ dsofn3
-0+82324 g    D  \.got	0+ _edata
-0+82340 g    D  \.bss	0+ _end
-0+80264 g    DF \.text	0+8 dsofn
+0+801ca      DF \*UND\*	0+ expfn
+0+822d0 g    DO \.bss	0+4 expobj
+0+801e4      DF \*UND\*	0+ dsofn3
+0+80210 g    DF \.text	0+8 dsofn
 
 Contents of section \.interp:
  800d4 2f6c6962 2f6c642e 736f2e31 00        .*
 #...
 Contents of section \.rela\.dyn:
- 801e0 24230800 09020000 00000000           .*
+ 8018c d0220800 09020000 00000000           .*
 Contents of section \.rela\.plt:
- 801ec 1c230800 0b010000 00000000 20230800  .*
- 801fc 0b040000 00000000                    .*
+ 80198 c8220800 0b010000 00000000 cc220800  .*
+ 801a8 0b030000 00000000                    .*
 Contents of section \.plt:
- 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      .*
+ 801b0 84e26ffe c0220800 7e7a3f7a 04f26ffa  .*
+ 801c0 bf09b005 00000000 00006ffe c8220800  .*
+ 801d0 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
+ 801e0 ffffb005 6ffecc22 08006ffa bf09b005  .*
+ 801f0 3f7e0c00 0000bf0e baffffff b005      .*
 Contents of section \.text:
- 80252 b005bfbe caffffff b005bfbe dcffffff  .*
- 80262 b0056fae 24230800 b0050000           .*
+ 801fe b005bfbe caffffff b005bfbe dcffffff  .*
+ 8020e b0056fae d0220800 b0050000           .*
 Contents of section \.dynamic:
 #...
 Contents of section \.got:
- 82310 70220800 00000000 00000000 2a020800  .*
- 82320 44020800                             .*
+ 822bc 1c220800 00000000 00000000 d6010800  .*
+ 822cc f0010800                             .*
diff --git a/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
index 7459d9f00e..12fe7f812e 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:
- 01a4 b8220000 17030000 00000000           .*
+ 0154 68220000 17030000 00000000           .*
 Contents of section .text:
- 01b0 41b20000 5fae0c00                    .*
+ 0160 41b20000 5fae0c00                    .*
 #...
 Contents of section .got:
- 22ac 3c220000 00000000 00000000 00000000  .*
- 22bc 00000000                             .*
+ 225c ec210000 00000000 00000000 00000000  .*
+ 226c 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 c66a982dcc..bb72e87430 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:
- 01a4 b4220000 17030000 00000000           .*
+ 0154 64220000 17030000 00000000           .*
 Contents of section .text:
- 01b0 41b20000 5fae0c00                    .*
+ 0160 41b20000 5fae0c00                    .*
 #...
 Contents of section .got:
- 22a8 38220000 00000000 00000000 00000000  .*
- 22b8 00000000                             .*
+ 2258 e8210000 00000000 00000000 00000000  .*
+ 2268 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 cfb44ac366..4aa2794e4d 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+1c8 memsz 0x0+1c8 flags r-x
+         filesz 0x0+178 memsz 0x0+178 flags r-x
     LOAD off .*
          filesz .*
  DYNAMIC off .*
@@ -21,7 +21,7 @@  Program Header:
 #...
 Sections:
 #...
-  7 .got          0+14  0+2240  0+2240  0+240  2\*\*2
+  7 .got          0+14  0+21f0  0+21f0  0+1f0  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
 SYMBOL TABLE:
 #...
@@ -31,16 +31,16 @@  SYMBOL TABLE:
 
 #...
 Contents of section .got:
- 2240 c8210000 00000000 00000000 00000000  .*
- 2250 00000000                             .*
+ 21f0 78210000 00000000 00000000 00000000  .*
+ 2200 00000000                             .*
 
 Disassembly of section \.text:
 
-0+1b8 <_start>:
- 1b8:	41b2                	moveq 1,\$r11
+0+168 <_start>:
+ 168:	41b2                	moveq 1,\$r11
 	\.\.\.
 
-0+1bc <do_test>:
- 1bc:	2f0e 0c00 0000      	add\.d c <bar\+0x8>,\$r0
- 1c2:	1f1e 1000           	add\.w 0x10,\$r1
+0+16c <do_test>:
+ 16c:	2f0e 0c00 0000      	add\.d c <bar\+0x8>,\$r0
+ 172:	1f1e 1000           	add\.w 0x10,\$r1
 	\.\.\.
diff --git a/ld/testsuite/ld-cris/tls-gc-71.d b/ld/testsuite/ld-cris/tls-gc-71.d
index 14feb3dc50..e32aadaada 100644
--- a/ld/testsuite/ld-cris/tls-gc-71.d
+++ b/ld/testsuite/ld-cris/tls-gc-71.d
@@ -15,18 +15,15 @@ 
          filesz 0x0+80 memsz 0x0+80 flags r--
 #...
 DYNAMIC SYMBOL TABLE:
-0+18e l    d  \.text	0+ \.text
-0+2194 l    d  \.tdata	0+ \.tdata
-0+18e g    DF \.text	0+2 _init
-0+2280 g    D  \.got	0+ __bss_start
+0+132 l    d  \.text	0+ \.text
+0+2138 l    d  \.tdata	0+ \.tdata
+0+132 g    DF \.text	0+2 _init
 0+ g    D  .tdata	0+80 tls128
-0+2280 g    D  \.got	0+ _edata
-0+2280 g    D  \.got	0+ _end
 
 DYNAMIC RELOCATION RECORDS \(none\)
 #...
 Contents of section \.text:
- 018e 0f050000                             .*
+ 0132 0f050000                             .*
 #...
 Contents of section \.got:
- 2274 14220000 00000000 00000000           .*
+ 2218 b8210000 00000000 00000000           .*
diff --git a/ld/testsuite/ld-cris/tls-gd-1.d b/ld/testsuite/ld-cris/tls-gd-1.d
index 789c54e187..30ab7efdb8 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+1a0 memsz 0x0+1a0 flags r-x
-    LOAD off    0x0+1a0 vaddr 0x0+21a0 paddr 0x0+21a0 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+224 vaddr 0x0+2224 paddr 0x0+2224 align 2\*\*2
+ DYNAMIC off    0x0+1c8 vaddr 0x0+21c8 paddr 0x0+21c8 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a0 vaddr 0x0+21a0 paddr 0x0+21a0 align 2\*\*2
+     TLS off    0x0+144 vaddr 0x0+2144 paddr 0x0+2144 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+25
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+d
   SYMENT               0x0+10
-  RELA                 0x0+190
+  RELA                 0x0+134
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -42,13 +42,13 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22a0 R_CRIS_DTP        x
+0+2244 R_CRIS_DTP        x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 019c 5fae0c00                             .*
+ 0140 5fae0c00                             .*
 #...
 Contents of section \.got:
- 2294 24220+ 0+ 0+ 0+  .*
- 22a4 0+                             .*
+ 2238 c8210+ 0+ 0+ 0+  .*
+ 2248 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-1h.d b/ld/testsuite/ld-cris/tls-gd-1h.d
index db60081393..b323312f30 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+1a4 memsz 0x0+1a4 flags r-x
-    LOAD off    0x0+1a4 vaddr 0x0+21a4 paddr 0x0+21a4 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+228 vaddr 0x0+2228 paddr 0x0+2228 align 2\*\*2
+ DYNAMIC off    0x0+1cc vaddr 0x0+21cc paddr 0x0+21cc align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a4 vaddr 0x0+21a4 paddr 0x0+21a4 align 2\*\*2
+     TLS off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+2a
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+12
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22a4 R_CRIS_DTP        \*ABS\*\+0x0+80
+0+2248 R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 5fae0c00                             .*
+ 0144 5fae0c00                             .*
 #...
 Contents of section \.got:
- 2298 28220+ 0+ 0+ 0+  .*
- 22a8 0+                             .*
+ 223c cc210+ 0+ 0+ 0+  .*
+ 224c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-2.d b/ld/testsuite/ld-cris/tls-gd-2.d
index cc35710f39..b792eaa5a1 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+1bc memsz 0x0+1bc flags r-x
-    LOAD off    0x0+1bc vaddr 0x0+21bc paddr 0x0+21bc 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+240 vaddr 0x0+2240 paddr 0x0+2240 align 2\*\*2
+ DYNAMIC off    0x0+1ec vaddr 0x0+21ec paddr 0x0+21ec align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1bc vaddr 0x0+21bc paddr 0x0+21bc align 2\*\*2
+     TLS off    0x0+168 vaddr 0x0+2168 paddr 0x0+2168 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+17c
-  SYMTAB               0x0+ec
-  STRSZ                0x0+2c
+  STRTAB               0x0+140
+  SYMTAB               0x0+e0
+  STRSZ                0x0+14
   SYMENT               0x0+10
-  RELA                 0x0+1a8
+  RELA                 0x0+154
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -42,13 +42,13 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22bc R_CRIS_DTP        x
+0+2268 R_CRIS_DTP        x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01b4 6fae0c00 00000000              .*
+ 0160 6fae0c00 00000000              .*
 #...
 Contents of section \.got:
- 22b0 40220+ 0+ 0+ 0+  .*
- 22c0 0+                             .*
+ 225c ec210+ 0+ 0+ 0+  .*
+ 226c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gd-2h.d b/ld/testsuite/ld-cris/tls-gd-2h.d
index da3ef7d836..211d830a61 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+1a8 memsz 0x0+1a8 flags r-x
-    LOAD off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+22c vaddr 0x0+222c paddr 0x0+222c align 2\*\*2
+ DYNAMIC off    0x0+1d0 vaddr 0x0+21d0 paddr 0x0+21d0 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 align 2\*\*2
+     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+2a
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+12
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22a8 R_CRIS_DTP        \*ABS\*\+0x0+80
+0+224c R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 6fae0c00 00000000              .*
+ 0144 6fae0c00 00000000              .*
 #...
 Contents of section \.got:
- 229c 2c220+ 0+ 0+ 0+  .*
- 22ac 0+                             .*
+ 2240 d0210+ 0+ 0+ 0+  .*
+ 2250 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ie-10.d b/ld/testsuite/ld-cris/tls-ie-10.d
index 7e9c32d596..9a27cb6039 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+1c0 memsz 0x0+1c0 flags r-x
-    LOAD off    0x0+1c0 vaddr 0x0+21c0 paddr 0x0+21c0 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+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+244 vaddr 0x0+2244 paddr 0x0+2244 align 2\*\*2
+ DYNAMIC off    0x0+1f0 vaddr 0x0+21f0 paddr 0x0+21f0 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+1c0 vaddr 0x0+21c0 paddr 0x0+21c0 align 2\*\*2
+     TLS off    0x0+16c vaddr 0x0+216c paddr 0x0+216c align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+17c
-  SYMTAB               0x0+ec
-  STRSZ                0x0+2d
+  STRTAB               0x0+140
+  SYMTAB               0x0+e0
+  STRSZ                0x0+15
   SYMENT               0x0+10
-  RELA                 0x0+1ac
+  RELA                 0x0+158
   RELASZ               0x0+c
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -43,12 +43,12 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22c8 R_CRIS_32_TPREL   x
+0+2274 R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01b8 6fae0c00 00000000                    .*
+ 0164 6fae0c00 00000000                    .*
 #...
 Contents of section \.got:
- 22bc 44220+ 0+ 0+ 0+  .*
+ 2268 f0210+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-cris/tls-ie-11.d b/ld/testsuite/ld-cris/tls-ie-11.d
index e231040203..4264777053 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+1e4 memsz 0x0+1e4 flags r-x
-    LOAD off    0x0+1e4 vaddr 0x0+21e4 paddr 0x0+21e4 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+114 memsz 0x0+114 flags rw-
- DYNAMIC off    0x0+26c vaddr 0x0+226c paddr 0x0+226c align 2\*\*2
+ DYNAMIC off    0x0+218 vaddr 0x0+2218 paddr 0x0+2218 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+1e4 vaddr 0x0+21e4 paddr 0x0+21e4 align 2\*\*2
+     TLS off    0x0+190 vaddr 0x0+2190 paddr 0x0+2190 align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+190
-  SYMTAB               0x0+f0
-  STRSZ                0x0+2f
+  STRTAB               0x0+154
+  SYMTAB               0x0+e4
+  STRSZ                0x0+17
   SYMENT               0x0+10
-  RELA                 0x0+1c0
+  RELA                 0x0+16c
   RELASZ               0x0+18
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -47,14 +47,14 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22f0 R_CRIS_32_TPREL   x2
-0+22f4 R_CRIS_32_TPREL   x1
+0+229c R_CRIS_32_TPREL   x2
+0+22a0 R_CRIS_32_TPREL   x1
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01d8 6fae1000 00006fbe 0c000000           .*
+ 0184 6fae1000 00006fbe 0c000000           .*
 #...
 Contents of section \.got:
- 22e4 6c220+ 0+ 0+ 0+  .*
- 22f4 00000000                             .*
+ 2290 18220+ 0+ 0+ 0+  .*
+ 22a0 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-ie-78.d b/ld/testsuite/ld-cris/tls-ie-78.d
index a402115f19..8a399efb82 100644
--- a/ld/testsuite/ld-cris/tls-ie-78.d
+++ b/ld/testsuite/ld-cris/tls-ie-78.d
@@ -32,13 +32,13 @@  DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+822d4 R_CRIS_32_TPREL   x
+0+82278 R_CRIS_32_TPREL   x
 
 Contents of section .interp:
 #...
 Contents of section \.text:
- 801bc 41b20000 6faed422 08000000           .*
+ 80160 41b20000 6fae7822 08000000           .*
 Contents of section \.tdata:
 #...
 Contents of section \.got:
- 822c8 48220800 00000000 00000000 00000000  .*
+ 8226c ec210800 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/tls-ie-8.d b/ld/testsuite/ld-cris/tls-ie-8.d
index f62d599465..f1e6edd5d0 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+1b8 memsz 0x0+1b8 flags r-x
-    LOAD off    0x0+1b8 vaddr 0x0+21b8 paddr 0x0+21b8 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+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+23c vaddr 0x0+223c paddr 0x0+223c align 2\*\*2
+ DYNAMIC off    0x0+1e8 vaddr 0x0+21e8 paddr 0x0+21e8 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+1b8 vaddr 0x0+21b8 paddr 0x0+21b8 align 2\*\*2
+     TLS off    0x0+164 vaddr 0x0+2164 paddr 0x0+2164 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+17c
-  SYMTAB               0x0+ec
-  STRSZ                0x0+2b
+  STRTAB               0x0+140
+  SYMTAB               0x0+e0
+  STRSZ                0x0+13
   SYMENT               0x0+10
-  RELA                 0x0+1a8
+  RELA                 0x0+154
   RELASZ               0x0+c
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -43,12 +43,12 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22c0 R_CRIS_32_TPREL   x
+0+226c R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01b4 5fae0c00                             .*
+ 0160 5fae0c00                             .*
 #...
 Contents of section \.got:
- 22b4 3c220+ 0+ 0+ 0+  .*
+ 2260 e8210+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-cris/tls-ie-9.d b/ld/testsuite/ld-cris/tls-ie-9.d
index b9d9ee6008..0b55fb5766 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+1e0 memsz 0x0+1e0 flags r-x
-    LOAD off    0x0+1e0 vaddr 0x0+21e0 paddr 0x0+21e0 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+114 memsz 0x0+114 flags rw-
- DYNAMIC off    0x0+268 vaddr 0x0+2268 paddr 0x0+2268 align 2\*\*2
+ DYNAMIC off    0x0+214 vaddr 0x0+2214 paddr 0x0+2214 align 2\*\*2
          filesz 0x0+78 memsz 0x0+78 flags rw-
-     TLS off    0x0+1e0 vaddr 0x0+21e0 paddr 0x0+21e0 align 2\*\*2
+     TLS off    0x0+18c vaddr 0x0+218c paddr 0x0+218c align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+190
-  SYMTAB               0x0+f0
-  STRSZ                0x0+30
+  STRTAB               0x0+154
+  SYMTAB               0x0+e4
+  STRSZ                0x0+18
   SYMENT               0x0+10
-  RELA                 0x0+1c0
+  RELA                 0x0+16c
   RELASZ               0x0+18
   RELAENT              0x0+c
   FLAGS                0x0+10
@@ -47,14 +47,14 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22ec R_CRIS_32_TPREL   x2
-0+22f0 R_CRIS_32_TPREL   x1
+0+2298 R_CRIS_32_TPREL   x2
+0+229c R_CRIS_32_TPREL   x1
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01d8 5fae1000 5fbe0c00                    .*
+ 0184 5fae1000 5fbe0c00                    .*
 #...
 Contents of section \.got:
- 22e0 68220+ 0+ 0+ 0+  .*
- 22f0 00000000                             .*
+ 228c 14220+ 0+ 0+ 0+  .*
+ 229c 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index 3ac1c68daa..e6b49fa072 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+2348 0+348 0+20 04  WA  0   0  4
+  .* .got[ 	]+PROGBITS[ 	]+0+22f8 0+2f8 0+20 04  WA  0   0  4
 #...
-Relocation section '\.rela\.dyn' at offset 0x20c contains 2 entries:
+Relocation section '\.rela\.dyn' at offset 0x1bc contains 2 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-00002354  0000001e R_CRIS_DTPMOD +0
-00002364  0000050a R_CRIS_GLOB_DAT   00002368   expobj \+ 0
+00002304  0000001e R_CRIS_DTPMOD +0
+00002314  0000050a R_CRIS_GLOB_DAT   00002318   expobj \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x224 contains 2 entries:
+Relocation section '\.rela\.plt' at offset 0x1d4 contains 2 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-0000235c  0000030b R_CRIS_JUMP_SLOT  00000296   dsofn4 \+ 0
-00002360  00000c0b R_CRIS_JUMP_SLOT  000002ae   dsofn \+ 0
+0000230c  0000030b R_CRIS_JUMP_SLOT  00000246   dsofn4 \+ 0
+00002310  0000090b R_CRIS_JUMP_SLOT  0000025e   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 46e5e9bbf1..54d51d8f6f 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+1a4 memsz 0x0+1a4 flags r-x
-    LOAD off    0x0+1a4 vaddr 0x0+21a4 paddr 0x0+21a4 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+228 vaddr 0x0+2228 paddr 0x0+2228 align 2\*\*2
+ DYNAMIC off    0x0+1cc vaddr 0x0+21cc paddr 0x0+21cc align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a4 vaddr 0x0+21a4 paddr 0x0+21a4 align 2\*\*2
+     TLS off    0x0+148 vaddr 0x0+2148 paddr 0x0+2148 align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+29
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22a4 R_CRIS_DTPMOD     \*ABS\*
+0+2248 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 5fae8000                             .*
+ 0144 5fae8000                             .*
 #...
 Contents of section \.got:
- 2298 28220+ 0+ 0+ 0+  .*
- 22a8 0+                             .*
+ 223c cc210+ 0+ 0+ 0+  .*
+ 224c 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-5.d b/ld/testsuite/ld-cris/tls-ld-5.d
index d5982d94a7..9db125571f 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+1a8 memsz 0x0+1a8 flags r-x
-    LOAD off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 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+10c memsz 0x0+10c flags rw-
- DYNAMIC off    0x0+230 vaddr 0x0+2230 paddr 0x0+2230 align 2\*\*2
+ DYNAMIC off    0x0+1d4 vaddr 0x0+21d4 paddr 0x0+21d4 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 align 2\*\*2
+     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+29
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -39,13 +39,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22ac R_CRIS_DTPMOD     \*ABS\*
+0+2250 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 5fae8000 5fbe8400              .*
+ 0144 5fae8000 5fbe8400              .*
 #...
 Contents of section \.got:
- 22a0 30220+ 0+ 0+ 0+  .*
- 22b0 0+                             .*
+ 2244 d4210+ 0+ 0+ 0+  .*
+ 2254 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-6.d b/ld/testsuite/ld-cris/tls-ld-6.d
index 487c63ed06..43cf43f456 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+1a8 memsz 0x0+1a8 flags r-x
-    LOAD off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 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+108 memsz 0x0+108 flags rw-
- DYNAMIC off    0x0+22c vaddr 0x0+222c paddr 0x0+222c align 2\*\*2
+ DYNAMIC off    0x0+1d0 vaddr 0x0+21d0 paddr 0x0+21d0 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+1a8 vaddr 0x0+21a8 paddr 0x0+21a8 align 2\*\*2
+     TLS off    0x0+14c vaddr 0x0+214c paddr 0x0+214c align 2\*\*2
          filesz 0x0+84 memsz 0x0+84 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+29
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -38,13 +38,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22a8 R_CRIS_DTPMOD     \*ABS\*
+0+224c R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 6fae8000 00000000              .*
+ 0144 6fae8000 00000000              .*
 #...
 Contents of section \.got:
- 229c 2c220+ 0+ 0+ 0+  .*
- 22ac 0+                             .*
+ 2240 d0210+ 0+ 0+ 0+  .*
+ 2250 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ld-7.d b/ld/testsuite/ld-cris/tls-ld-7.d
index db034af0fd..7be8b87c54 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+1ac memsz 0x0+1ac flags r-x
-    LOAD off    0x0+1ac vaddr 0x0+21ac paddr 0x0+21ac 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+234 vaddr 0x0+2234 paddr 0x0+2234 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+1ac vaddr 0x0+21ac paddr 0x0+21ac align 2\*\*2
+     TLS off    0x0+150 vaddr 0x0+2150 paddr 0x0+2150 align 2\*\*2
          filesz 0x0+88 memsz 0x0+88 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+168
-  SYMTAB               0x0+e8
-  STRSZ                0x0+29
+  STRTAB               0x0+124
+  SYMTAB               0x0+d4
+  STRSZ                0x0+11
   SYMENT               0x0+10
-  RELA                 0x0+194
+  RELA                 0x0+138
   RELASZ               0x0+c
   RELAENT              0x0+c
 private flags = 0:
@@ -39,13 +39,13 @@  SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+22b0 R_CRIS_DTPMOD     \*ABS\*
+0+2254 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01a0 6fae80+ 0+6fbe 840+     .*
+ 0144 6fae80+ 0+6fbe 840+     .*
 #...
 Contents of section \.got:
- 22a4 34220+ 0+ 0+ 0+  .*
- 22b4 0+                             .*
+ 2248 d8210+ 0+ 0+ 0+  .*
+ 2258 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgd-14.d b/ld/testsuite/ld-cris/tls-ldgd-14.d
index 01cb97553d..0cbd687ec6 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+230 memsz 0x0+230 flags r-x
-    LOAD off    0x0+230 vaddr 0x0+2230 paddr 0x0+2230 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+124 memsz 0x0+124 flags rw-
- DYNAMIC off    0x0+2c0 vaddr 0x0+22c0 paddr 0x0+22c0 align 2\*\*2
+ DYNAMIC off    0x0+26c vaddr 0x0+226c paddr 0x0+226c align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+230 vaddr 0x0+2230 paddr 0x0+2230 align 2\*\*2
+     TLS off    0x0+1dc vaddr 0x0+21dc paddr 0x0+21dc align 2\*\*2
          filesz 0x0+90 memsz 0x0+90 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+1b8
-  SYMTAB               0x0+f8
-  STRSZ                0x0+42
+  STRTAB               0x0+17c
+  SYMTAB               0x0+ec
+  STRSZ                0x0+2a
   SYMENT               0x0+10
-  RELA                 0x0+1fc
+  RELA                 0x0+1a8
   RELASZ               0x0+24
   RELAENT              0x0+c
 private flags = 0:
@@ -55,17 +55,17 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+233c R_CRIS_DTPMOD     \*ABS\*
-0+2344 R_CRIS_DTP        x
-0+234c R_CRIS_DTP        z
+0+22e8 R_CRIS_DTPMOD     \*ABS\*
+0+22f0 R_CRIS_DTP        x
+0+22f8 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0220 5fae8800 5fbe8c00 5fae1400 5fae1c00  .*
+ 01cc 5fae8800 5fbe8c00 5fae1400 5fae1c00  .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 2330 c0220+ 0+ 0+ 0+  .*
- 2340 0+ 0+ 0+ 0+  .*
- 2350 0+                             .*
+ 22dc 6c220+ 0+ 0+ 0+  .*
+ 22ec 0+ 0+ 0+ 0+  .*
+ 22fc 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgd-15.d b/ld/testsuite/ld-cris/tls-ldgd-15.d
index 6d5ac81a90..54bf280607 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+23c memsz 0x0+23c flags r-x
-    LOAD off    0x0+23c vaddr 0x0+223c paddr 0x0+223c 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+124 memsz 0x0+124 flags rw-
- DYNAMIC off    0x0+2cc vaddr 0x0+22cc paddr 0x0+22cc align 2\*\*2
+ DYNAMIC off    0x0+278 vaddr 0x0+2278 paddr 0x0+2278 align 2\*\*2
          filesz 0x0+70 memsz 0x0+70 flags rw-
-     TLS off    0x0+23c vaddr 0x0+223c paddr 0x0+223c align 2\*\*2
+     TLS off    0x0+1e8 vaddr 0x0+21e8 paddr 0x0+21e8 align 2\*\*2
          filesz 0x0+90 memsz 0x0+90 flags r--
 
 Dynamic Section:
   HASH                 0x0+b4
-  STRTAB               0x0+1b8
-  SYMTAB               0x0+f8
-  STRSZ                0x0+42
+  STRTAB               0x0+17c
+  SYMTAB               0x0+ec
+  STRSZ                0x0+2a
   SYMENT               0x0+10
-  RELA                 0x0+1fc
+  RELA                 0x0+1a8
   RELASZ               0x0+24
   RELAENT              0x0+c
 private flags = 0:
@@ -55,18 +55,18 @@  DYNAMIC SYMBOL TABLE:
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+2348 R_CRIS_DTPMOD     \*ABS\*
-0+2350 R_CRIS_DTP        x
-0+2358 R_CRIS_DTP        z
+0+22f4 R_CRIS_DTPMOD     \*ABS\*
+0+22fc R_CRIS_DTP        x
+0+2304 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0220 6fae8800 00006fbe 8c000000 6fae1400  .*
- 0230 0+ 6fae1c00 0+           .*
+ 01cc 6fae8800 00006fbe 8c000000 6fae1400  .*
+ 01dc 0+ 6fae1c00 0+           .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 233c cc220+ 0+ 0+ 0+  .*
- 234c 0+ 0+ 0+ 0+  .*
- 235c 0+                             .*
+ 22e8 78220+ 0+ 0+ 0+  .*
+ 22f8 0+ 0+ 0+ 0+  .*
+ 2308 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
index bb497bba12..57f2262b6f 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-14.d
@@ -38,17 +38,17 @@  DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0008230c R_CRIS_DTP        x
-00082314 R_CRIS_DTP        z
+000822b0 R_CRIS_DTP        x
+000822b8 R_CRIS_DTP        z
 
 Contents of section .interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 5fae8000 5fbe8400 5fae1400  .*
- 801ec 5fae1c00                             .*
+ 80180 41b20000 5fae8000 5fbe8400 5fae1400  .*
+ 80190 5fae1c00                             .*
 Contents of section \.tdata:
 #...
 Contents of section \.got:
- 822f8 78220800 0+ 0+ 010+  .*
- 82308 0+ 0+ 0+ 0+  .*
- 82318 0+                             .*
+ 8229c 1c220800 0+ 0+ 010+  .*
+ 822ac 0+ 0+ 0+ 0+  .*
+ 822bc 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
index 45e5ec3a16..677824ddfa 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-15.d
@@ -38,17 +38,17 @@  DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00082318 R_CRIS_DTP        x
-00082320 R_CRIS_DTP        z
+000822bc R_CRIS_DTP        x
+000822c4 R_CRIS_DTP        z
 
 Contents of section \.interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 6fae8000 00006fbe 84000000  .*
- 801ec 6fae1400 00000000 6fae1c00 00000000  .*
+ 80180 41b20000 6fae8000 00006fbe 84000000  .*
+ 80190 6fae1400 00000000 6fae1c00 00000000  .*
 Contents of section \.tdata:
 #...
 Contents of section \.got:
- 82304 84220800 0+ 0+ 010+  .*
- 82314 0+ 0+ 0+ 0+  .*
- 82324 0+                             .*
+ 822a8 28220800 0+ 0+ 010+  .*
+ 822b8 0+ 0+ 0+ 0+  .*
+ 822c8 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-14.d b/ld/testsuite/ld-cris/tls-ldgdx-14.d
index 1d3dcde6a7..3b627297e8 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 
-00002338 R_CRIS_DTPMOD     \*ABS\*
-00002340 R_CRIS_DTP        x
-00002348 R_CRIS_DTP        z
+000022e4 R_CRIS_DTPMOD     \*ABS\*
+000022ec R_CRIS_DTP        x
+000022f4 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 021c 5fae8000 5fbe8400 5fae1400 5fae1c00  .*
+ 01c8 5fae8000 5fbe8400 5fae1400 5fae1c00  .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 232c b4220+ 0+ 0+ 0+  .*
- 233c 0+ 0+ 0+ 0+  .*
- 234c 0+                             .*
+ 22d8 60220+ 0+ 0+ 0+  .*
+ 22e8 0+ 0+ 0+ 0+  .*
+ 22f8 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-15.d b/ld/testsuite/ld-cris/tls-ldgdx-15.d
index 59f3aae171..4ecfa6bfea 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 
-00002344 R_CRIS_DTPMOD     \*ABS\*
-0000234c R_CRIS_DTP        x
-00002354 R_CRIS_DTP        z
+000022f0 R_CRIS_DTPMOD     \*ABS\*
+000022f8 R_CRIS_DTP        x
+00002300 R_CRIS_DTP        z
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 021c 6fae8000 00006fbe 84000000 6fae1400  .*
- 022c 0+ 6fae1c00 0+           .*
+ 01c8 6fae8000 00006fbe 84000000 6fae1400  .*
+ 01d8 0+ 6fae1c00 0+           .*
 Contents of section .tdata:
 #...
 Contents of section \.got:
- 2338 c0220+ 0+ 0+ 0+  .*
- 2348 0+ 0+ 0+ 0+  .*
- 2358 0+                             .*
+ 22e4 6c220+ 0+ 0+ 0+  .*
+ 22f4 0+ 0+ 0+ 0+  .*
+ 2304 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d
index a5971676ac..e8288bda00 100644
--- a/ld/testsuite/ld-cris/tls-legdx-16.d
+++ b/ld/testsuite/ld-cris/tls-legdx-16.d
@@ -38,15 +38,15 @@  DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00082310 R_CRIS_DTP        x
-00082318 R_CRIS_DTP        z
+000822b4 R_CRIS_DTP        x
+000822bc R_CRIS_DTP        z
 
 Contents of section .interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 6faef8ff ffff6fae fcffffff  .*
- 801ec 6fae1023 08000000 6fae1823 08000000  .*
+ 80180 41b20000 6faef8ff ffff6fae fcffffff  .*
+ 80190 6faeb422 08000000 6faebc22 08000000  .*
 #...
 Contents of section \.got:
- 82304 84220800 0+ 0+ 0+  .*
- 82314 0+ 0+ 0+           .*
+ 822a8 28220800 0+ 0+ 0+  .*
+ 822b8 0+ 0+ 0+           .*
diff --git a/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d
index c5b7b4b55f..240812e2aa 100644
--- a/ld/testsuite/ld-cris/tls-legdx-17.d
+++ b/ld/testsuite/ld-cris/tls-legdx-17.d
@@ -40,15 +40,15 @@  DYNAMIC SYMBOL TABLE:
 #...
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00082308 R_CRIS_DTP        x
-00082310 R_CRIS_DTP        z
+000822ac R_CRIS_DTP        x
+000822b4 R_CRIS_DTP        z
 
 Contents of section .interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 5faef8ff 5faefcff 6fae0c00  .*
- 801ec 00000000 5fae1400                    .*
+ 80180 41b20000 5faef8ff 5faefcff 6fae0c00  .*
+ 80190 00000000 5fae1400                    .*
 #...
 Contents of section \.got:
- 822fc 7c220800 0+ 0+ 0+  .*
- 8230c 0+ 0+ 0+           .*
+ 822a0 20220800 0+ 0+ 0+  .*
+ 822b0 0+ 0+ 0+           .*
diff --git a/ld/testsuite/ld-cris/tls-local-54.d b/ld/testsuite/ld-cris/tls-local-54.d
index 337fbd56b8..f2a100fd53 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 
-00002288 R_CRIS_DTP        \*ABS\*\+0x0000002a
+0000222c R_CRIS_DTP        \*ABS\*\+0x0000002a
 
 Contents of section .hash:
 #...
 Contents of section \.text:
- 0184 6fae0c00 00000000                    .*
+ 0128 6fae0c00 00000000                    .*
 #...
 Contents of section \.got:
- 227c 0c220000 0+ 0+ 0+  .*
- 228c 0+                             .*
+ 2220 b0210000 0+ 0+ 0+  .*
+ 2230 0+                             .*
diff --git a/ld/testsuite/ld-cris/tls-local-60.d b/ld/testsuite/ld-cris/tls-local-60.d
index a2ed60124e..fb680ea41f 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 
-0000231c R_CRIS_32_TPREL   \*ABS\*\+0x0+4
-00002320 R_CRIS_DTP        \*ABS\*\+0x0+4
+000022c8 R_CRIS_32_TPREL   \*ABS\*\+0x0+4
+000022cc R_CRIS_DTP        \*ABS\*\+0x0+4
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 0200 6fae1000 00006fae 0c000000 5fae1000  .*
- 0210 5fae0c00                             .*
+ 01ac 6fae1000 00006fae 0c000000 5fae1000  .*
+ 01bc 5fae0c00                             .*
 #...
 Contents of section \.got:
- 2310 98220+ 0+ 0+ 040+  .*
- 2320 0+ 0+                    .*
+ 22bc 44220+ 0+ 0+ 040+  .*
+ 22cc 0+ 0+                    .*
diff --git a/ld/testsuite/ld-cris/tls-local-61.d b/ld/testsuite/ld-cris/tls-local-61.d
index 54d2786755..029810bcff 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 
-00002304 R_CRIS_32_TPREL   \*ABS\*
-00002308 R_CRIS_DTP        \*ABS\*
+000022b0 R_CRIS_32_TPREL   \*ABS\*
+000022b4 R_CRIS_DTP        \*ABS\*
 
 Contents of section \.hash:
 #...
 Contents of section \.text:
- 01ec 6fae1000 00006fae 0c000000 5fae1000  .*
- 01fc 5fae0c00                             .*
+ 0198 6fae1000 00006fae 0c000000 5fae1000  .*
+ 01a8 5fae0c00                             .*
 #...
 Contents of section \.got:
- 22f8 80220+ 0+ 0+ 0+  .*
- 2308 0+ 0+                    .*
+ 22a4 2c220+ 0+ 0+ 0+  .*
+ 22b4 0+ 0+                    .*
diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index 8d8c356be4..2c16747668 100644
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -10,22 +10,22 @@ 
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00002210  0000001c R_CRIS_32_TPREL[ ]+0
+000021b4  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 7 entries:
+Symbol table '.dynsym' contains 4 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
 #...
-Symbol table '.symtab' contains 16 entries:
+Symbol table '.symtab' contains 13 entries:
 #...
      .: 00000000 +4 +TLS +LOCAL +DEFAULT +6 x
 #...
 Hex dump of section '.text':
-  0x00000184 5fae0c00                            .*
+  0x00000128 5fae0c00                            .*
 #...
 Hex dump of section '.tdata':
-  0x00002188 280+                            .*
+  0x0000212c 280+                            .*
 #...
 Hex dump of section '.got':
-  0x0+2204 8c210000 0+ 0+ 0+ .*
+  0x0+21a8 30210000 0+ 0+ 0+ .*
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 22d7f5fdab..5f92698303 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
-00002290  0000001c R_CRIS_32_TPREL[ ]+80
+00002234  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 7 entries:
+Symbol table '.dynsym' contains 4 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':
-  0x00000184 5fae0c00                            .*
+  0x00000128 5fae0c00                            .*
 #...
 Hex dump of section '.tdata':
-  0x00002188 2f0+ 0+ 0+ 0+ .*
-  0x00002198 0+ 0+ 0+ 0+ .*
+  0x0000212c 2f0+ 0+ 0+ 0+ .*
+  0x0000213c 0+ 0+ 0+ 0+ .*
 #...
-  0x000021f8 0+ 0+ 0+ 0+ .*
-  0x00002208 280+                            .*
+  0x0000219c 0+ 0+ 0+ 0+ .*
+  0x000021ac 280+                            .*
 #...
 Hex dump of section '.got':
-  0x0+2284 0c220000 0+ 0+ 80+ .*
+  0x0+2228 b0210000 0+ 0+ 80+ .*
diff --git a/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
index fef40b3838..8ab8c2a059 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 
-000b3910 R_CRIS_DTP        x2814
+000b38bc R_CRIS_DTP        x2814
 #...
-000b8350 R_CRIS_DTP        x8190
+000b82fc R_CRIS_DTP        x8190
 #...
-000c1308 R_CRIS_DTP        x0
+000c12b4 R_CRIS_DTP        x0
 #...
-000c3900 R_CRIS_DTP        x1345
+000c38ac R_CRIS_DTP        x1345
 
 Contents of section .got:
- b3904 94380b00 00000000 00000000 00000000  .*
- b3914 00000000 00000000 00000000 00000000  .*
+ b38b0 40380b00 00000000 00000000 00000000  .*
+ b38c0 00000000 00000000 00000000 00000000  .*
 #...
- c38e4 00000000 00000000 00000000 00000000  .*
- c38f4 00000000 00000000 00000000 00000000  .*
- c3904 00000000                             .*
+ c3890 00000000 00000000 00000000 00000000  .*
+ c38a0 00000000 00000000 00000000 00000000  .*
+ c38b0 00000000                             .*
 #PASS
diff --git a/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
index 602710e545..e633120cc0 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 
-0000a220 R_CRIS_DTPMOD     \*ABS\*
+0000a1c4 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.text:
- 01a0 5faeff7f                             .*
+ 0144 5faeff7f                             .*
 Contents of section \.tdata:
- 21a4 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
+ 2148 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
 #...
- a194 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
+ a138 2a2a2a2a 2a2a2a2a 2a2a2a2a 2a2a2a2a  .*
 Contents of section \.got:
- a214 a4a10000 00000000 00000000 00000000  .*
- a224 00000000                             .*
+ a1b8 48a10000 00000000 00000000 00000000  .*
+ a1c8 00000000                             .*
diff --git a/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
index ba3d1aea33..a960c69896 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 
-000b3870 R_CRIS_32_TPREL   x2814
+000b381c R_CRIS_32_TPREL   x2814
 #...
-000b485c R_CRIS_32_TPREL   x8188
+000b4808 R_CRIS_32_TPREL   x8188
 #...
-000ba564 R_CRIS_32_TPREL   x0
+000ba510 R_CRIS_32_TPREL   x0
 #...
-000bb860 R_CRIS_32_TPREL   x1345
+000bb80c R_CRIS_32_TPREL   x1345
 
 Contents of section .got:
- b3864 ec370b00 00000000 00000000 00000000  .*
- b3874 00000000 00000000 00000000 00000000  .*
+ b3810 98370b00 00000000 00000000 00000000  .*
+ b3820 00000000 00000000 00000000 00000000  .*
 #...
- bb844 00000000 00000000 00000000 00000000  .*
- bb854 00000000 00000000 00000000 00000000  .*
+ bb7f0 00000000 00000000 00000000 00000000  .*
+ bb800 00000000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/tls-und-38.d b/ld/testsuite/ld-cris/tls-und-38.d
index 4b797b8585..fefe386693 100644
--- a/ld/testsuite/ld-cris/tls-und-38.d
+++ b/ld/testsuite/ld-cris/tls-und-38.d
@@ -11,7 +11,7 @@ 
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
-000021ec +00000217 R_CRIS_DTP +00000000 +x \+ 0
+00002190 +00000217 R_CRIS_DTP +00000000 +x \+ 0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
@@ -23,5 +23,5 @@  Symbol table '.dynsym' contains . entries:
 Symbol table '.symtab' contains .. entries:
 #...
 Hex dump of section '.got':
-  0x0+21e0 70210000 00000000 00000000 00000000 .*
-  0x0+21f0 00000000                            .*
+  0x0+2184 14210000 00000000 00000000 00000000 .*
+  0x0+2194 00000000                            .*
diff --git a/ld/testsuite/ld-cris/tls-und-42.d b/ld/testsuite/ld-cris/tls-und-42.d
index 914dcbfa69..644607710f 100644
--- a/ld/testsuite/ld-cris/tls-und-42.d
+++ b/ld/testsuite/ld-cris/tls-und-42.d
@@ -11,7 +11,7 @@ 
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
-000021f4 +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
+00002198 +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
@@ -23,4 +23,4 @@  Symbol table '.dynsym' contains . entries:
 Symbol table '.symtab' contains .. entries:
 #...
 Hex dump of section '.got':
-  0x0+21e8 70210000 00000000 00000000 00000000 .*
+  0x0+218c 14210000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-cris/tls-und-46.d b/ld/testsuite/ld-cris/tls-und-46.d
index 5af64984d6..ab62cde5d2 100644
--- a/ld/testsuite/ld-cris/tls-und-46.d
+++ b/ld/testsuite/ld-cris/tls-und-46.d
@@ -11,7 +11,7 @@ 
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
-000021e8 +00000217 R_CRIS_DTP +00000000 +x \+ 0
+0000218c +00000217 R_CRIS_DTP +00000000 +x \+ 0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
@@ -23,5 +23,5 @@  Symbol table '.dynsym' contains . entries:
 Symbol table '.symtab' contains .. entries:
 #...
 Hex dump of section '.got':
-  0x0+21dc 6c210000 00000000 00000000 00000000 .*
-  0x0+21ec 00000000                            .*
+  0x0+2180 10210000 00000000 00000000 00000000 .*
+  0x0+2190 00000000                            .*
diff --git a/ld/testsuite/ld-cris/tls-und-50.d b/ld/testsuite/ld-cris/tls-und-50.d
index 9054e09ae3..ed35e4291c 100644
--- a/ld/testsuite/ld-cris/tls-und-50.d
+++ b/ld/testsuite/ld-cris/tls-und-50.d
@@ -11,7 +11,7 @@ 
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entry:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
-000021ec +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
+00002190 +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
@@ -23,4 +23,4 @@  Symbol table '.dynsym' contains . entries:
 Symbol table '.symtab' contains .. entries:
 #...
 Hex dump of section '.got':
-  0x0+21e0 68210000 00000000 00000000 00000000 .*
+  0x0+2184 0c210000 00000000 00000000 00000000 .*
diff --git a/ld/testsuite/ld-cris/weakhiddso.d b/ld/testsuite/ld-cris/weakhiddso.d
index c9c793e860..d884531913 100644
--- a/ld/testsuite/ld-cris/weakhiddso.d
+++ b/ld/testsuite/ld-cris/weakhiddso.d
@@ -9,21 +9,18 @@ 
 .*:     file format elf32-cris
 
 DYNAMIC SYMBOL TABLE:
-0+2208 l    d  \.data	0+ \.data
-0+2208 g    DO \.data	0+c x
+0+21b4 l    d  \.data	0+ \.data
+0+21b4 g    DO \.data	0+c x
 0+      D  \*UND\*	0+ xregobj
-0+2214 g    D  \.data	0+ __bss_start
 0+  w   D  \*UND\*	0+ xweakobj
-0+2214 g    D  \.data	0+ _edata
-0+2220 g    D  \.data	0+ _end
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0+220c R_CRIS_32         xweakobj
-0+2210 R_CRIS_32         xregobj
+0+21b8 R_CRIS_32         xweakobj
+0+21bc R_CRIS_32         xregobj
 
 Contents of section \.hash:
 #...
 Contents of section \.data:
- 2208 00000000 00000000 00000000           .*
+ 21b4 00000000 00000000 00000000           .*
diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index 9b50dbf44a..fa9689bcc7 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:
- 821e4 7c210800 00000000 00000000 00000000  .*
+ 82188 20210800 00000000 00000000 00000000  .*