2005-03-23 H.J. Lu <hongjiu.lu@intel.com>

	* ld-cris/expdyn5.d: Updated for alignment change in elf.sc.
	* ld-cris/expdyn6.d: Likewise.
	* ld-cris/expdyn7.d: Likewise.
	* ld-cris/gotplt1.d: Likewise.
	* ld-cris/gotplt2.d: Likewise.
	* ld-cris/gotplt3.d: Likewise.
	* ld-cris/libdso-10.d: Likewise.
	* ld-cris/libdso-11.d: Likewise.
	* ld-cris/libdso-12.d: Likewise.
	* ld-cris/libdso-14.d: Likewise.
	* ld-cris/libdso-2.d: Likewise.
	* ld-cris/locref1.d: Likewise.
	* ld-cris/locref2.d: Likewise.
	* ld-cris/nodyn5.d: Likewise.
	* ld-cris/pv32-1.d: Likewise.
	* ld-cris/weakref2.d: Likewise.

17 files changed, 115 insertions, 96 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d82b583ba6..657c79678a 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2005-03-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-cris/expdyn5.d: Updated for alignment change in elf.sc.
+	* ld-cris/expdyn6.d: Likewise.
+	* ld-cris/expdyn7.d: Likewise.
+	* ld-cris/gotplt1.d: Likewise.
+	* ld-cris/gotplt2.d: Likewise.
+	* ld-cris/gotplt3.d: Likewise.
+	* ld-cris/libdso-10.d: Likewise.
+	* ld-cris/libdso-11.d: Likewise.
+	* ld-cris/libdso-12.d: Likewise.
+	* ld-cris/libdso-14.d: Likewise.
+	* ld-cris/libdso-2.d: Likewise.
+	* ld-cris/locref1.d: Likewise.
+	* ld-cris/locref2.d: Likewise.
+	* ld-cris/nodyn5.d: Likewise.
+	* ld-cris/pv32-1.d: Likewise.
+	* ld-cris/weakref2.d: Likewise.
+
 2005-03-23  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-elf/tbss.s: Don't start directives in first column.
diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
index 280f6516a4..2e404b8a41 100644
--- a/ld/testsuite/ld-cris/expdyn5.d
+++ b/ld/testsuite/ld-cris/expdyn5.d
@@ -9,5 +9,5 @@
 
 .*:     file format elf32-cris
 Contents of section \.got:
- 82268 00220800 00000000 00000000 dc010800  .*
- 82278 7c220800                             .*
+ 82260 f8210800 00000000 00000000 dc010800  .*
+ 82270 74220800                             .*
diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
index 42b4712dd4..8888ac6d50 100644
--- a/ld/testsuite/ld-cris/expdyn6.d
+++ b/ld/testsuite/ld-cris/expdyn6.d
@@ -9,5 +9,5 @@
 
 .*:     file format elf32-cris
 Contents of section \.got:
- 822c8 60220800 00000000 00000000 00000000  .*
- 822d8 24020800 e0220800                    .*
+ 822bc 54220800 00000000 00000000 00000000  .*
+ 822cc 24020800 d4220800                    .*
diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
index be7a35a0d1..02e1464c90 100644
--- a/ld/testsuite/ld-cris/expdyn7.d
+++ b/ld/testsuite/ld-cris/expdyn7.d
@@ -9,5 +9,5 @@
 
 .*:     file format elf32-cris
 Contents of section \.got:
- 822c8 60220800 00000000 00000000 e4220800  .*
- 822d8 21020800 e0220800                    .*
+ 822b8 50220800 00000000 00000000 d4220800  .*
+ 822c8 21020800 d0220800                    .*
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index e82370a348..aac6e3235b 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 
-000822b4 R_CRIS_JUMP_SLOT  dsofn
+0008229c R_CRIS_JUMP_SLOT  dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.plt:
- 801ac b4220800 0b050000 00000000           .*
+ 801ac 9c220800 0b050000 00000000           .*
 Contents of section \.plt:
- 801b8 fce17e7e 7f0dac22 0800307a 7f0db022  .*
- 801c8 08003009 7f0db422 08003009 3f7e0000  .*
+ 801b8 fce17e7e 7f0d9422 0800307a 7f0d9822  .*
+ 801c8 08003009 7f0d9c22 08003009 3f7e0000  .*
  801d8 00002ffe d8ffffff                    .*
 Contents of section \.text:
  801e0 5f1d0c00 30096f1d 0c000000 30090000  .*
  801f0 6f0d1000 0000611a 6f2ecc01 08000000  .*
