Fix parens in ld bootstrap.exp

Seen with tcl 8.5.13:
ERROR: tcl error sourcing .../ld/testsuite/ld-bootstrap/bootstrap.exp.
ERROR: expected boolean value but got " [istarget ia64-*-elf*] || [istarget ia64-*-linux*"
    while executing
"if { "$flags" == "--static" && { [istarget ia64-*-elf*] || [istarget ia64-*-linux*] }
	 || [istarget mips*-*-linux*] } {
	# On ia64 and mips, tmpdir/l..."

	* testsuite/ld-bootstrap/bootstrap.exp: Use parentheses rather
	than curly braces in logical expression.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f866d97da6dac30a50f58a3fe627246c37be8393..7749da98753efac1c3e634559436b4cd755eeaed 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-26  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-bootstrap/bootstrap.exp: Use parentheses rather
+       than curly braces in logical expression.
+
 2018-05-21  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/23194

diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp
index 32009d181f7ea64e697d3b7f07fb2e068bb43e5b..6d60a1e91471f40d38af17103729f66f8ca411ee 100644 (file)
--- a/ld/testsuite/ld-bootstrap/bootstrap.exp
+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp
@@ -179,8 +179,10 @@ foreach flags $test_flags {
        continue
     }
 
-    if { "$flags" == "--static" && { [istarget ia64-*-elf*] || [istarget ia64-*-linux*] }
-        || [istarget mips*-*-linux*] } {
+    if { "$flags" == "--static"
+        && ([istarget ia64-*-elf*]
+            || [istarget ia64-*-linux*]
+            || [istarget mips*-*-linux*]) } {
        # On ia64 and mips, tmpdir/ld2 != tmpdir/ld3 is normal since they are
        # generated by different linkers, tmpdir/ld1 and tmpdir/ld2.
        # So we rebuild tmpdir/ld2 with tmpdir/ld3.