From: Alan Modra <amodra@gmail.com>
Date: Tue, 26 Jun 2018 04:59:28 +0000 (+0930)
Subject: Fix parens in ld bootstrap.exp
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bb75436cd430556060e1526777eb0bb1e00c521;p=thirdparty%2Fbinutils-gdb.git

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 f866d97da6d..7749da98753 100644
--- 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 32009d181f7..6d60a1e9147 100644
--- 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.