* ld-frv/fdpic*.d: Adjust to compensate for page size change.

20 files changed, 626 insertions, 622 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f384fd0..a44d6f8 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ld-frv/fdpic*.d: Adjust to compensate for page size change.
+
 2004-03-26  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-powerpc/tlsexe.r: Update for changed sym type.
diff --git a/ld/testsuite/ld-frv/fdpic-pie-1.d b/ld/testsuite/ld-frv/fdpic-pie-1.d
index da356ae..15d36ae 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-1.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-1.d
@@ -32,27 +32,27 @@ Disassembly of section \.text:
  418:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010430 <D1>:
-   10430:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10430: R_FRV_32	\.data
-
-00010434 <\.D0>:
-   10434:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10434: R_FRV_32	\.got
-   10438:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10438: R_FRV_32	\.text
+00004430 <D1>:
+    4430:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4430: R_FRV_32	\.data
+
+00004434 <\.D0>:
+    4434:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4434: R_FRV_32	\.got
+    4438:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4438: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000104b8 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   104b8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104b8: R_FRV_FUNCDESC_VALUE	\.text
-   104bc:	00 00 00 02 	add\.p gr0,fp,gr0
+000044b8 <_GLOBAL_OFFSET_TABLE_-0x8>:
+    44b8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44b8: R_FRV_FUNCDESC_VALUE	\.text
+    44bc:	00 00 00 02 	add\.p gr0,fp,gr0
 
-000104c0 <_GLOBAL_OFFSET_TABLE_>:
+000044c0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   104cc:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104cc: R_FRV_32	\.text
-   104d0:	00 00 00 00 	add\.p gr0,gr0,gr0
-			104d0: R_FRV_32	\.got
-   104d4:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104d4: R_FRV_32	\.data
+    44cc:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44cc: R_FRV_32	\.text
+    44d0:	00 00 00 00 	add\.p gr0,gr0,gr0
+			44d0: R_FRV_32	\.got
+    44d4:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44d4: R_FRV_32	\.data
diff --git a/ld/testsuite/ld-frv/fdpic-pie-2.d b/ld/testsuite/ld-frv/fdpic-pie-2.d
index 5e0e366..fb5e1e6 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-2.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-2.d
@@ -32,41 +32,41 @@ Disassembly of section \.text:
  618:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010630 <D2>:
-   10630:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10630: R_FRV_32	\.data
+00004630 <D2>:
+    4630:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4630: R_FRV_32	\.data
 
-00010634 <GD0>:
-   10634:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10634: R_FRV_FUNCDESC	\.text
-   10638:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10638: R_FRV_32	\.text
+00004634 <GD0>:
+    4634:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4634: R_FRV_FUNCDESC	\.text
+    4638:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4638: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000106b8 <_GLOBAL_OFFSET_TABLE_-0x18>:
-   106b8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106b8: R_FRV_FUNCDESC_VALUE	\.text
-   106bc:	00 00 00 02 	add\.p gr0,fp,gr0
-   106c0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106c0: R_FRV_FUNCDESC_VALUE	\.text
-   106c4:	00 00 00 02 	add\.p gr0,fp,gr0
-   106c8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106c8: R_FRV_FUNCDESC_VALUE	\.text
-   106cc:	00 00 00 02 	add\.p gr0,fp,gr0
+000046b8 <_GLOBAL_OFFSET_TABLE_-0x18>:
+    46b8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46b8: R_FRV_FUNCDESC_VALUE	\.text
+    46bc:	00 00 00 02 	add\.p gr0,fp,gr0
+    46c0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46c0: R_FRV_FUNCDESC_VALUE	\.text
+    46c4:	00 00 00 02 	add\.p gr0,fp,gr0
+    46c8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46c8: R_FRV_FUNCDESC_VALUE	\.text
+    46cc:	00 00 00 02 	add\.p gr0,fp,gr0
 
-000106d0 <_GLOBAL_OFFSET_TABLE_>:
+000046d0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   106dc:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106dc: R_FRV_FUNCDESC	\.text
-   106e0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e0: R_FRV_32	\.text
-   106e4:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e4: R_FRV_FUNCDESC	\.text
-   106e8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e8: R_FRV_FUNCDESC	\.text
-   106ec:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106ec: R_FRV_32	\.data
-   106f0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106f0: R_FRV_32	\.text
-   106f4:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106f4: R_FRV_32	\.text
+    46dc:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46dc: R_FRV_FUNCDESC	\.text
+    46e0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e0: R_FRV_32	\.text
+    46e4:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e4: R_FRV_FUNCDESC	\.text
+    46e8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e8: R_FRV_FUNCDESC	\.text
+    46ec:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46ec: R_FRV_32	\.data
+    46f0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46f0: R_FRV_32	\.text
+    46f4:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46f4: R_FRV_32	\.text
diff --git a/ld/testsuite/ld-frv/fdpic-pie-6.d b/ld/testsuite/ld-frv/fdpic-pie-6.d
index f63965a..c9263f7 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-6.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-6.d
@@ -42,33 +42,33 @@ Disassembly of section \.text:
  614:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-0001062c <D6>:
+0000462c <D6>:
 	\.\.\.
-			1062c: R_FRV_32	WD0
-			10630: R_FRV_FUNCDESC	WFb
-			10634: R_FRV_32	WFb
+			462c: R_FRV_32	WD0
+			4630: R_FRV_FUNCDESC	WFb
+			4634: R_FRV_32	WFb
 Disassembly of section \.got:
 
-000106c8 <_GLOBAL_OFFSET_TABLE_-0x20>:
-   106c8:	00 00 05 c4 	subxcc\.p gr0,gr4,gr0,icc1
-			106c8: R_FRV_FUNCDESC_VALUE	WF9
-   106cc:	00 00 00 02 	add\.p gr0,fp,gr0
-   106d0:	00 00 05 bc 	subx\.p gr0,gr60,gr0,icc1
-			106d0: R_FRV_FUNCDESC_VALUE	WF8
-   106d4:	00 00 00 02 	add\.p gr0,fp,gr0
-   106d8:	00 00 05 b4 	subx\.p gr0,gr52,gr0,icc1
-			106d8: R_FRV_FUNCDESC_VALUE	WF0
-   106dc:	00 00 00 02 	add\.p gr0,fp,gr0
-   106e0:	00 00 05 ac 	subx\.p gr0,gr44,gr0,icc1
-			106e0: R_FRV_FUNCDESC_VALUE	WF7
-   106e4:	00 00 00 02 	add\.p gr0,fp,gr0
+000046c8 <_GLOBAL_OFFSET_TABLE_-0x20>:
+    46c8:	00 00 05 c4 	subxcc\.p gr0,gr4,gr0,icc1
+			46c8: R_FRV_FUNCDESC_VALUE	WF9
+    46cc:	00 00 00 02 	add\.p gr0,fp,gr0
+    46d0:	00 00 05 bc 	subx\.p gr0,gr60,gr0,icc1
+			46d0: R_FRV_FUNCDESC_VALUE	WF8
+    46d4:	00 00 00 02 	add\.p gr0,fp,gr0
+    46d8:	00 00 05 b4 	subx\.p gr0,gr52,gr0,icc1
+			46d8: R_FRV_FUNCDESC_VALUE	WF0
+    46dc:	00 00 00 02 	add\.p gr0,fp,gr0
+    46e0:	00 00 05 ac 	subx\.p gr0,gr44,gr0,icc1
+			46e0: R_FRV_FUNCDESC_VALUE	WF7
+    46e4:	00 00 00 02 	add\.p gr0,fp,gr0
 