- 80200 6f3e58df ffff0000                    .*
+ 80200 6f3e70df ffff0000                    .*
 Contents of section \.dynamic:
- 82220 01000000 01000000 04000000 e4000800  .*
- 82230 05000000 70010800 06000000 10010800  .*
- 82240 0a000000 3b000000 0b000000 10000000  .*
- 82250 15000000 00000000 03000000 a8220800  .*
- 82260 02000000 0c000000 14000000 07000000  .*
- 82270 17000000 ac010800 00000000 00000000  .*
- 82280 00000000 00000000 00000000 00000000  .*
- 82290 00000000 00000000 00000000 00000000  .*
- 822a0 00000000 00000000                    .*
+ 82208 01000000 01000000 04000000 e4000800  .*
+ 82218 05000000 70010800 06000000 10010800  .*
+ 82228 0a000000 3b000000 0b000000 10000000  .*
+ 82238 15000000 00000000 03000000 90220800  .*
+ 82248 02000000 0c000000 14000000 07000000  .*
+ 82258 17000000 ac010800 00000000 00000000  .*
+ 82268 00000000 00000000 00000000 00000000  .*
+ 82278 00000000 00000000 00000000 00000000  .*
+ 82288 00000000 00000000                    .*
 Contents of section \.got:
- 822a8 20220800 00000000 00000000 d4010800  .*
- 822b8 cc010800                             .*
+ 82290 08220800 00000000 00000000 d4010800  .*
+ 822a0 cc010800                             .*
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index d60dd96ac0..149b7ea6fc 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 
-0000227c R_CRIS_GLOB_DAT   dsofn
+00002274 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.got:
- 01cc 7c220000 0a0b0000 00000000           .*
+ 01cc 74220000 0a0b0000 00000000           .*
 Contents of section \.text:
  01d8 5f1d0c00 30096f1d 0c000000 30090000  .*
- 01e8 6f0d0c00 0000611a 6f3e80df ffff0000  .*
+ 01e8 6f0d0c00 0000611a 6f3e88df ffff0000  .*
 Contents of section \.dynamic:
- 2200 04000000 94000000 05000000 98010000  .*
- 2210 06000000 d8000000 0a000000 33000000  .*
- 2220 0b000000 10000000 07000000 cc010000  .*
- 2230 08000000 0c000000 09000000 0c000000  .*
- 2240 00000000 00000000 00000000 00000000  .*
- 2250 00000000 00000000 00000000 00000000  .*
- 2260 00000000 00000000 00000000 00000000  .*
+ 21f8 04000000 94000000 05000000 98010000  .*
+ 2208 06000000 d8000000 0a000000 33000000  .*
+ 2218 0b000000 10000000 07000000 cc010000  .*
+ 2228 08000000 0c000000 09000000 0c000000  .*
+ 2238 00000000 00000000 00000000 00000000  .*
+ 2248 00000000 00000000 00000000 00000000  .*
+ 2258 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 2270 00220000 00000000 00000000 00000000  .*
+ 2268 f8210000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index e03c473701..879371e1b8 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 
-0000227c R_CRIS_GLOB_DAT   dsofn
+00002278 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
 #...
 Contents of section \.rela\.got:
- 01cc 7c220000 0a0b0000 00000000           .*
+ 01cc 78220000 0a0b0000 00000000           .*
 Contents of section \.text:
  01d8 5f1d0c00 30096f1d 0c000000 30090000  .*
- 01e8 6f0d0c00 0000611a 6f3e80df ffff0000  .*
+ 01e8 6f0d0c00 0000611a 6f3e84df ffff0000  .*
  01f8 0f050000                             .*
 Contents of section \.dynamic:
