From 176047c9f2ec8ccb4e0b6bfade4f21cb25d986e9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 24 Aug 2017 17:45:24 -0700 Subject: [PATCH] ld: Add "--" after regexp Add "--" after regexp to support dejagnu 1.4.4. * testsuite/ld-elf/pr21903c.d: Remove '\' before --. * testsuite/ld-elf/pr21903d.d: Likewise. * testsuite/ld-elf/pr21903e.d: Likewise. * testsuite/lib/ld-lib.exp (run_dump_test): Add "--" after regexp. --- ld/ChangeLog | 8 ++++++++ ld/testsuite/ld-elf/pr21903c.d | 2 +- ld/testsuite/ld-elf/pr21903d.d | 2 +- ld/testsuite/ld-elf/pr21903e.d | 2 +- ld/testsuite/lib/ld-lib.exp | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index e6d0f41..5efcbd3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,13 @@ 2017-08-24 H.J. Lu + * testsuite/ld-elf/pr21903c.d: Remove '\' before --. + * testsuite/ld-elf/pr21903d.d: Likewise. + * testsuite/ld-elf/pr21903e.d: Likewise. + * testsuite/lib/ld-lib.exp (run_dump_test): Add "--" after + regexp. + +2017-08-24 H.J. Lu + * testsuite/ld-i386/i386.exp (undefined_weak): Replace regexp with string match. * testsuite/ld-x86-64/x86-64.exp (undefined_weak): Likewise. diff --git a/ld/testsuite/ld-elf/pr21903c.d b/ld/testsuite/ld-elf/pr21903c.d index 1668c08..d3910ec 100644 --- a/ld/testsuite/ld-elf/pr21903c.d +++ b/ld/testsuite/ld-elf/pr21903c.d @@ -1,3 +1,3 @@ #source: pr21903.s #ld: --no-define-common -#error: \--no-define-common may not be used without -shared +#error: --no-define-common may not be used without -shared diff --git a/ld/testsuite/ld-elf/pr21903d.d b/ld/testsuite/ld-elf/pr21903d.d index 84d0e76..ec72900 100644 --- a/ld/testsuite/ld-elf/pr21903d.d +++ b/ld/testsuite/ld-elf/pr21903d.d @@ -1,4 +1,4 @@ #source: pr21903.s #ld: --no-define-common -pie #target: *-*-linux* *-*-gnu* -#error: \--no-define-common may not be used without -shared +#error: --no-define-common may not be used without -shared diff --git a/ld/testsuite/ld-elf/pr21903e.d b/ld/testsuite/ld-elf/pr21903e.d index e673e4a..894c595 100644 --- a/ld/testsuite/ld-elf/pr21903e.d +++ b/ld/testsuite/ld-elf/pr21903e.d @@ -1,3 +1,3 @@ #source: pr21903.s #ld: -r --no-define-common -#error: \--no-define-common may not be used without -shared +#error: --no-define-common may not be used without -shared diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index cddcaf8..c240410 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -976,7 +976,7 @@ proc run_dump_test { name {extra_options {}} } { && (($cmdret == 0) == ($check_ld(terminal) == 0)) \ && ((($check_ld(source) == "regex") \ && ($check_ld(regex) == "") == ($comp_output == "") \ - && [regexp $check_ld(regex) $comp_output]) \ + && [regexp -- $check_ld(regex) $comp_output]) \ || (($check_ld(source) == "file") \ && (![regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$check_ld(file)"]))) } { # We have the expected output from ld. -- 2.7.4