From b8bfc9e13d8b2634e6b10602148bdaf08be7d764 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 6 May 2004 02:46:13 +0000 Subject: [PATCH] * ld-frv/fdpic.exp: Restore $LDFLAGS at the end. * ld-frv/fr450-link.d: Match fdpic as well. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-frv/fdpic.exp | 3 +++ ld/testsuite/ld-frv/fr450-link.d | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 84b05ddd2ba..3f69942769e 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-05 Alexandre Oliva + + * ld-frv/fdpic.exp: Restore $LDFLAGS at the end. + * ld-frv/fr450-link.d: Match fdpic as well. + 2004-05-05 Kaz Kojima * 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 1367cb0b19a..cc43848fdad 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 7aab6f0c736..1ab80b0662b 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) -- 2.30.2