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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e6d0f41c0f94f3becac9095005d668e113bbd659..5efcbd3092c370b725bddca076d14c08435921bd 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2017-08-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <hongjiu.lu@intel.com>
 
        * testsuite/ld-i386/i386.exp (undefined_weak): Replace regexp

diff --git a/ld/testsuite/ld-elf/pr21903c.d b/ld/testsuite/ld-elf/pr21903c.d
index 1668c084cbfa6357d6adb966912bf7282cebe8e3..d3910ec79b11d208489f7436cbe8bb2948f1b075 100644 (file)
--- 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 84d0e76e83d4447e1a461cbbfaefd837cc216190..ec729007d1766831787d4600e959c3bb7396bbb7 100644 (file)
--- 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 e673e4a7a96915b2e4cfea8c4991d892cad7f7d6..894c595c432fbb8e048f5b296ca4da60e2a42ef9 100644 (file)
--- 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 cddcaf834b272328e380bcb0bd9d32aebea068ee..c240410270316bf0af368719b2b9665d6fcb2c43 100644 (file)
--- 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.