diff options
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/aarch64-elf.exp | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index e829529..50adaee 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-06-24 Alan Modra <amodra@gmail.com> + + * testsuite/ld-aarch64/aarch64-elf.exp (aarch64_choose_ilp32_emul): + Don't error out, always return an emulation. + 2016-06-24 Dilyan Palauzov <dilyan.palauzov@aegee.org> H.J. Lu <hongjiu.lu@intel.com> diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index b27da52..ab84f01 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -46,18 +46,16 @@ set aarch64elftests { } proc aarch64_choose_ilp32_emul {} { - if [istarget aarch64-*-linux*] then { - return "aarch64linux32" - } elseif [istarget aarch64-*-elf] { - return "aarch64elf32" - } elseif [istarget aarch64_be-*-linux*] { - return "aarch64linux32b" - } elseif [istarget aarch64_be-*-elf] { + if [istarget *linux*] then { + if [istarget aarch64_be-*] { + return "aarch64linux32b" + } + return "aarch64linux32" + } + if [istarget aarch64_be-*] { return "aarch64elf32b" - } else { - perror "Unknown target triple." - exit 1 } + return "aarch64elf32" } run_ld_link_tests $aarch64elftests |