-000106e8 <_GLOBAL_OFFSET_TABLE_>:
+000046e8 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-			106f4: R_FRV_32	WF1
-			106f8: R_FRV_FUNCDESC	WF4
-			106fc: R_FRV_32	WD2
-			10700: R_FRV_FUNCDESC	WF5
-			10704: R_FRV_FUNCDESC	WF6
-			10708: R_FRV_32	WF3
-			1070c: R_FRV_32	WF2
+			46f4: R_FRV_32	WF1
+			46f8: R_FRV_FUNCDESC	WF4
+			46fc: R_FRV_32	WD2
+			4700: R_FRV_FUNCDESC	WF5
+			4704: R_FRV_FUNCDESC	WF6
+			4708: R_FRV_32	WF3
+			470c: R_FRV_32	WF2
diff --git a/ld/testsuite/ld-frv/fdpic-pie-7.d b/ld/testsuite/ld-frv/fdpic-pie-7.d
index a3f0478..67a6abf 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-7.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-7.d
@@ -32,27 +32,27 @@ Disassembly of section \.text:
  418:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010430 <D7>:
-   10430:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10430: R_FRV_32	\.data
-
-00010434 <\.D0>:
-   10434:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10434: R_FRV_32	\.got
-   10438:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10438: R_FRV_32	\.text
+00004430 <D7>:
+    4430:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4430: R_FRV_32	\.data
+
+00004434 <\.D0>:
+    4434:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4434: R_FRV_32	\.got
+    4438:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4438: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000104b8 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   104b8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104b8: R_FRV_FUNCDESC_VALUE	\.text
-   104bc:	00 00 00 02 	add\.p gr0,fp,gr0
+000044b8 <_GLOBAL_OFFSET_TABLE_-0x8>:
+    44b8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44b8: R_FRV_FUNCDESC_VALUE	\.text
+    44bc:	00 00 00 02 	add\.p gr0,fp,gr0
 
-000104c0 <_GLOBAL_OFFSET_TABLE_>:
+000044c0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   104cc:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104cc: R_FRV_32	\.text
-   104d0:	00 00 00 00 	add\.p gr0,gr0,gr0
-			104d0: R_FRV_32	\.got
-   104d4:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104d4: R_FRV_32	\.data
+    44cc:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44cc: R_FRV_32	\.text
+    44d0:	00 00 00 00 	add\.p gr0,gr0,gr0
+			44d0: R_FRV_32	\.got
+    44d4:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44d4: R_FRV_32	\.data
diff --git a/ld/testsuite/ld-frv/fdpic-pie-8.d b/ld/testsuite/ld-frv/fdpic-pie-8.d
index a93fa87..20b0ea0 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-8.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-8.d
@@ -32,41 +32,41 @@ Disassembly of section \.text:
  618:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010630 <D8>:
-   10630:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10630: R_FRV_32	\.data
+00004630 <D8>:
+    4630:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4630: R_FRV_32	\.data
 
-00010634 <GD0>:
-   10634:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10634: R_FRV_FUNCDESC	\.text
-   10638:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10638: R_FRV_32	\.text
+00004634 <GD0>:
+    4634:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4634: R_FRV_FUNCDESC	\.text
+    4638:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4638: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000106b8 <_GLOBAL_OFFSET_TABLE_-0x18>:
-   106b8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106b8: R_FRV_FUNCDESC_VALUE	\.text
-   106bc:	00 00 00 02 	add\.p gr0,fp,gr0
-   106c0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106c0: R_FRV_FUNCDESC_VALUE	\.text
-   106c4:	00 00 00 02 	add\.p gr0,fp,gr0
-   106c8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106c8: R_FRV_FUNCDESC_VALUE	\.text
-   106cc:	00 00 00 02 	add\.p gr0,fp,gr0
+000046b8 <_GLOBAL_OFFSET_TABLE_-0x18>:
+    46b8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46b8: R_FRV_FUNCDESC_VALUE	\.text
+    46bc:	00 00 00 02 	add\.p gr0,fp,gr0
+    46c0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46c0: R_FRV_FUNCDESC_VALUE	\.text
+    46c4:	00 00 00 02 	add\.p gr0,fp,gr0
+    46c8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46c8: R_FRV_FUNCDESC_VALUE	\.text
+    46cc:	00 00 00 02 	add\.p gr0,fp,gr0
 
-000106d0 <_GLOBAL_OFFSET_TABLE_>:
+000046d0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   106dc:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106dc: R_FRV_FUNCDESC	\.text
-   106e0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106e0: R_FRV_32	\.text
-   106e4:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106e4: R_FRV_32	\.text
-   106e8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e8: R_FRV_FUNCDESC	\.text
-   106ec:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106ec: R_FRV_FUNCDESC	\.text
-   106f0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106f0: R_FRV_32	\.data
-   106f4:	00 00 00 08 	add\.p gr0,gr8,gr0
-			106f4: R_FRV_32	\.text
+    46dc:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46dc: R_FRV_FUNCDESC	\.text
+    46e0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46e0: R_FRV_32	\.text
+    46e4:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46e4: R_FRV_32	\.text
+    46e8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e8: R_FRV_FUNCDESC	\.text
+    46ec:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46ec: R_FRV_FUNCDESC	\.text
+    46f0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46f0: R_FRV_32	\.data
+    46f4:	00 00 00 08 	add\.p gr0,gr8,gr0
+			46f4: R_FRV_32	\.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-1.d b/ld/testsuite/ld-frv/fdpic-shared-1.d
index aeb3bc4..f0c5ce8 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-1.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-1.d
@@ -32,27 +32,27 @@ Disassembly of section \.text:
  424:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-0001042c <D1>:
-   1042c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1042c: R_FRV_32	\.data
-
-00010430 <\.D0>:
-   10430:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10430: R_FRV_32	\.got
-   10434:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10434: R_FRV_32	\.text
+0000442c <D1>:
+    442c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			442c: R_FRV_32	\.data
+
+00004430 <\.D0>:
+    4430:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4430: R_FRV_32	\.got
+    4434:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4434: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000104b0 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   104b0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104b0: R_FRV_FUNCDESC_VALUE	\.text
-   104b4:	00 00 00 00 	add\.p gr0,gr0,gr0
+000044b0 <_GLOBAL_OFFSET_TABLE_-0x8>:
+    44b0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44b0: R_FRV_FUNCDESC_VALUE	\.text
+    44b4:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-000104b8 <_GLOBAL_OFFSET_TABLE_>:
+000044b8 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   104c4:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104c4: R_FRV_32	\.text
-   104c8:	00 00 00 00 	add\.p gr0,gr0,gr0
-			104c8: R_FRV_32	\.got
-   104cc:	00 00 00 04 	add\.p gr0,gr4,gr0
-			104cc: R_FRV_32	\.data
+    44c4:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44c4: R_FRV_32	\.text
+    44c8:	00 00 00 00 	add\.p gr0,gr0,gr0
+			44c8: R_FRV_32	\.got
+    44cc:	00 00 00 04 	add\.p gr0,gr4,gr0
+			44cc: R_FRV_32	\.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-2.d b/ld/testsuite/ld-frv/fdpic-shared-2.d
index b506788..04b7f98 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-2.d
@@ -46,36 +46,36 @@ Disassembly of section \.text:
  63c:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010644 <D2>:
-   10644:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10644: R_FRV_32	GD0
+00004644 <D2>:
+    4644:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4644: R_FRV_32	GD0
 
-00010648 <GD0>:
+00004648 <GD0>:
 	\.\.\.
-			10648: R_FRV_FUNCDESC	GFb
-			1064c: R_FRV_32	GFb
+			4648: R_FRV_FUNCDESC	GFb
+			464c: R_FRV_32	GFb
 Disassembly of section \.got:
 
