* ld-alpha/tlspic.rd: Update for unused section removal.

	* ld-frv/fdpic-shared-6.d: Likewise.
	* ld-frv/tls-dynamic-1.d: Update for symbol changes.
	* ld-frv/tls-dynamic-2.d: Likewise.
	* ld-frv/tls-dynamic-3.d: Likewise.
	* ld-frv/tls-initial-shared-2.d: Likewise.
	* ld-frv/tls-pie-1.d: Likewise.
	* ld-frv/tls-pie-3.d: Likewise.
	* ld-frv/tls-relax-dynamic-1.d: Likewise.
	* ld-frv/tls-relax-dynamic-2.d: Likewise.
	* ld-frv/tls-relax-dynamic-3.d: Likewise.
	* ld-frv/tls-relax-initial-shared-2.d: Likewise.
	* ld-frv/tls-relax-pie-1.d: Likewise.
	* ld-frv/tls-relax-pie-3.d: Likewise.
	* ld-frv/tls-relax-shared-1.d: Likewise.
	* ld-frv/tls-relax-shared-2.d: Likewise.
	* ld-frv/tls-relax-shared-3.d: Likewise.
	* ld-frv/tls-relax-static-3.d: Likewise.
	* ld-frv/tls-shared-1.d: Likewise.
	* ld-frv/tls-shared-2.d: Likewise.
	* ld-frv/tls-shared-3.d: Likewise.
	* ld-frv/tls-static-1.d: Likewise.
	* ld-frv/tls-static-3.d: Likewise.

24 files changed, 59 insertions, 37 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f5e90fb..7b4c64f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2006-12-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* ld-alpha/tlspic.rd: Update for unused section removal.
+	* ld-frv/fdpic-shared-6.d: Likewise.
+	* ld-frv/tls-dynamic-1.d: Update for symbol changes.
+	* ld-frv/tls-dynamic-2.d: Likewise.
+	* ld-frv/tls-dynamic-3.d: Likewise.
+	* ld-frv/tls-initial-shared-2.d: Likewise.
+	* ld-frv/tls-pie-1.d: Likewise.
+	* ld-frv/tls-pie-3.d: Likewise.
+	* ld-frv/tls-relax-dynamic-1.d: Likewise.
+	* ld-frv/tls-relax-dynamic-2.d: Likewise.
+	* ld-frv/tls-relax-dynamic-3.d: Likewise.
+	* ld-frv/tls-relax-initial-shared-2.d: Likewise.
+	* ld-frv/tls-relax-pie-1.d: Likewise.
+	* ld-frv/tls-relax-pie-3.d: Likewise.
+	* ld-frv/tls-relax-shared-1.d: Likewise.
+	* ld-frv/tls-relax-shared-2.d: Likewise.
+	* ld-frv/tls-relax-shared-3.d: Likewise.
+	* ld-frv/tls-relax-static-3.d: Likewise.
+	* ld-frv/tls-shared-1.d: Likewise.
+	* ld-frv/tls-shared-2.d: Likewise.
+	* ld-frv/tls-shared-3.d: Likewise.
+	* ld-frv/tls-static-1.d: Likewise.
+	* ld-frv/tls-static-3.d: Likewise.
+
 2006-12-05  Jakub Jelinek  <jakub@redhat.com>
 	    Alan Modra  <amodra@bigpond.net.au>
 
@@ -44,21 +70,21 @@
 
 	* ld-elf/group.ld: Handle .rodata.brlt for powerpc64.
 
-2006-11-07  Vladimir Prus  <vladimir@codesourcery.com>  
+2006-11-07  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* testsuite/ld-elf/symbol2w.s: Use "%" instead of "@" to avoid
 	breakage on ARM.
 
-2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>  
+2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* testsuite/ld-elf/symbol1ref.s: Use ".dc.a" instead
 	of ".long".
 
-2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>  
+2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* testsuite/ld-elf/warn2.d: New.
 	* testsuite/ld-elf/symbol2w.s: New.
-	* testsuite/ld-elf/symbol2ref.s: New.   
+	* testsuite/ld-elf/symbol2ref.s: New.
 
 2006-11-05  Hans-Peter Nilsson  <hp@axis.com>
 
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index 9de2a00..bed345b 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -57,10 +57,6 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
 Symbol table '.dynsym' contains [0-9]+ entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
 .* [0-9a-f]+     0 NOTYPE  LOCAL  DEFAULT  UND 
