* ld-cris/tls-e-20.d, ld-cris/tls-e-20a.d, ld-cris/tls-e-22.d,

	ld-cris/tls-e-80.d, ld-cris/tls-e-dtpoffd1.d,
	ld-cris/tls-e-dtpoffd3.d, ld-cris/tls-ldgde-14.d,
	ld-cris/tls-ldgde-15.d, ld-cris/tls-ldgdex-14.d,
	ld-cris/tls-ldgdex-15.d: Adjust for change in non-shared
	R_CRIS_32_DTPREL and R_CRIS_16_DTPREL relocations.

11 files changed, 21 insertions, 12 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b46c834..3fed32e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Hans-Peter Nilsson  <hp@axis.com>
+
+	* ld-cris/tls-e-20.d, ld-cris/tls-e-20a.d, ld-cris/tls-e-22.d,
+	ld-cris/tls-e-80.d, ld-cris/tls-e-dtpoffd1.d,
+	ld-cris/tls-e-dtpoffd3.d, ld-cris/tls-ldgde-14.d,
+	ld-cris/tls-ldgde-15.d, ld-cris/tls-ldgdex-14.d,
+	ld-cris/tls-ldgdex-15.d: Adjust for change in non-shared
+	R_CRIS_32_DTPREL and R_CRIS_16_DTPREL relocations.
+
 2009-10-17  Arnold Metselaar  <arnold.metselaar@planet.nl>
 
 	* ld-scripts/align.exp: Remove xfails for z80-*-coff
diff --git a/ld/testsuite/ld-cris/tls-e-20.d b/ld/testsuite/ld-cris/tls-e-20.d
index 0c723b0..5771d74 100644
--- a/ld/testsuite/ld-cris/tls-e-20.d
+++ b/ld/testsuite/ld-cris/tls-e-20.d
@@ -64,7 +64,7 @@ Disassembly of section \.text:
    80098:	6fae 1800 0000      	move\.d 18 <x2\+0x10>,\$r10
 #...
 000800a0 <tlsdsofn>:
-   800a0:	6fae f4ff ffff      	move\.d 0xfffffff4,\$r10
+   800a0:	6fae 0000 0000      	move\.d 0 <x>,\$r10
 #...
 000800a8 <tlsdsofn10>:
    800a8:	6fae 1400 0000      	move\.d 14 <x2\+0xc>,\$r10
diff --git a/ld/testsuite/ld-cris/tls-e-20a.d b/ld/testsuite/ld-cris/tls-e-20a.d
index 201e0b1..5f52881 100644
--- a/ld/testsuite/ld-cris/tls-e-20a.d
+++ b/ld/testsuite/ld-cris/tls-e-20a.d
@@ -102,7 +102,7 @@ Disassembly of section \.text:
 #...
 
 000800cc <tlsdsofn>:
-   800cc:	6fae f4ff ffff      	move\.d 0xfffffff4,\$r10
+   800cc:	6fae 8000 0000      	move\.d 80 <x>,\$r10
 #...
 
 000800d4 <tlsdsofn10>:
diff --git a/ld/testsuite/ld-cris/tls-e-22.d b/ld/testsuite/ld-cris/tls-e-22.d
index 1976d99..93ab45d 100644
--- a/ld/testsuite/ld-cris/tls-e-22.d
+++ b/ld/testsuite/ld-cris/tls-e-22.d
@@ -35,5 +35,5 @@ Disassembly of section \.text:
    80094:	41b2                	moveq 1,\$r11
 #...
 00080098 <tlsdsofn>:
-   80098:	6fae fcff ffff      	move\.d 0xfffffffc,\$r10
+   80098:	6fae 8000 0000      	move\.d 80 <x>,\$r10
 #...
diff --git a/ld/testsuite/ld-cris/tls-e-80.d b/ld/testsuite/ld-cris/tls-e-80.d
index 6d84e00..603d581 100644
--- a/ld/testsuite/ld-cris/tls-e-80.d
+++ b/ld/testsuite/ld-cris/tls-e-80.d
@@ -81,7 +81,7 @@ Disassembly of section \.text:
    800a8:	6fae b4ff ffff      	move.d 0xffffffb4,\$r10
 #...
 000800b0 <tlsdsofn>:
-   800b0:	6fae b0ff ffff      	move\.d 0xffffffb0,\$r10
+   800b0:	6fae 0000 0000      	move\.d 0 <x>,\$r10
 #...
 000800b8 <tlsdsofn10>:
    800b8:	6fae 1400 0000      	move\.d 14 <gx\+0x4>,\$r10
diff --git a/ld/testsuite/ld-cris/tls-e-dtpoffd1.d b/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
index e81485b..5da24b5 100644
--- a/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
+++ b/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
@@ -27,6 +27,6 @@ Contents of section .got:
  82120 00000000 00000000 00000000 01000000  .*
  82130 80000000                             .*
 Contents of section .debug_info:
- 0000 fcffffff                             .*
+ 0000 80000000                             .*
 Contents of section .debug_line:
 #pass
diff --git a/ld/testsuite/ld-cris/tls-e-dtpoffd3.d b/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
index 8612e38..6013a3a 100644
--- a/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
+++ b/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
@@ -27,6 +27,6 @@ Contents of section .got:
  8211c 00000000 00000000 00000000 01000000  .*
  8212c 80000000                             .*
 Contents of section .debug_info:
- 0000 fcffffff                             .*
+ 0000 80000000                             .*
 Contents of section .debug_line:
 #pass
diff --git a/ld/testsuite/ld-cris/tls-ldgde-14.d b/ld/testsuite/ld-cris/tls-ldgde-14.d
index aa8e60e..9eada3e 100644
--- a/ld/testsuite/ld-cris/tls-ldgde-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgde-14.d
@@ -51,8 +51,8 @@ Disassembly of section \.text:
    80094:	41b2                	moveq 1,\$r11
 #...
 00080098 <tlsdsofn>:
-   80098:	5fae f8ff           	move\.w 0xfff8,\$r10
-   8009c:	5fbe fcff           	move\.w 0xfffc,\$r11
+   80098:	5fae 8800           	move\.w 0x88,\$r10
+   8009c:	5fbe 8c00           	move\.w 0x8c,\$r11
 
 000800a0 <tlsdsofn0>:
    800a0:	5fae 1400           	move\.w 0x14,\$r10
diff --git a/ld/testsuite/ld-cris/tls-ldgde-15.d b/ld/testsuite/ld-cris/tls-ldgde-15.d
index 6e71bcf..d5e993d 100644
--- a/ld/testsuite/ld-cris/tls-ldgde-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgde-15.d
@@ -51,8 +51,8 @@ Disassembly of section \.text:
    80094:	41b2                	moveq 1,\$r11
 #...
 00080098 <tlsdsofn>:
-   80098:	6fae f8ff ffff      	move.d 0xfffffff8,\$r10
-   8009e:	6fbe fcff ffff      	move.d 0xfffffffc,\$r11
+   80098:	6fae 8800 0000      	move.d 88 <x1>,\$r10
+   8009e:	6fbe 8c00 0000      	move.d 8c <x2>,\$r11
 000800a4 <tlsdsofn2>:
    800a4:	6fae 1400 0000      	move.d 14 <tls128\+0x14>,\$r10
 #...
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
index 8fdd500..83d94a7 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-14.d
@@ -44,7 +44,7 @@ OFFSET   TYPE              VALUE
 Contents of section .interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 5faef8ff 5fbefcff 5fae1400  .*
+ 801dc 41b20000 5fae8000 5fbe8400 5fae1400  .*
  801ec 5fae1c00                             .*
 Contents of section \.tdata:
 #...
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
index 43bac9f..fca739b 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-15.d
@@ -44,7 +44,7 @@ OFFSET   TYPE              VALUE
 Contents of section \.interp:
 #...
 Contents of section \.text:
- 801dc 41b20000 6faef8ff ffff6fbe fcffffff  .*
+ 801dc 41b20000 6fae8000 00006fbe 84000000  .*
  801ec 6fae1400 00000000 6fae1c00 00000000  .*
 Contents of section \.tdata:
 #...