From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 25 Aug 2017 00:45:24 +0000 (-0700)
Subject: ld: Add "--" after regexp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=176047c9f2ec8ccb4e0b6bfade4f21cb25d986e9;p=binutils-gdb.git

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 e6d0f41c0f9..5efcbd3092c 100644
--- 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 1668c084cbf..d3910ec79b1 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 84d0e76e83d..ec729007d17 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 e673e4a7a96..894c595c432 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 cddcaf834b2..c2404102703 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.