This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_31-branch] Fix parens in ld bootstrap.exp
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 26 Jun 2018 13:50:53 -0000
- Subject: [binutils-gdb/binutils-2_31-branch] Fix parens in ld bootstrap.exp
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=080dd03de2489bf7088bc36fab75ccb8983ff5e5
commit 080dd03de2489bf7088bc36fab75ccb8983ff5e5
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 3dd7b2f..8d9432a 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-06-26 Nick Clifton <nickc@redhat.com>
* po/uk.po: Updated Ukranian translation.
diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp
index f0bac3f..5c79e03 100644
--- a/ld/testsuite/ld-bootstrap/bootstrap.exp
+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp
@@ -187,8 +187,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.