-000106e0 <_GLOBAL_OFFSET_TABLE_-0x20>:
-   106e0:	00 00 05 dc 	subxcc\.p gr0,gr28,gr0,icc1
-			106e0: R_FRV_FUNCDESC_VALUE	GF9
-   106e4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106e8:	00 00 05 d4 	subxcc\.p gr0,gr20,gr0,icc1
-			106e8: R_FRV_FUNCDESC_VALUE	GF8
-   106ec:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106f0:	00 00 05 e4 	subxcc\.p gr0,gr36,gr0,icc1
-			106f0: R_FRV_FUNCDESC_VALUE	GF7
-   106f4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106f8:	00 00 05 cc 	subxcc\.p gr0,gr12,gr0,icc1
-			106f8: R_FRV_FUNCDESC_VALUE	GF0
-   106fc:	00 00 00 00 	add\.p gr0,gr0,gr0
+000046e0 <_GLOBAL_OFFSET_TABLE_-0x20>:
+    46e0:	00 00 05 dc 	subxcc\.p gr0,gr28,gr0,icc1
+			46e0: R_FRV_FUNCDESC_VALUE	GF9
+    46e4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46e8:	00 00 05 d4 	subxcc\.p gr0,gr20,gr0,icc1
+			46e8: R_FRV_FUNCDESC_VALUE	GF8
+    46ec:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46f0:	00 00 05 e4 	subxcc\.p gr0,gr36,gr0,icc1
+			46f0: R_FRV_FUNCDESC_VALUE	GF7
+    46f4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46f8:	00 00 05 cc 	subxcc\.p gr0,gr12,gr0,icc1
+			46f8: R_FRV_FUNCDESC_VALUE	GF0
+    46fc:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-00010700 <_GLOBAL_OFFSET_TABLE_>:
+00004700 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-			1070c: R_FRV_FUNCDESC	GF4
-			10710: R_FRV_32	GF1
-			10714: R_FRV_FUNCDESC	GF6
-			10718: R_FRV_FUNCDESC	GF5
-			1071c: R_FRV_32	GD4
-			10720: R_FRV_32	GF3
-			10724: R_FRV_32	GF2
+			470c: R_FRV_FUNCDESC	GF4
+			4710: R_FRV_32	GF1
+			4714: R_FRV_FUNCDESC	GF6
+			4718: R_FRV_FUNCDESC	GF5
+			471c: R_FRV_32	GD4
+			4720: R_FRV_32	GF3
+			4724: R_FRV_32	GF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-3.d b/ld/testsuite/ld-frv/fdpic-shared-3.d
index 625975b..3c7d03a 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-3.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-3.d
@@ -32,53 +32,53 @@ Disassembly of section \.text:
  474:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-0001047c <D3>:
-   1047c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1047c: R_FRV_32	\.data
+0000447c <D3>:
+    447c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			447c: R_FRV_32	\.data
 
-00010480 <HD0>:
-   10480:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10480: R_FRV_32	\.got
-   10484:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10484: R_FRV_32	\.text
+00004480 <HD0>:
+    4480:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4480: R_FRV_32	\.got
+    4484:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4484: R_FRV_32	\.text
 Disassembly of section \.got:
 
-00010500 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   10500:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10500: R_FRV_FUNCDESC_VALUE	\.text
-   10504:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10508:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10508: R_FRV_FUNCDESC_VALUE	\.text
-   1050c:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10510:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10510: R_FRV_FUNCDESC_VALUE	\.text
-   10514:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10518:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10518: R_FRV_FUNCDESC_VALUE	\.text
-   1051c:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10520:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10520: R_FRV_FUNCDESC_VALUE	\.text
-   10524:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10528:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10528: R_FRV_FUNCDESC_VALUE	\.text
-   1052c:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10530:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10530: R_FRV_FUNCDESC_VALUE	\.text
-   10534:	00 00 00 00 	add\.p gr0,gr0,gr0
+00004500 <_GLOBAL_OFFSET_TABLE_-0x38>:
+    4500:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4500: R_FRV_FUNCDESC_VALUE	\.text
+    4504:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4508:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4508: R_FRV_FUNCDESC_VALUE	\.text
+    450c:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4510:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4510: R_FRV_FUNCDESC_VALUE	\.text
+    4514:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4518:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4518: R_FRV_FUNCDESC_VALUE	\.text
+    451c:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4520:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4520: R_FRV_FUNCDESC_VALUE	\.text
+    4524:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4528:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4528: R_FRV_FUNCDESC_VALUE	\.text
+    452c:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4530:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4530: R_FRV_FUNCDESC_VALUE	\.text
+    4534:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-00010538 <_GLOBAL_OFFSET_TABLE_>:
+00004538 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   10544:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10544: R_FRV_32	\.text
-   10548:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10548: R_FRV_32	\.got
-   1054c:	00 00 00 28 	add\.p gr0,gr40,gr0
-			1054c: R_FRV_32	\.got
-   10550:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10550: R_FRV_32	\.text
-   10554:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10554: R_FRV_32	\.text
-   10558:	00 00 00 18 	add\.p gr0,gr24,gr0
-			10558: R_FRV_32	\.got
-   1055c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1055c: R_FRV_32	\.data
+    4544:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4544: R_FRV_32	\.text
+    4548:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4548: R_FRV_32	\.got
+    454c:	00 00 00 28 	add\.p gr0,gr40,gr0
+			454c: R_FRV_32	\.got
+    4550:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4550: R_FRV_32	\.text
+    4554:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4554: R_FRV_32	\.text
+    4558:	00 00 00 18 	add\.p gr0,gr24,gr0
+			4558: R_FRV_32	\.got
+    455c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			455c: R_FRV_32	\.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-4.d b/ld/testsuite/ld-frv/fdpic-shared-4.d
index 7402f00..8c1098f 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-4.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-4.d
@@ -32,41 +32,41 @@ Disassembly of section \.text:
  64c:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010654 <D4>:
-   10654:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10654: R_FRV_32	\.data
+00004654 <D4>:
+    4654:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4654: R_FRV_32	\.data
 
-00010658 <PD0>:
-   10658:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10658: R_FRV_FUNCDESC	\.text
-   1065c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1065c: R_FRV_32	\.text
+00004658 <PD0>:
+    4658:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4658: R_FRV_FUNCDESC	\.text
+    465c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			465c: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000106d8 <_GLOBAL_OFFSET_TABLE_-0x18>:
-   106d8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106d8: R_FRV_FUNCDESC_VALUE	\.text
-   106dc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106e0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e0: R_FRV_FUNCDESC_VALUE	\.text
-   106e4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106e8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106e8: R_FRV_FUNCDESC_VALUE	\.text
-   106ec:	00 00 00 00 	add\.p gr0,gr0,gr0
+000046d8 <_GLOBAL_OFFSET_TABLE_-0x18>:
+    46d8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46d8: R_FRV_FUNCDESC_VALUE	\.text
+    46dc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46e0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e0: R_FRV_FUNCDESC_VALUE	\.text
+    46e4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46e8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46e8: R_FRV_FUNCDESC_VALUE	\.text
+    46ec:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-000106f0 <_GLOBAL_OFFSET_TABLE_>:
+000046f0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   106fc:	00 00 00 04 	add\.p gr0,gr4,gr0
-			106fc: R_FRV_FUNCDESC	\.text
-   10700:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10700: R_FRV_32	\.text
-   10704:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10704: R_FRV_32	\.data
-   10708:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10708: R_FRV_FUNCDESC	\.text
-   1070c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1070c: R_FRV_32	\.text
-   10710:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10710: R_FRV_32	\.text
-   10714:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10714: R_FRV_FUNCDESC	\.text
+    46fc:	00 00 00 04 	add\.p gr0,gr4,gr0
+			46fc: R_FRV_FUNCDESC	\.text
+    4700:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4700: R_FRV_32	\.text
+    4704:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4704: R_FRV_32	\.data
+    4708:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4708: R_FRV_FUNCDESC	\.text
+    470c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			470c: R_FRV_32	\.text
+    4710:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4710: R_FRV_32	\.text
+    4714:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4714: R_FRV_FUNCDESC	\.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-5.d b/ld/testsuite/ld-frv/fdpic-shared-5.d
index d0767f6..9fcc933 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-5.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-5.d
@@ -40,44 +40,44 @@ Disassembly of section \.text:
  5fc:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010604 <D5>:
