From patchwork Wed May 6 19:57:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 469117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8FF041402C6 for ; Thu, 7 May 2015 05:57:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=y27CE4R0; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=bABfV6GXsu5oMTkJYsMoI5Mt5yYVUJFNGG3FskLv6VKQBF +wDsKs/ZCEvdV/eDl5c+A5Hlg/NiZ4gPB713aFN6N+C5gKkB2DtUsyA9p/3Nunou C7TPWqj24MrYkRAdUQjgf/D++nMeukpyvYqig9fC2AOHbSKmoQ9F1iUu5jDLI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=lySEJ+04ojKI0+F6Jsn40wJnojk=; b=y27CE4R0cLrB0MCiTD1z U2yo5Hi+RUBzPGLmkWYzyKo+PsYjsHcCuRwYqfpCYxU4nsaJSiGbj0Ic8Rkewnk2 RsmqdY7prlcBJfaZAZWQj5XOMTseNONcnpi7MDJMa0YkY2VGwP1mgYp1hpVzGG21 icFelO0yWpUxfKnNzYw564A= Received: (qmail 113906 invoked by alias); 6 May 2015 19:57:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 113892 invoked by uid 89); 6 May 2015 19:57:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL, BAYES_40, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Fix elf_loader file name in nacl-test-wrapper.sh Message-Id: <20150506195701.2CADB2C3BA4@topped-with-meat.com> Date: Wed, 6 May 2015 12:57:01 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=yhS3AxvoLQU0b-nwb2wA:9 a=CjuIK1q_8ugA:10 2015-05-06 Roland McGrath * sysdeps/nacl/nacl-test-wrapper.sh (NACL_LOADER): Use elf_loader_${arch}.nexe rather than loader_${arch}.nexe. diff --git a/sysdeps/nacl/nacl-test-wrapper.sh b/sysdeps/nacl/nacl-test-wrapper.sh index 0e05813..9bd6d29 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"