- 2200 04000000 94000000 05000000 98010000  .*
- 2210 06000000 d8000000 0a000000 33000000  .*
- 2220 0b000000 10000000 07000000 cc010000  .*
- 2230 08000000 0c000000 09000000 0c000000  .*
- 2240 00000000 00000000 00000000 00000000  .*
- 2250 00000000 00000000 00000000 00000000  .*
- 2260 00000000 00000000 00000000 00000000  .*
+ 21fc 04000000 94000000 05000000 98010000  .*
+ 220c 06000000 d8000000 0a000000 33000000  .*
+ 221c 0b000000 10000000 07000000 cc010000  .*
+ 222c 08000000 0c000000 09000000 0c000000  .*
+ 223c 00000000 00000000 00000000 00000000  .*
+ 224c 00000000 00000000 00000000 00000000  .*
+ 225c 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 2270 00220000 00000000 00000000 00000000  .*
+ 226c fc210000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index bd5f74c19b..3fe6ddbea9 100644
--- a/ld/testsuite/ld-cris/libdso-10.d
+++ b/ld/testsuite/ld-cris/libdso-10.d
@@ -10,9 +10,9 @@
 Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
          filesz 0x0+188 memsz 0x0+188 flags r-x
-    LOAD off    0x0+1a0 vaddr 0x0+21a0 paddr 0x0+21a0 align 2\*\*13
-         filesz 0x0+64 memsz 0x0+80 flags rw-
- DYNAMIC off    0x0+1a0 vaddr 0x0+21a0 paddr 0x0+21a0 align 2\*\*2
+    LOAD off    0x0+188 vaddr 0x0+2188 paddr 0x0+2188 align 2\*\*13
+         filesz 0x0+64 memsz 0x0+78 flags rw-
+ DYNAMIC off    0x0+188 vaddr 0x0+2188 paddr 0x0+2188 align 2\*\*2
          filesz 0x0+58 memsz 0x0+58 flags rw-
 Dynamic Section:
   HASH        0x94
@@ -31,9 +31,9 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
   3 \.text         0+4  0+184  0+184  0+184  2\*\*0
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  4 \.dynamic      0+58  0+21a0  0+21a0  0+1a0  2\*\*2
+  4 \.dynamic      0+58  0+2188  0+2188  0+188  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
-  5 \.got          0+c  0+21f8  0+21f8  0+1f8  2\*\*2
+  5 \.got          0+c  0+21e0  0+21e0  0+1e0  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
-  6 \.bss          0+1c  0+2204  0+2204  0+204  2\*\*0
+  6 \.bss          0+14  0+21ec  0+21ec  0+1ec  2\*\*0
                   ALLOC
diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index 6646e4256c..b172a4a134 100644
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -13,7 +13,7 @@ DYNAMIC SYMBOL TABLE:
 0+1e0 g    DF \.text	0+ dsofn
 #...
 Contents of section \.rela\.plt:
- 01a0 84220000 0b090000 00000000           .*
+ 01a0 70220000 0b090000 00000000           .*
 Contents of section \.plt:
  01ac 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
  01bc 00000000 00000000 00006f0d 0c000000  .*
@@ -24,4 +24,4 @@ Contents of section \.text:
 Contents of section \.dynamic:
 #...
 Contents of section \.got:
- 2278 00220000 00000000 00000000 d2010000  .*
+ 2264 ec210000 00000000 00000000 d2010000  .*
diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index dc8451e3a0..ba9a45c195 100644
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -14,16 +14,16 @@ DYNAMIC SYMBOL TABLE:
 #...
 0+282 g    DF \.text	0+12 dsofn4
 0+278 g    DF \.text	0+2 expfn
-0+2348 g    DO \.data	0+ expobj
+0+2340 g    DO \.data	0+ expobj
 #...
 0+27a g    DF \.text	0+8 dsofn3
 #...
 0+      D  \*UND\*	0+ dsofn
 #...
 Contents of section \.rela\.got:
- 0204 44230000 0a070000 00000000           .*
+ 0204 3c230000 0a070000 00000000           .*
 Contents of section \.rela\.plt:
- 0210 3c230000 0b050000 00000000 40230000  .*
+ 0210 34230000 0b050000 00000000 38230000  .*
  0220 0b0d0000 00000000                    .*
 Contents of section \.plt:
  0228 84e20401 7e7a3f7a 04f26ffa bf09b005  .*
@@ -32,20 +32,20 @@ Contents of section \.plt:
  0258 ffffb005 6f0d1000 00006ffa bf09b005  .*
  0268 3f7e0c00 0000bf0e baffffff b005      .*
 Contents of section \.text:
- 0276 b005b005 bfbee2ff ffffb005 7f0dae20  .*
+ 0276 b005b005 bfbee2ff ffffb005 7f0da620  .*
  0286 00005f0d 1400bfbe b6ffffff b0050000  .*
 Contents of section \.dynamic:
- 22a0 04000000 94000000 05000000 c0010000  .*
- 22b0 06000000 e0000000 0a000000 43000000  .*
- 22c0 0b000000 10000000 03000000 30230000  .*
- 22d0 02000000 18000000 14000000 07000000  .*
- 22e0 17000000 10020000 07000000 04020000  .*
- 22f0 08000000 0c000000 09000000 0c000000  .*
- 2300 00000000 00000000 00000000 00000000  .*
- 2310 00000000 00000000 00000000 00000000  .*
- 2320 00000000 00000000 00000000 00000000  .*
+ 2298 04000000 94000000 05000000 c0010000  .*
+ 22a8 06000000 e0000000 0a000000 43000000  .*
+ 22b8 0b000000 10000000 03000000 28230000  .*
+ 22c8 02000000 18000000 14000000 07000000  .*
+ 22d8 17000000 10020000 07000000 04020000  .*
+ 22e8 08000000 0c000000 09000000 0c000000  .*
+ 22f8 00000000 00000000 00000000 00000000  .*
+ 2308 00000000 00000000 00000000 00000000  .*
+ 2318 00000000 00000000 00000000 00000000  .*
 Contents of section \.got:
- 2330 a0220000 00000000 00000000 4e020000  .*
- 2340 68020000 00000000                    .*
+ 2328 98220000 00000000 00000000 4e020000  .*
+ 2338 68020000 00000000                    .*
 Contents of section \.data:
- 2348 00000000                             .*
+ 2340 00000000                             .*
diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index ac84c43b19..5d9cf51a4d 100644
--- a/ld/testsuite/ld-cris/libdso-14.d
+++ b/ld/testsuite/ld-cris/libdso-14.d
@@ -7,7 +7,7 @@
 # Checking that a bsr to a non-PLT-decorated nonvisible function
 # doesn't make the DSO textrel.
 
-Dynamic section at offset 0x1c0 contains 6 entries:
+Dynamic section at offset 0x1b0 contains 6 entries:
   Tag[ 	]+Type[ 	]+Name/Value
  0x0+4 \(HASH\)[ 	]+0x94
  0x0+5 \(STRTAB\)[ 	]+0x170
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 3a316509a7..10bfe28706 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -28,7 +28,7 @@ There are 14 section headers.*
 #...
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 #...
-00002234  0000000c R_CRIS_RELATIVE                              00000184
+0000222c  0000000c R_CRIS_RELATIVE                              00000184
 #...
 Symbol table '\.dynsym' contains 6 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
@@ -55,10 +55,10 @@ Symbol table '\.symtab' contains 22 entries:
     11: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   11 
     12: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   12 
     13: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   13 
-    14: 0+21a0     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    15: 0+2238     0 NOTYPE  LOCAL  DEFAULT  ABS __bss_start
-    16: 0+2238     0 NOTYPE  LOCAL  DEFAULT  ABS _edata
-    17: 0+2228     0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
+    14: 0+2198     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    15: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS __bss_start
+    16: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS _edata
+    17: 0+2220     0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
     18: 0+2240     0 NOTYPE  LOCAL  DEFAULT  ABS _end
     19: 0+184     0 FUNC    LOCAL  DEFAULT    7 dsofn
     20: 0+     0 OBJECT  GLOBAL DEFAULT  ABS TST1
diff --git a/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d
index 3487a30b71..0411553370 100644
--- a/ld/testsuite/ld-cris/locref1.d
+++ b/ld/testsuite/ld-cris/locref1.d
@@ -12,12 +12,12 @@
 SYMBOL TABLE:
 #...
 0+80076 g     F \.text	0+2 expfn
-0+820ac g     O \.data	0+ expobj
+0+82090 g     O \.data	0+ expobj
 #...
-0+820a0 g     O \.got	0+ \.hidden _GLOBAL_OFFSET_TABLE_
+0+82084 g     O \.got	0+ \.hidden _GLOBAL_OFFSET_TABLE_
 #...
 Disassembly of section \.text:
 #...
 0+80078 <y>:
-   80078:	6fae d6df ffff  .*
+   80078:	6fae f2df ffff  .*
    8007e:	6fbe 0c00 0000  .*