-   10604:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10604: R_FRV_32	UD0
-   10608:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10608: R_FRV_FUNCDESC	UFb
-   1060c:	00 00 00 00 	add\.p gr0,gr0,gr0
-			1060c: R_FRV_32	UFb
+00004604 <D5>:
+    4604:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4604: R_FRV_32	UD0
+    4608:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4608: R_FRV_FUNCDESC	UFb
+    460c:	00 00 00 00 	add\.p gr0,gr0,gr0
+			460c: R_FRV_32	UFb
 Disassembly of section \.got:
 
-000106a0 <_GLOBAL_OFFSET_TABLE_-0x20>:
-   106a0:	00 00 05 b4 	subx\.p gr0,gr52,gr0,icc1
-			106a0: R_FRV_FUNCDESC_VALUE	UF9
-   106a4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106a8:	00 00 05 9c 	subx\.p gr0,gr28,gr0,icc1
-			106a8: R_FRV_FUNCDESC_VALUE	UF8
-   106ac:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106b0:	00 00 05 ac 	subx\.p gr0,gr44,gr0,icc1
-			106b0: R_FRV_FUNCDESC_VALUE	UF0
-   106b4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106b8:	00 00 05 a4 	subx\.p gr0,gr36,gr0,icc1
-			106b8: R_FRV_FUNCDESC_VALUE	UF7
-   106bc:	00 00 00 00 	add\.p gr0,gr0,gr0
+000046a0 <_GLOBAL_OFFSET_TABLE_-0x20>:
+    46a0:	00 00 05 b4 	subx\.p gr0,gr52,gr0,icc1
+			46a0: R_FRV_FUNCDESC_VALUE	UF9
+    46a4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46a8:	00 00 05 9c 	subx\.p gr0,gr28,gr0,icc1
+			46a8: R_FRV_FUNCDESC_VALUE	UF8
+    46ac:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46b0:	00 00 05 ac 	subx\.p gr0,gr44,gr0,icc1
+			46b0: R_FRV_FUNCDESC_VALUE	UF0
+    46b4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46b8:	00 00 05 a4 	subx\.p gr0,gr36,gr0,icc1
+			46b8: R_FRV_FUNCDESC_VALUE	UF7
+    46bc:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-000106c0 <_GLOBAL_OFFSET_TABLE_>:
-   106c0:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106c4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106c8:	00 00 00 00 	add\.p gr0,gr0,gr0
-   106cc:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106cc: R_FRV_32	UF1
-   106d0:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106d0: R_FRV_FUNCDESC	UF4
-   106d4:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106d4: R_FRV_32	UD1
-   106d8:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106d8: R_FRV_FUNCDESC	UF6
-   106dc:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106dc: R_FRV_FUNCDESC	UF5
-   106e0:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106e0: R_FRV_32	UF3
-   106e4:	00 00 00 00 	add\.p gr0,gr0,gr0
-			106e4: R_FRV_32	UF2
+000046c0 <_GLOBAL_OFFSET_TABLE_>:
+    46c0:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46c4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46c8:	00 00 00 00 	add\.p gr0,gr0,gr0
+    46cc:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46cc: R_FRV_32	UF1
+    46d0:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46d0: R_FRV_FUNCDESC	UF4
+    46d4:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46d4: R_FRV_32	UD1
+    46d8:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46d8: R_FRV_FUNCDESC	UF6
+    46dc:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46dc: R_FRV_FUNCDESC	UF5
+    46e0:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46e0: R_FRV_32	UF3
+    46e4:	00 00 00 00 	add\.p gr0,gr0,gr0
+			46e4: R_FRV_32	UF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-6.d b/ld/testsuite/ld-frv/fdpic-shared-6.d
index 340acd8..8b5168c 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-6.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-6.d
@@ -42,33 +42,33 @@ Disassembly of section \.text:
  488:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010490 <D6>:
+00004490 <D6>:
 	\.\.\.
-			10490: R_FRV_32	WD0
-			10494: R_FRV_FUNCDESC	WFb
-			10498: R_FRV_32	WFb
+			4490: R_FRV_32	WD0
+			4494: R_FRV_FUNCDESC	WFb
+			4498: R_FRV_32	WFb
 Disassembly of section \.got:
 
-00010530 <_GLOBAL_OFFSET_TABLE_-0x20>:
-   10530:	00 00 04 38 	\*unknown\*
-			10530: R_FRV_FUNCDESC_VALUE	WF9
-   10534:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10538:	00 00 04 30 	\*unknown\*
-			10538: R_FRV_FUNCDESC_VALUE	WF8
-   1053c:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10540:	00 00 04 28 	\*unknown\*
-			10540: R_FRV_FUNCDESC_VALUE	WF0
-   10544:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10548:	00 00 04 20 	\*unknown\*
-			10548: R_FRV_FUNCDESC_VALUE	WF7
-   1054c:	00 00 00 00 	add\.p gr0,gr0,gr0
+00004530 <_GLOBAL_OFFSET_TABLE_-0x20>:
+    4530:	00 00 04 38 	\*unknown\*
+			4530: R_FRV_FUNCDESC_VALUE	WF9
+    4534:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4538:	00 00 04 30 	\*unknown\*
+			4538: R_FRV_FUNCDESC_VALUE	WF8
+    453c:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4540:	00 00 04 28 	\*unknown\*
+			4540: R_FRV_FUNCDESC_VALUE	WF0
+    4544:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4548:	00 00 04 20 	\*unknown\*
+			4548: R_FRV_FUNCDESC_VALUE	WF7
+    454c:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-00010550 <_GLOBAL_OFFSET_TABLE_>:
+00004550 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-			1055c: R_FRV_32	WF1
-			10560: R_FRV_FUNCDESC	WF4
-			10564: R_FRV_32	WD2
-			10568: R_FRV_FUNCDESC	WF5
-			1056c: R_FRV_FUNCDESC	WF6
-			10570: R_FRV_32	WF3
-			10574: R_FRV_32	WF2
+			455c: R_FRV_32	WF1
+			4560: R_FRV_FUNCDESC	WF4
+			4564: R_FRV_32	WD2
+			4568: R_FRV_FUNCDESC	WF5
+			456c: R_FRV_FUNCDESC	WF6
+			4570: R_FRV_32	WF3
+			4574: R_FRV_32	WF2
diff --git a/ld/testsuite/ld-frv/fdpic-shared-7.d b/ld/testsuite/ld-frv/fdpic-shared-7.d
index 2b95623..80c26d3 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-7.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-7.d
@@ -32,27 +32,27 @@ Disassembly of section \.text:
  424:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-0001042c <D7>:
-   1042c:	00 00 00 08 	add\.p gr0,gr8,gr0
-			1042c: R_FRV_32	\.data
-
-00010430 <\.D0>:
-   10430:	00 00 00 00 	add\.p gr0,gr0,gr0
-			10430: R_FRV_32	\.got
-   10434:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10434: R_FRV_32	\.text
+0000442c <D7>:
+    442c:	00 00 00 08 	add\.p gr0,gr8,gr0
+			442c: R_FRV_32	\.data
+
+00004430 <\.D0>:
+    4430:	00 00 00 00 	add\.p gr0,gr0,gr0
+			4430: R_FRV_32	\.got
+    4434:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4434: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000104b0 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   104b0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104b0: R_FRV_FUNCDESC_VALUE	\.text
-   104b4:	00 00 00 00 	add\.p gr0,gr0,gr0
+000044b0 <_GLOBAL_OFFSET_TABLE_-0x8>:
+    44b0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44b0: R_FRV_FUNCDESC_VALUE	\.text
+    44b4:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-000104b8 <_GLOBAL_OFFSET_TABLE_>:
+000044b8 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   104c4:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104c4: R_FRV_32	\.text
-   104c8:	00 00 00 00 	add\.p gr0,gr0,gr0
-			104c8: R_FRV_32	\.got
-   104cc:	00 00 00 08 	add\.p gr0,gr8,gr0
-			104cc: R_FRV_32	\.data
+    44c4:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44c4: R_FRV_32	\.text
+    44c8:	00 00 00 00 	add\.p gr0,gr0,gr0
+			44c8: R_FRV_32	\.got
+    44cc:	00 00 00 08 	add\.p gr0,gr8,gr0
+			44cc: R_FRV_32	\.data
diff --git a/ld/testsuite/ld-frv/fdpic-shared-8.d b/ld/testsuite/ld-frv/fdpic-shared-8.d
index fdeea73..26a5925 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-8.d
@@ -32,53 +32,53 @@ Disassembly of section \.text:
  51c:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010524 <D8>:
-   10524:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10524: R_FRV_32	GD0
+00004524 <D8>:
+    4524:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4524: R_FRV_32	GD0
 
-00010528 <GD0>:
-   10528:	00 00 00 10 	add\.p gr0,gr16,gr0
-			10528: R_FRV_32	\.got
-   1052c:	00 00 00 08 	add\.p gr0,gr8,gr0
-			1052c: R_FRV_32	\.text
+00004528 <GD0>:
+    4528:	00 00 00 10 	add\.p gr0,gr16,gr0
+			4528: R_FRV_32	\.got
+    452c:	00 00 00 08 	add\.p gr0,gr8,gr0
+			452c: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000105a8 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   105a8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105a8: R_FRV_FUNCDESC_VALUE	\.text
-   105ac:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105b0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105b0: R_FRV_FUNCDESC_VALUE	\.text
-   105b4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105b8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105b8: R_FRV_FUNCDESC_VALUE	\.text
-   105bc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105c0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105c0: R_FRV_FUNCDESC_VALUE	\.text
-   105c4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105c8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105c8: R_FRV_FUNCDESC_VALUE	\.text
-   105cc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105d0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105d0: R_FRV_FUNCDESC_VALUE	\.text
-   105d4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   105d8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105d8: R_FRV_FUNCDESC_VALUE	\.text
-   105dc:	00 00 00 00 	add\.p gr0,gr0,gr0
+000045a8 <_GLOBAL_OFFSET_TABLE_-0x38>:
+    45a8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45a8: R_FRV_FUNCDESC_VALUE	\.text
+    45ac:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45b0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45b0: R_FRV_FUNCDESC_VALUE	\.text
+    45b4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45b8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45b8: R_FRV_FUNCDESC_VALUE	\.text
+    45bc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45c0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45c0: R_FRV_FUNCDESC_VALUE	\.text
+    45c4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45c8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45c8: R_FRV_FUNCDESC_VALUE	\.text
+    45cc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45d0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45d0: R_FRV_FUNCDESC_VALUE	\.text
+    45d4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    45d8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45d8: R_FRV_FUNCDESC_VALUE	\.text
+    45dc:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-000105e0 <_GLOBAL_OFFSET_TABLE_>:
+000045e0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   105ec:	00 00 00 08 	add\.p gr0,gr8,gr0
-			105ec: R_FRV_32	\.got
-   105f0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			105f0: R_FRV_32	GF1
-   105f4:	00 00 00 04 	add\.p gr0,gr4,gr0
-			105f4: R_FRV_32	GF2
-   105f8:	00 00 00 20 	add\.p gr0,gr32,gr0
-			105f8: R_FRV_32	\.got
-   105fc:	00 00 00 18 	add\.p gr0,gr24,gr0
-			105fc: R_FRV_32	\.got
-   10600:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10600: R_FRV_32	GD4
-   10604:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10604: R_FRV_32	GF3
+    45ec:	00 00 00 08 	add\.p gr0,gr8,gr0
+			45ec: R_FRV_32	\.got
+    45f0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			45f0: R_FRV_32	GF1
+    45f4:	00 00 00 04 	add\.p gr0,gr4,gr0
+			45f4: R_FRV_32	GF2
+    45f8:	00 00 00 20 	add\.p gr0,gr32,gr0
+			45f8: R_FRV_32	\.got
+    45fc:	00 00 00 18 	add\.p gr0,gr24,gr0
+			45fc: R_FRV_32	\.got
+    4600:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4600: R_FRV_32	GD4
+    4604:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4604: R_FRV_32	GF3
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-2.d b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
index 6f7b205..a857a2f 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
@@ -32,53 +32,53 @@ Disassembly of section \.text:
  348:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010350 <D2>:
-   10350:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10350: R_FRV_32	\.data
+00004350 <D2>:
+    4350:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4350: R_FRV_32	\.data
 
-00010354 <GD0>:
-   10354:	00 00 00 18 	add\.p gr0,gr24,gr0
-			10354: R_FRV_32	\.got
-   10358:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10358: R_FRV_32	\.text
+00004354 <GD0>:
+    4354:	00 00 00 18 	add\.p gr0,gr24,gr0
+			4354: R_FRV_32	\.got
+    4358:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4358: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000103d8 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   103d8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			103d8: R_FRV_FUNCDESC_VALUE	\.text
-   103dc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103e0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			103e0: R_FRV_FUNCDESC_VALUE	\.text
-   103e4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103e8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			103e8: R_FRV_FUNCDESC_VALUE	\.text
-   103ec:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103f0:	00 00 00 04 	add\.p gr0,gr4,gr0
-			103f0: R_FRV_FUNCDESC_VALUE	\.text
-   103f4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103f8:	00 00 00 04 	add\.p gr0,gr4,gr0
-			103f8: R_FRV_FUNCDESC_VALUE	\.text
-   103fc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10400:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10400: R_FRV_FUNCDESC_VALUE	\.text
-   10404:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10408:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10408: R_FRV_FUNCDESC_VALUE	\.text
-   1040c:	00 00 00 00 	add\.p gr0,gr0,gr0
+000043d8 <_GLOBAL_OFFSET_TABLE_-0x38>:
+    43d8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			43d8: R_FRV_FUNCDESC_VALUE	\.text
+    43dc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43e0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			43e0: R_FRV_FUNCDESC_VALUE	\.text
+    43e4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43e8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			43e8: R_FRV_FUNCDESC_VALUE	\.text
+    43ec:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43f0:	00 00 00 04 	add\.p gr0,gr4,gr0
+			43f0: R_FRV_FUNCDESC_VALUE	\.text
+    43f4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43f8:	00 00 00 04 	add\.p gr0,gr4,gr0
+			43f8: R_FRV_FUNCDESC_VALUE	\.text
+    43fc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4400:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4400: R_FRV_FUNCDESC_VALUE	\.text
+    4404:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4408:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4408: R_FRV_FUNCDESC_VALUE	\.text
+    440c:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-00010410 <_GLOBAL_OFFSET_TABLE_>:
+00004410 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   1041c:	00 00 00 10 	add\.p gr0,gr16,gr0
-			1041c: R_FRV_32	\.got
-   10420:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10420: R_FRV_32	\.text
-   10424:	00 00 00 28 	add\.p gr0,gr40,gr0
-			10424: R_FRV_32	\.got
-   10428:	00 00 00 20 	add\.p gr0,gr32,gr0
-			10428: R_FRV_32	\.got
-   1042c:	00 00 00 04 	add\.p gr0,gr4,gr0
-			1042c: R_FRV_32	\.data
-   10430:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10430: R_FRV_32	\.text
-   10434:	00 00 00 04 	add\.p gr0,gr4,gr0
-			10434: R_FRV_32	\.text
+    441c:	00 00 00 10 	add\.p gr0,gr16,gr0
+			441c: R_FRV_32	\.got
+    4420:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4420: R_FRV_32	\.text
+    4424:	00 00 00 28 	add\.p gr0,gr40,gr0
+			4424: R_FRV_32	\.got
+    4428:	00 00 00 20 	add\.p gr0,gr32,gr0
+			4428: R_FRV_32	\.got
+    442c:	00 00 00 04 	add\.p gr0,gr4,gr0
+			442c: R_FRV_32	\.data
+    4430:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4430: R_FRV_32	\.text
+    4434:	00 00 00 04 	add\.p gr0,gr4,gr0
+			4434: R_FRV_32	\.text
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-8.d b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
index 7b12051..8b179e3 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
@@ -32,53 +32,53 @@ Disassembly of section \.text:
  348:	80 f8 00 00 	sethi hi\(0x0\),gr0
 Disassembly of section \.data:
 
