diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 84b05ddd2b..3f69942769 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ld-frv/fdpic.exp: Restore $LDFLAGS at the end.
+	* ld-frv/fr450-link.d: Match fdpic as well.
+
 2004-05-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* ld-sh/sh64/crange1.rd: Update sh_info to decimal.
diff --git a/ld/testsuite/ld-frv/fdpic.exp b/ld/testsuite/ld-frv/fdpic.exp
index 1367cb0b19..cc43848fda 100644
--- a/ld/testsuite/ld-frv/fdpic.exp
+++ b/ld/testsuite/ld-frv/fdpic.exp
@@ -21,6 +21,7 @@ if {![istarget frv*-*-*] || ![is_elf_format]} {
 }
 
 global LDFLAGS
+set saved_LDFLAGS "$LDFLAGS"
 set LDFLAGS "$LDFLAGS -melf32frvfd"
 
 run_dump_test "fdpic-static-1"
@@ -56,3 +57,5 @@ run_dump_test "fdpic-pie-8"
 run_dump_test "fdpic-shared-8-fail"
 run_dump_test "fdpic-shared-8"
 run_dump_test "fdpic-shared-local-8"
+
+set LDFLAGS "$saved_LDFLAGS"
diff --git a/ld/testsuite/ld-frv/fr450-link.d b/ld/testsuite/ld-frv/fr450-link.d
index 7aab6f0c73..1ab80b0662 100644
--- a/ld/testsuite/ld-frv/fr450-link.d
+++ b/ld/testsuite/ld-frv/fr450-link.d
@@ -6,6 +6,6 @@
 #ld: -r
 #objdump: -p
 
-.*:     file format elf32-frv
-private flags = 0x8000000: -mcpu=fr450
+.*:     file format elf32-frv(|fdpic)
+private flags = 0x800[08]000: -mcpu=fr450(| -mfdpic)