diff options
| author | Alan Modra <amodra@gmail.com> | 2018-06-26 14:29:28 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2018-06-26 21:28:05 +0930 |
| commit | 2db70efacd3f8f208a1ab7946c34f79fae33092b (patch) | |
| tree | 039a8e3fabff80603ebc6f54c4294570318c05a6 /ld | |
| parent | 2393a7e3e6b3ec51bc404c6adebffea5db9f04b1 (diff) | |
| download | binutils-gdb-2db70efacd3f8f208a1ab7946c34f79fae33092b.tar.gz | |
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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-bootstrap/bootstrap.exp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index be9669cbbc2..2065c6ea71f 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> * emultempl/aarch64elf.em: Fix spelling mistake. diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp index f0bac3f7e9f..5c79e0315ca 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. |