-00010350 <D8>:
-   10350:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10350: R_FRV_32	\.data
+00004350 <D8>:
+    4350:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4350: R_FRV_32	\.data
 
-00010354 <GD0>:
-   10354:	00 00 00 10 	add\.p gr0,gr16,gr0
-			10354: R_FRV_32	\.got
-   10358:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10358: R_FRV_32	\.text
+00004354 <GD0>:
+    4354:	00 00 00 10 	add\.p gr0,gr16,gr0
+			4354: R_FRV_32	\.got
+    4358:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4358: R_FRV_32	\.text
 Disassembly of section \.got:
 
-000103d8 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   103d8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			103d8: R_FRV_FUNCDESC_VALUE	\.text
-   103dc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103e0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			103e0: R_FRV_FUNCDESC_VALUE	\.text
-   103e4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103e8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			103e8: R_FRV_FUNCDESC_VALUE	\.text
-   103ec:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103f0:	00 00 00 08 	add\.p gr0,gr8,gr0
-			103f0: R_FRV_FUNCDESC_VALUE	\.text
-   103f4:	00 00 00 00 	add\.p gr0,gr0,gr0
-   103f8:	00 00 00 08 	add\.p gr0,gr8,gr0
-			103f8: R_FRV_FUNCDESC_VALUE	\.text
-   103fc:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10400:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10400: R_FRV_FUNCDESC_VALUE	\.text
-   10404:	00 00 00 00 	add\.p gr0,gr0,gr0
-   10408:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10408: R_FRV_FUNCDESC_VALUE	\.text
-   1040c:	00 00 00 00 	add\.p gr0,gr0,gr0
+000043d8 <_GLOBAL_OFFSET_TABLE_-0x38>:
+    43d8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			43d8: R_FRV_FUNCDESC_VALUE	\.text
+    43dc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43e0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			43e0: R_FRV_FUNCDESC_VALUE	\.text
+    43e4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43e8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			43e8: R_FRV_FUNCDESC_VALUE	\.text
+    43ec:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43f0:	00 00 00 08 	add\.p gr0,gr8,gr0
+			43f0: R_FRV_FUNCDESC_VALUE	\.text
+    43f4:	00 00 00 00 	add\.p gr0,gr0,gr0
+    43f8:	00 00 00 08 	add\.p gr0,gr8,gr0
+			43f8: R_FRV_FUNCDESC_VALUE	\.text
+    43fc:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4400:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4400: R_FRV_FUNCDESC_VALUE	\.text
+    4404:	00 00 00 00 	add\.p gr0,gr0,gr0
+    4408:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4408: R_FRV_FUNCDESC_VALUE	\.text
+    440c:	00 00 00 00 	add\.p gr0,gr0,gr0
 
-00010410 <_GLOBAL_OFFSET_TABLE_>:
+00004410 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   1041c:	00 00 00 08 	add\.p gr0,gr8,gr0
-			1041c: R_FRV_32	\.got
-   10420:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10420: R_FRV_32	\.text
-   10424:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10424: R_FRV_32	\.text
-   10428:	00 00 00 20 	add\.p gr0,gr32,gr0
-			10428: R_FRV_32	\.got
-   1042c:	00 00 00 18 	add\.p gr0,gr24,gr0
-			1042c: R_FRV_32	\.got
-   10430:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10430: R_FRV_32	\.data
-   10434:	00 00 00 08 	add\.p gr0,gr8,gr0
-			10434: R_FRV_32	\.text
+    441c:	00 00 00 08 	add\.p gr0,gr8,gr0
+			441c: R_FRV_32	\.got
+    4420:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4420: R_FRV_32	\.text
+    4424:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4424: R_FRV_32	\.text
+    4428:	00 00 00 20 	add\.p gr0,gr32,gr0
+			4428: R_FRV_32	\.got
+    442c:	00 00 00 18 	add\.p gr0,gr24,gr0
+			442c: R_FRV_32	\.got
+    4430:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4430: R_FRV_32	\.data
+    4434:	00 00 00 08 	add\.p gr0,gr8,gr0
+			4434: R_FRV_32	\.text
diff --git a/ld/testsuite/ld-frv/fdpic-static-1.d b/ld/testsuite/ld-frv/fdpic-static-1.d
index 246e24e..dd3a498 100644
--- a/ld/testsuite/ld-frv/fdpic-static-1.d
+++ b/ld/testsuite/ld-frv/fdpic-static-1.d
@@ -33,31 +33,31 @@ Disassembly of section \.text:
 Disassembly of section \.rofixup:
 
 000100e0 <__ROFIXUP_LIST__>:
-   100e0:	00 02 01 24 	sub\.p gr32,gr36,gr0
-   100e4:	00 02 01 28 	sub\.p gr32,gr40,gr0
-   100e8:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   100ec:	00 02 01 14 	sub\.p gr32,gr20,gr0
-   100f0:	00 02 01 2c 	sub\.p gr32,gr44,gr0
-   100f4:	00 02 01 04 	sub\.p gr32,gr4,gr0
-   100f8:	00 02 01 08 	sub\.p gr32,gr8,gr0
-   100fc:	00 02 01 0c 	sub\.p gr32,gr12,gr0
-   10100:	00 02 01 18 	sub\.p gr32,gr24,gr0
+   100e0:	00 01 41 24 	sub\.p gr20,gr36,gr0
+   100e4:	00 01 41 28 	sub\.p gr20,gr40,gr0
+   100e8:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   100ec:	00 01 41 14 	sub\.p gr20,gr20,gr0
+   100f0:	00 01 41 2c 	sub\.p gr20,gr44,gr0
+   100f4:	00 01 41 04 	sub\.p gr20,gr4,gr0
+   100f8:	00 01 41 08 	sub\.p gr20,gr8,gr0
+   100fc:	00 01 41 0c 	sub\.p gr20,gr12,gr0
+   10100:	00 01 41 18 	sub\.p gr20,gr24,gr0
 Disassembly of section \.data:
 
-00020104 <D1>:
-   20104:	00 02 01 08 	sub\.p gr32,gr8,gr0
+00014104 <D1>:
+   14104:	00 01 41 08 	sub\.p gr20,gr8,gr0
 
-00020108 <\.D0>:
-   20108:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   2010c:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+00014108 <\.D0>:
+   14108:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   1410c:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 Disassembly of section \.got:
 
-00020110 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   20110:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20114:	00 02 01 18 	sub\.p gr32,gr24,gr0
+00014110 <_GLOBAL_OFFSET_TABLE_-0x8>:
+   14110:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14114:	00 01 41 18 	sub\.p gr20,gr24,gr0
 
-00020118 <_GLOBAL_OFFSET_TABLE_>:
+00014118 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   20124:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20128:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   2012c:	00 02 01 08 	sub\.p gr32,gr8,gr0
+   14124:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14128:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   1412c:	00 01 41 08 	sub\.p gr20,gr8,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-static-2.d b/ld/testsuite/ld-frv/fdpic-static-2.d
index 1c6b371..26003b3 100644
--- a/ld/testsuite/ld-frv/fdpic-static-2.d
+++ b/ld/testsuite/ld-frv/fdpic-static-2.d
@@ -33,63 +33,63 @@ Disassembly of section \.text:
 Disassembly of section \.rofixup:
 
 000100e0 <__ROFIXUP_LIST__>:
-   100e0:	00 02 01 98 	subx\.p gr32,gr24,gr0,icc0
-   100e4:	00 02 01 ac 	subx\.p gr32,gr44,gr0,icc0
-   100e8:	00 02 01 a8 	subx\.p gr32,gr40,gr0,icc0
-   100ec:	00 02 01 94 	subx\.p gr32,gr20,gr0,icc0
-   100f0:	00 02 01 60 	subcc\.p gr32,gr32,gr0,icc0
-   100f4:	00 02 01 64 	subcc\.p gr32,gr36,gr0,icc0
-   100f8:	00 02 01 a0 	subx\.p gr32,gr32,gr0,icc0
-   100fc:	00 02 01 70 	subcc\.p gr32,gr48,gr0,icc0
-   10100:	00 02 01 74 	subcc\.p gr32,gr52,gr0,icc0
-   10104:	00 02 01 9c 	subx\.p gr32,gr28,gr0,icc0
-   10108:	00 02 01 78 	subcc\.p gr32,gr56,gr0,icc0
-   1010c:	00 02 01 7c 	subcc\.p gr32,gr60,gr0,icc0
-   10110:	00 02 01 80 	subx\.p gr32,gr0,gr0,icc0
-   10114:	00 02 01 84 	subx\.p gr32,gr4,gr0,icc0
-   10118:	00 02 01 58 	subcc\.p gr32,gr24,gr0,icc0
-   1011c:	00 02 01 5c 	subcc\.p gr32,gr28,gr0,icc0
-   10120:	00 02 01 50 	subcc\.p gr32,gr16,gr0,icc0
-   10124:	00 02 01 54 	subcc\.p gr32,gr20,gr0,icc0
-   10128:	00 02 01 a4 	subx\.p gr32,gr36,gr0,icc0
-   1012c:	00 02 01 44 	subcc\.p gr32,gr4,gr0,icc0
-   10130:	00 02 01 68 	subcc\.p gr32,gr40,gr0,icc0
-   10134:	00 02 01 6c 	subcc\.p gr32,gr44,gr0,icc0
-   10138:	00 02 01 48 	subcc\.p gr32,gr8,gr0,icc0
-   1013c:	00 02 01 4c 	subcc\.p gr32,gr12,gr0,icc0
-   10140:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
+   100e0:	00 01 41 98 	subx\.p gr20,gr24,gr0,icc0
+   100e4:	00 01 41 ac 	subx\.p gr20,gr44,gr0,icc0
+   100e8:	00 01 41 a8 	subx\.p gr20,gr40,gr0,icc0
+   100ec:	00 01 41 94 	subx\.p gr20,gr20,gr0,icc0
+   100f0:	00 01 41 60 	subcc\.p gr20,gr32,gr0,icc0
+   100f4:	00 01 41 64 	subcc\.p gr20,gr36,gr0,icc0
+   100f8:	00 01 41 a0 	subx\.p gr20,gr32,gr0,icc0
+   100fc:	00 01 41 70 	subcc\.p gr20,gr48,gr0,icc0
+   10100:	00 01 41 74 	subcc\.p gr20,gr52,gr0,icc0
+   10104:	00 01 41 9c 	subx\.p gr20,gr28,gr0,icc0
+   10108:	00 01 41 78 	subcc\.p gr20,gr56,gr0,icc0
+   1010c:	00 01 41 7c 	subcc\.p gr20,gr60,gr0,icc0
+   10110:	00 01 41 80 	subx\.p gr20,gr0,gr0,icc0
+   10114:	00 01 41 84 	subx\.p gr20,gr4,gr0,icc0
+   10118:	00 01 41 58 	subcc\.p gr20,gr24,gr0,icc0
+   1011c:	00 01 41 5c 	subcc\.p gr20,gr28,gr0,icc0
+   10120:	00 01 41 50 	subcc\.p gr20,gr16,gr0,icc0
+   10124:	00 01 41 54 	subcc\.p gr20,gr20,gr0,icc0
+   10128:	00 01 41 a4 	subx\.p gr20,gr36,gr0,icc0
+   1012c:	00 01 41 44 	subcc\.p gr20,gr4,gr0,icc0
+   10130:	00 01 41 68 	subcc\.p gr20,gr40,gr0,icc0
+   10134:	00 01 41 6c 	subcc\.p gr20,gr44,gr0,icc0
+   10138:	00 01 41 48 	subcc\.p gr20,gr8,gr0,icc0
+   1013c:	00 01 41 4c 	subcc\.p gr20,gr12,gr0,icc0
+   10140:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 Disassembly of section \.data:
 
-00020144 <D2>:
-   20144:	00 02 01 48 	subcc\.p gr32,gr8,gr0,icc0
+00014144 <D2>:
+   14144:	00 01 41 48 	subcc\.p gr20,gr8,gr0,icc0
 
-00020148 <GD0>:
-   20148:	00 02 01 68 	subcc\.p gr32,gr40,gr0,icc0
-   2014c:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+00014148 <GD0>:
+   14148:	00 01 41 68 	subcc\.p gr20,gr40,gr0,icc0
+   1414c:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 Disassembly of section \.got:
 
-00020150 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   20150:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20154:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20158:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   2015c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20160:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20164:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20168:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   2016c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20170:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20174:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20178:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   2017c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20180:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   20184:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
+00014150 <_GLOBAL_OFFSET_TABLE_-0x38>:
+   14150:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14154:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14158:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   1415c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14160:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14164:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14168:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   1416c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14170:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14174:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14178:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   1417c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14180:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14184:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 
-00020188 <_GLOBAL_OFFSET_TABLE_>:
+00014188 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   20194:	00 02 01 60 	subcc\.p gr32,gr32,gr0,icc0
-   20198:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   2019c:	00 02 01 78 	subcc\.p gr32,gr56,gr0,icc0
-   201a0:	00 02 01 70 	subcc\.p gr32,gr48,gr0,icc0
-   201a4:	00 02 01 48 	subcc\.p gr32,gr8,gr0,icc0
-   201a8:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
-   201ac:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   14194:	00 01 41 60 	subcc\.p gr20,gr32,gr0,icc0
+   14198:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   1419c:	00 01 41 78 	subcc\.p gr20,gr56,gr0,icc0
+   141a0:	00 01 41 70 	subcc\.p gr20,gr48,gr0,icc0
+   141a4:	00 01 41 48 	subcc\.p gr20,gr8,gr0,icc0
+   141a8:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
+   141ac:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
diff --git a/ld/testsuite/ld-frv/fdpic-static-7.d b/ld/testsuite/ld-frv/fdpic-static-7.d
index b8eba61..0363a67 100644
--- a/ld/testsuite/ld-frv/fdpic-static-7.d
+++ b/ld/testsuite/ld-frv/fdpic-static-7.d
@@ -33,31 +33,31 @@ Disassembly of section \.text:
 Disassembly of section \.rofixup:
 
 000100e0 <__ROFIXUP_LIST__>:
-   100e0:	00 02 01 24 	sub\.p gr32,gr36,gr0
-   100e4:	00 02 01 28 	sub\.p gr32,gr40,gr0
-   100e8:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   100ec:	00 02 01 14 	sub\.p gr32,gr20,gr0
-   100f0:	00 02 01 2c 	sub\.p gr32,gr44,gr0
-   100f4:	00 02 01 04 	sub\.p gr32,gr4,gr0
-   100f8:	00 02 01 08 	sub\.p gr32,gr8,gr0
-   100fc:	00 02 01 0c 	sub\.p gr32,gr12,gr0
-   10100:	00 02 01 18 	sub\.p gr32,gr24,gr0
+   100e0:	00 01 41 24 	sub\.p gr20,gr36,gr0
+   100e4:	00 01 41 28 	sub\.p gr20,gr40,gr0
+   100e8:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   100ec:	00 01 41 14 	sub\.p gr20,gr20,gr0
+   100f0:	00 01 41 2c 	sub\.p gr20,gr44,gr0
+   100f4:	00 01 41 04 	sub\.p gr20,gr4,gr0
+   100f8:	00 01 41 08 	sub\.p gr20,gr8,gr0
+   100fc:	00 01 41 0c 	sub\.p gr20,gr12,gr0
+   10100:	00 01 41 18 	sub\.p gr20,gr24,gr0
 Disassembly of section \.data:
 
-00020104 <D7>:
-   20104:	00 02 01 0c 	sub\.p gr32,gr12,gr0
+00014104 <D7>:
+   14104:	00 01 41 0c 	sub\.p gr20,gr12,gr0
 
