Commit: 6bb75436cd430556060e1526777eb0bb1e00c521 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: 6bb75436cd430556060e1526777eb0bb1e00c521 (tree)
• Time: 2018-06-26 21:14:30
• Author: Alan Modra <amodra@gmai...>
• Commiter: Alan Modra

Log Message

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.

Change Summary

• modified: ld/ChangeLog
• modified: ld/testsuite/ld-bootstrap/bootstrap.exp

Incremental Difference

--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Alan Modra  <[e-mail]>
+
+	* testsuite/ld-bootstrap/bootstrap.exp: Use parentheses rather
+	than curly braces in logical expression.
+
 2018-05-21  H.J. Lu  <[e-mail]>
 
 	PR ld/23194

--- 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.