[binutils-gdb/binutils-2_30-branch] Fix parens in ld bootstrap.exp

Alan Modra amodra@sourceware.org
Tue Jun 26 13:52:00 GMT 2018


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6bb75436cd430556060e1526777eb0bb1e00c521

commit 6bb75436cd430556060e1526777eb0bb1e00c521
Author: Alan Modra <amodra@gmail.com>
Date:   Tue Jun 26 14:29:28 2018 +0930

    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:
---
 ld/ChangeLog                            | 5 +++++
 ld/testsuite/ld-bootstrap/bootstrap.exp | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f866d97..7749da9 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 32009d1..6d60a1e 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.



More information about the Binutils-cvs mailing list