-.* [0-9a-f]+     0 SECTION LOCAL  DEFAULT    6 
-.* [0-9a-f]+     0 SECTION LOCAL  DEFAULT    7 
-.* [0-9a-f]+     0 SECTION LOCAL  DEFAULT    8 
-.* [0-9a-f]+     0 SECTION LOCAL  DEFAULT    9 
 .* [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg8
 .* [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg3
 .* [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg4
diff --git a/ld/testsuite/ld-frv/fdpic-shared-6.d b/ld/testsuite/ld-frv/fdpic-shared-6.d
index aefa4d2..06a335f 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-6.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-6.d
@@ -49,18 +49,18 @@ Disassembly of section \.dat[0-9a-f ]+:
 Disassembly of section \.got:
 
 [0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
-[0-9a-f ]+:	00 00 03 98 	sdiv\.p gr0,gr24,gr0
+[0-9a-f ]+:	00 00 03 60 .*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF9
-[0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	00 00 03 90 	sdiv\.p gr0,gr16,gr0
+[0-9a-f ]+:	00 00 00 00 .*
+[0-9a-f ]+:	00 00 03 58 .*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF8
-[0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	00 00 03 88 	sdiv\.p gr0,gr8,gr0
+[0-9a-f ]+:	00 00 00 00 .*
+[0-9a-f ]+:	00 00 03 50 .*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF0
-[0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	00 00 03 80 	sdiv\.p gr0,gr0,gr0
+[0-9a-f ]+:	00 00 00 00 .*
+[0-9a-f ]+:	00 00 03 48 .*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF7
-[0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
+[0-9a-f ]+:	00 00 00 00 .*
 
 [0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
diff --git a/ld/testsuite/ld-frv/tls-dynamic-1.d b/ld/testsuite/ld-frv/tls-dynamic-1.d
index a3790c9..b95505e 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-1.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-1.d
@@ -62,7 +62,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	ff ff f8 20 	cop2 -32,cpr63,cpr32,cpr63
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/tls-dynamic-2.d b/ld/testsuite/ld-frv/tls-dynamic-2.d
index 6470731..07bf332 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-2.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-2.d
@@ -155,7 +155,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	80 88 00 00 	nop
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
 [0-9a-f ]+:	00 01 02 c0 	.*
 [0-9a-f ]+:	00 00 08 21 	.*
 [0-9a-f ]+:	00 01 02 c0 	.*
diff --git a/ld/testsuite/ld-frv/tls-dynamic-3.d b/ld/testsuite/ld-frv/tls-dynamic-3.d
index 35be3a9..c9750d2 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-3.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-initial-shared-2.d b/ld/testsuite/ld-frv/tls-initial-shared-2.d
index e221bec..e4ea6a1 100644
--- a/ld/testsuite/ld-frv/tls-initial-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-initial-shared-2.d
@@ -149,7 +149,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 5c 	ldi @\(gr15,92\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x20)>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 10 11 	add\.p sp,gr17,gr0
diff --git a/ld/testsuite/ld-frv/tls-pie-1.d b/ld/testsuite/ld-frv/tls-pie-1.d
index 11654fc..0ced90a 100644
--- a/ld/testsuite/ld-frv/tls-pie-1.d
+++ b/ld/testsuite/ld-frv/tls-pie-1.d
@@ -62,7 +62,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	ff ff f8 20 	cop2 -32,cpr63,cpr32,cpr63
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/tls-pie-3.d b/ld/testsuite/ld-frv/tls-pie-3.d
index 4783ce0..4dc3469 100644
--- a/ld/testsuite/ld-frv/tls-pie-3.d
+++ b/ld/testsuite/ld-frv/tls-pie-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-1.d b/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
index 7075a28..3d7ec36 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
@@ -62,6 +62,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	x
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-2.d b/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
index 84f322c..59577d3 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
@@ -124,7 +124,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	80 88 00 00 	nop
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	00 00 00 03 	add\.p gr0,gr3,gr0
 [0-9a-f	 ]+: R_FRV_TLSOFF	x
diff --git a/ld/testsuite/ld-frv/tls-relax-dynamic-3.d b/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
index 6aa4fc7..43cbdc7 100644
--- a/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d b/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
index 64ae61f..824cf65 100644
--- a/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
@@ -138,7 +138,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	00 00 10 11 	add\.p sp,gr17,gr0
 [0-9a-f	 ]+: R_FRV_TLSOFF	\.tbss
diff --git a/ld/testsuite/ld-frv/tls-relax-pie-1.d b/ld/testsuite/ld-frv/tls-relax-pie-1.d
index cc11443..579047e 100644
--- a/ld/testsuite/ld-frv/tls-relax-pie-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-pie-1.d
@@ -62,6 +62,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	x
diff --git a/ld/testsuite/ld-frv/tls-relax-pie-3.d b/ld/testsuite/ld-frv/tls-relax-pie-3.d
index 4bc5291..da26ca0 100644
--- a/ld/testsuite/ld-frv/tls-relax-pie-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-pie-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-1.d b/ld/testsuite/ld-frv/tls-relax-shared-1.d
index 35d5c67..ba3b532 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-1.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-1.d
@@ -62,7 +62,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 18 	ldi @\(gr15,24\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
 [0-9a-f	 ]+: R_FRV_TLSOFF	\.tbss
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-2.d b/ld/testsuite/ld-frv/tls-relax-shared-2.d
index e7ac840..c07bb35 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-2.d
@@ -151,7 +151,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	82 30 80 00 	calll @\(gr8,gr0\)
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 17 f3 	\*unknown\*
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-3.d b/ld/testsuite/ld-frv/tls-relax-shared-3.d
index 48909d5..b766a00 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-relax-static-3.d b/ld/testsuite/ld-frv/tls-relax-static-3.d
index f4ce45f..ed3c07a 100644
--- a/ld/testsuite/ld-frv/tls-relax-static-3.d
+++ b/ld/testsuite/ld-frv/tls-relax-static-3.d
@@ -22,5 +22,5 @@ Disassembly of section \.text:
    100c0:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-000140c8 <_GLOBAL_OFFSET_TABLE_>:
+000140c8 <(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
diff --git a/ld/testsuite/ld-frv/tls-shared-1.d b/ld/testsuite/ld-frv/tls-shared-1.d
index 03fe411..2a29ba5 100644
--- a/ld/testsuite/ld-frv/tls-shared-1.d
+++ b/ld/testsuite/ld-frv/tls-shared-1.d
@@ -62,7 +62,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 18 	ldi @\(gr15,24\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
 [0-9a-f	 ]+: R_FRV_TLSOFF	\.tbss
diff --git a/ld/testsuite/ld-frv/tls-shared-2.d b/ld/testsuite/ld-frv/tls-shared-2.d
index b622ad4..bd92cdb 100644
--- a/ld/testsuite/ld-frv/tls-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-shared-2.d
@@ -151,7 +151,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	82 30 80 00 	calll @\(gr8,gr0\)
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x60>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 17 f3 	\*unknown\*
diff --git a/ld/testsuite/ld-frv/tls-shared-3.d b/ld/testsuite/ld-frv/tls-shared-3.d
index dc2d693..c4eed38 100644
--- a/ld/testsuite/ld-frv/tls-shared-3.d
+++ b/ld/testsuite/ld-frv/tls-shared-3.d
@@ -22,6 +22,6 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 0c 	ldi @\(gr15,12\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f	 ]+: R_FRV_TLSOFF	u
diff --git a/ld/testsuite/ld-frv/tls-static-1.d b/ld/testsuite/ld-frv/tls-static-1.d
index 0eeb21d..d33d8cf 100644
--- a/ld/testsuite/ld-frv/tls-static-1.d
+++ b/ld/testsuite/ld-frv/tls-static-1.d
@@ -62,7 +62,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.
 [0-9a-f ]+:	ff ff f8 30 	cop2 -32,cpr63,cpr48,cpr63
 [0-9a-f ]+:	ff ff f8 10 	cop2 -32,cpr63,cpr16,cpr63
diff --git a/ld/testsuite/ld-frv/tls-static-3.d b/ld/testsuite/ld-frv/tls-static-3.d
index 7a6bea9..e761cc8 100644
--- a/ld/testsuite/ld-frv/tls-static-3.d
+++ b/ld/testsuite/ld-frv/tls-static-3.d
@@ -22,5 +22,5 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 fc 00 00 	setlos lo\(0x0\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
+[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_)>:
 	\.\.\.