Rename PNaCl

tests/spec2k/run_all.sh

 #!/bin/bash
 
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -o nounset
 set -o errexit
 
 
@@ skipping 26 matching lines @@
 # Helper
 ######################################################################
 
 source ../../tools/llvm/common-tools.sh
 
 readonly TOOLCHAIN_DIR="$(GetAbsolutePath "../../toolchain")"
 
 readonly ARM_TRUSTED_TC="${TOOLCHAIN_DIR}/linux_arm-trusted"
 readonly QEMU_TOOL="${ARM_TRUSTED_TC}/qemu_tool.sh"
 
-readonly PNACL_TC="${TOOLCHAIN_DIR}/linux_arm-untrusted"
+readonly PNACL_TC="${TOOLCHAIN_DIR}/pnacl_${BUILD_PLATFORM}_${BUILD_ARCH}"
 readonly NNACL_TC="${TOOLCHAIN_DIR}/${SCONS_BUILD_PLATFORM}_x86"
 readonly RUNNABLE_LD_X8632="${NNACL_TC}/nacl/lib/runnable-ld.so"
 readonly RUNNABLE_LD_X8664="${NNACL_TC}/nacl64/lib/runnable-ld.so"
 
 gnu_size() {
   # If the PNaCl toolchain is installed, prefer to use its "size".
   if [ -d "${PNACL_TC}" ] ; then
     GNU_SIZE="${PNACL_TC}/bin/size"
   elif ${BUILD_PLATFORM_LINUX} ; then
     GNU_SIZE="size"
@@ skipping 626 matching lines @@
 
 [ $# = 0 ] && set -- help  # Avoid reference to undefined $1.
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 "$@"