From 78da3bc1eeb8ed227f86154ef915635fe9047a64 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 24 Jun 2016 11:20:53 +0930 Subject: [PATCH] aarch64 ld testsuite Fixes failure on aarch64-rtems. * testsuite/ld-aarch64/aarch64-elf.exp (aarch64_choose_ilp32_emul): Don't error out, always return an emulation. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-aarch64/aarch64-elf.exp | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index e829529cb7b..50adaee6199 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-06-24 Alan Modra + + * testsuite/ld-aarch64/aarch64-elf.exp (aarch64_choose_ilp32_emul): + Don't error out, always return an emulation. + 2016-06-24 Dilyan Palauzov H.J. Lu diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index b27da52acd8..ab84f01258d 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 -- 2.30.2