NaCl: Fix elf_loader file name in nacl-test-wrapper.sh

diff --git a/ChangeLog b/ChangeLog
index 9cbe60c33eec5019dca17bf9e29b4dabda265a97..1e652989731c75f69793dc6ab06a1fb76b55258b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-06  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/nacl/nacl-test-wrapper.sh (NACL_LOADER):
+       Use elf_loader_${arch}.nexe rather than loader_${arch}.nexe.
+
 2015-05-06  Joseph Myers  <joseph@codesourcery.com>
 
        * math/auto-libm-test-in: Add more tests of acosh, atanh, cos,

diff --git a/sysdeps/nacl/nacl-test-wrapper.sh b/sysdeps/nacl/nacl-test-wrapper.sh
index 0e058131433a1ce4b0a79bbb719c76a7ea79bf90..9bd6d291c0d7cb18a262d47295296859779e13b3 100755 (executable)
--- a/sysdeps/nacl/nacl-test-wrapper.sh
+++ b/sysdeps/nacl/nacl-test-wrapper.sh
@@ -79,7 +79,7 @@ sdk_tools="${NACL_SDK_ROOT}/tools"
 NACL_BOOTSTRAP="${sdk_tools}/nacl_helper_bootstrap_${arch}"
 NACL_SEL_LDR="${sdk_tools}/sel_ldr_${arch}"
 NACL_IRT="${sdk_tools}/irt_core_${arch}.nexe"
-NACL_LOADER="${sdk_tools}/loader_${arch}.nexe"
+NACL_LOADER="${sdk_tools}/elf_loader_${arch}.nexe"
 
 if [ ! -x "$NACL_BOOTSTRAP" -o ! -x "$NACL_SEL_LDR" ]; then
   echo >&2 "$0: sel_ldr_${arch} and/or nacl_helper_bootstrap_${arch} missing"