From 48276b67db5357bab9feaab4f8cc9af5c35ced75 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 6 May 2015 12:55:58 -0700
Subject: [PATCH] NaCl: Fix elf_loader file name in nacl-test-wrapper.sh

---
 ChangeLog                         | 5 +++++
 sysdeps/nacl/nacl-test-wrapper.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9cbe60c33e..1e65298973 100644
--- 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 0e05813143..9bd6d291c0 100755
--- 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"