From 2db70efacd3f8f208a1ab7946c34f79fae33092b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 26 Jun 2018 14:29:28 +0930 Subject: [PATCH] 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. --- 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 be9669cbbc2..2065c6ea71f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2018-06-26 Alan Modra + + * testsuite/ld-bootstrap/bootstrap.exp: Use parentheses rather + than curly braces in logical expression. + 2018-06-26 Nick Clifton * 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. -- 2.30.2