diff --git a/ld/testsuite/ld-cris/locref2.d b/ld/testsuite/ld-cris/locref2.d
index 829d22bb99..c68b6e8098 100644
--- a/ld/testsuite/ld-cris/locref2.d
+++ b/ld/testsuite/ld-cris/locref2.d
@@ -14,10 +14,10 @@ SYMBOL TABLE:
 0+  w      \*UND\*	0+ expfn
 0+  w      \*UND\*	0+ expobj
 #...
-0+820a0 g     O \.got	0+ \.hidden _GLOBAL_OFFSET_TABLE_
+0+82088 g     O \.got	0+ \.hidden _GLOBAL_OFFSET_TABLE_
 #...
 Disassembly of section \.text:
 #...
 0+8007c <y>:
-   8007c:	6fae 60df f7ff  .*
-   80082:	6fbe 60df f7ff  .*
+   8007c:	6fae 78df f7ff  .*
+   80082:	6fbe 78df f7ff  .*
diff --git a/ld/testsuite/ld-cris/nodyn5.d b/ld/testsuite/ld-cris/nodyn5.d
index ea8e154e59..28b581e097 100644
--- a/ld/testsuite/ld-cris/nodyn5.d
+++ b/ld/testsuite/ld-cris/nodyn5.d
@@ -9,5 +9,5 @@
 
 .*:     file format elf32-cris
 Contents of section \.got:
- 820c0 00000000 00000000 00000000 dc200800  .*
- 820d0 76000800 d8200800                    .*
+ 820a4 00000000 00000000 00000000 c0200800  .*
+ 820b4 76000800 bc200800                    .*
diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index 8e2e2b1bd5..d757eb21bb 100644
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -8,34 +8,34 @@
 .*:     file format elf32-cris
 
 DYNAMIC SYMBOL TABLE:
-0+822a0 g    DO \*ABS\*	0+ _DYNAMIC
+0+8228c g    DO \*ABS\*	0+ _DYNAMIC
 0+8023a      DF \*UND\*	0+2 expfn
-0+82354 g    DO \.bss	0+ expobj
-0+82354 g    D  \*ABS\*	0+ __bss_start
+0+82340 g    DO \.bss	0+ expobj
+0+82340 g    D  \*ABS\*	0+ __bss_start
 0+80254      DF \*UND\*	0+8 dsofn3
-0+82354 g    D  \*ABS\*	0+ _edata
-0+82360 g    D  \*ABS\*	0+ _end
+0+82340 g    D  \*ABS\*	0+ _edata
+0+82340 g    D  \*ABS\*	0+ _end
 0+80280 g    DF \.text	0+8 dsofn
 
 Contents of section \.interp:
  800d4 2f6c6962 2f6c642e 736f2e31 00        .*
 #...
 Contents of section \.rela\.dyn:
- 801fc 54230800 09030000 00000000           .*
+ 801fc 40230800 09030000 00000000           .*
 Contents of section \.rela\.plt:
- 80208 4c230800 0b020000 00000000 50230800  .*
+ 80208 38230800 0b020000 00000000 3c230800  .*
  80218 0b050000 00000000                    .*
 Contents of section \.plt:
- 80220 84e26ffe 44230800 7e7a3f7a 04f26ffa  .*
- 80230 bf09b005 00000000 00006ffe 4c230800  .*
+ 80220 84e26ffe 30230800 7e7a3f7a 04f26ffa  .*
+ 80230 bf09b005 00000000 00006ffe 38230800  .*
  80240 6ffabf09 b0053f7e 00000000 bf0ed4ff  .*
- 80250 ffffb005 6ffe5023 08006ffa bf09b005  .*
+ 80250 ffffb005 6ffe3c23 08006ffa bf09b005  .*
  80260 3f7e0c00 0000bf0e baffffff b005      .*
 Contents of section \.text:
  8026e b005bfbe caffffff b005bfbe dcffffff  .*
- 8027e b0056fae 54230800 b0050000           .*
+ 8027e b0056fae 40230800 b0050000           .*
 Contents of section \.dynamic:
 #...
 Contents of section \.got:
- 82340 a0220800 00000000 00000000 46020800  .*
- 82350 60020800                             .*
+ 8232c 8c220800 00000000 00000000 46020800  .*
+ 8233c 60020800                             .*
diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index 15463501ad..5b34bfc8c5 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:
- 82208 a0210800 00000000 00000000 00000000  .*
+ 82204 9c210800 00000000 00000000 00000000  .*