-00020108 <\.D0>:
-   20108:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   2010c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+00014108 <\.D0>:
+   14108:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   1410c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 Disassembly of section \.got:
 
-00020110 <_GLOBAL_OFFSET_TABLE_-0x8>:
-   20110:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20114:	00 02 01 18 	sub\.p gr32,gr24,gr0
+00014110 <_GLOBAL_OFFSET_TABLE_-0x8>:
+   14110:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14114:	00 01 41 18 	sub\.p gr20,gr24,gr0
 
-00020118 <_GLOBAL_OFFSET_TABLE_>:
+00014118 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   20124:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20128:	00 02 01 10 	sub\.p gr32,gr16,gr0
-   2012c:	00 02 01 0c 	sub\.p gr32,gr12,gr0
+   14124:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14128:	00 01 41 10 	sub\.p gr20,gr16,gr0
+   1412c:	00 01 41 0c 	sub\.p gr20,gr12,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-static-8.d b/ld/testsuite/ld-frv/fdpic-static-8.d
index cbebb17..804c56e 100644
--- a/ld/testsuite/ld-frv/fdpic-static-8.d
+++ b/ld/testsuite/ld-frv/fdpic-static-8.d
@@ -33,63 +33,63 @@ Disassembly of section \.text:
 Disassembly of section \.rofixup:
 
 000100e0 <__ROFIXUP_LIST__>:
-   100e0:	00 02 01 98 	subx\.p gr32,gr24,gr0,icc0
-   100e4:	00 02 01 9c 	subx\.p gr32,gr28,gr0,icc0
-   100e8:	00 02 01 ac 	subx\.p gr32,gr44,gr0,icc0
-   100ec:	00 02 01 94 	subx\.p gr32,gr20,gr0,icc0
-   100f0:	00 02 01 58 	subcc\.p gr32,gr24,gr0,icc0
-   100f4:	00 02 01 5c 	subcc\.p gr32,gr28,gr0,icc0
-   100f8:	00 02 01 a4 	subx\.p gr32,gr36,gr0,icc0
-   100fc:	00 02 01 68 	subcc\.p gr32,gr40,gr0,icc0
-   10100:	00 02 01 6c 	subcc\.p gr32,gr44,gr0,icc0
-   10104:	00 02 01 a0 	subx\.p gr32,gr32,gr0,icc0
-   10108:	00 02 01 70 	subcc\.p gr32,gr48,gr0,icc0
-   1010c:	00 02 01 74 	subcc\.p gr32,gr52,gr0,icc0
-   10110:	00 02 01 80 	subx\.p gr32,gr0,gr0,icc0
-   10114:	00 02 01 84 	subx\.p gr32,gr4,gr0,icc0
-   10118:	00 02 01 78 	subcc\.p gr32,gr56,gr0,icc0
-   1011c:	00 02 01 7c 	subcc\.p gr32,gr60,gr0,icc0
-   10120:	00 02 01 50 	subcc\.p gr32,gr16,gr0,icc0
-   10124:	00 02 01 54 	subcc\.p gr32,gr20,gr0,icc0
-   10128:	00 02 01 a8 	subx\.p gr32,gr40,gr0,icc0
-   1012c:	00 02 01 44 	subcc\.p gr32,gr4,gr0,icc0
-   10130:	00 02 01 60 	subcc\.p gr32,gr32,gr0,icc0
-   10134:	00 02 01 64 	subcc\.p gr32,gr36,gr0,icc0
-   10138:	00 02 01 48 	subcc\.p gr32,gr8,gr0,icc0
-   1013c:	00 02 01 4c 	subcc\.p gr32,gr12,gr0,icc0
-   10140:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
+   100e0:	00 01 41 98 	subx\.p gr20,gr24,gr0,icc0
+   100e4:	00 01 41 9c 	subx\.p gr20,gr28,gr0,icc0
+   100e8:	00 01 41 ac 	subx\.p gr20,gr44,gr0,icc0
+   100ec:	00 01 41 94 	subx\.p gr20,gr20,gr0,icc0
+   100f0:	00 01 41 58 	subcc\.p gr20,gr24,gr0,icc0
+   100f4:	00 01 41 5c 	subcc\.p gr20,gr28,gr0,icc0
+   100f8:	00 01 41 a4 	subx\.p gr20,gr36,gr0,icc0
+   100fc:	00 01 41 68 	subcc\.p gr20,gr40,gr0,icc0
+   10100:	00 01 41 6c 	subcc\.p gr20,gr44,gr0,icc0
+   10104:	00 01 41 a0 	subx\.p gr20,gr32,gr0,icc0
+   10108:	00 01 41 70 	subcc\.p gr20,gr48,gr0,icc0
+   1010c:	00 01 41 74 	subcc\.p gr20,gr52,gr0,icc0
+   10110:	00 01 41 80 	subx\.p gr20,gr0,gr0,icc0
+   10114:	00 01 41 84 	subx\.p gr20,gr4,gr0,icc0
+   10118:	00 01 41 78 	subcc\.p gr20,gr56,gr0,icc0
+   1011c:	00 01 41 7c 	subcc\.p gr20,gr60,gr0,icc0
+   10120:	00 01 41 50 	subcc\.p gr20,gr16,gr0,icc0
+   10124:	00 01 41 54 	subcc\.p gr20,gr20,gr0,icc0
+   10128:	00 01 41 a8 	subx\.p gr20,gr40,gr0,icc0
+   1012c:	00 01 41 44 	subcc\.p gr20,gr4,gr0,icc0
+   10130:	00 01 41 60 	subcc\.p gr20,gr32,gr0,icc0
+   10134:	00 01 41 64 	subcc\.p gr20,gr36,gr0,icc0
+   10138:	00 01 41 48 	subcc\.p gr20,gr8,gr0,icc0
+   1013c:	00 01 41 4c 	subcc\.p gr20,gr12,gr0,icc0
+   10140:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 Disassembly of section \.data:
 
-00020144 <D8>:
-   20144:	00 02 01 4c 	subcc\.p gr32,gr12,gr0,icc0
+00014144 <D8>:
+   14144:	00 01 41 4c 	subcc\.p gr20,gr12,gr0,icc0
 
-00020148 <GD0>:
-   20148:	00 02 01 60 	subcc\.p gr32,gr32,gr0,icc0
-   2014c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+00014148 <GD0>:
+   14148:	00 01 41 60 	subcc\.p gr20,gr32,gr0,icc0
+   1414c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 Disassembly of section \.got:
 
-00020150 <_GLOBAL_OFFSET_TABLE_-0x38>:
-   20150:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20154:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20158:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   2015c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20160:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20164:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20168:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   2016c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20170:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20174:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20178:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   2017c:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
-   20180:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   20184:	00 02 01 88 	subx\.p gr32,gr8,gr0,icc0
+00014150 <_GLOBAL_OFFSET_TABLE_-0x38>:
+   14150:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14154:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14158:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   1415c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14160:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14164:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14168:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   1416c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14170:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14174:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14178:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   1417c:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
+   14180:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14184:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 
-00020188 <_GLOBAL_OFFSET_TABLE_>:
+00014188 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   20194:	00 02 01 58 	subcc\.p gr32,gr24,gr0,icc0
-   20198:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   2019c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
-   201a0:	00 02 01 70 	subcc\.p gr32,gr48,gr0,icc0
-   201a4:	00 02 01 68 	subcc\.p gr32,gr40,gr0,icc0
-   201a8:	00 02 01 4c 	subcc\.p gr32,gr12,gr0,icc0
-   201ac:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   14194:	00 01 41 58 	subcc\.p gr20,gr24,gr0,icc0
+   14198:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   1419c:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
+   141a0:	00 01 41 70 	subcc\.p gr20,gr48,gr0,icc0
+   141a4:	00 01 41 68 	subcc\.p gr20,gr40,gr0,icc0
+   141a8:	00 01 41 4c 	subcc\.p gr20,gr12,gr0,icc0
+   141ac:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0