Rename PNaCl

tools/toolchain_tester/toolchain_config.py

 # Copyright 2008 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.
 
 #
 # Config file for various nacl compilation scenarios
 #
 import os
 import sys
 
@@ skipping 150 matching lines @@
     commands=COMMANDS_nacl_gcc,
     tools_needed=[NACL_GCC_X64, SEL_LDR_X64],
     CC = NACL_GCC_X64,
     SEL_LDR = SEL_LDR_X64,
     CFLAGS = '-O9 -static ' + GLOBAL_CFLAGS)
 
 
 ######################################################################
 # PNACL + SEL_LDR [ARM]
 ######################################################################
-DRIVER_PATH = 'toolchain/linux_arm-untrusted/bin'
+PNACL_ROOT = 'toolchain/pnacl_linux_x86_64'
 
-PNACL_LLVM_GCC = DRIVER_PATH + '/pnacl-gcc'
+PNACL_LLVM_GCC = PNACL_ROOT + '/bin/pnacl-gcc'
 
-PNACL_LD = DRIVER_PATH + '/pnacl-ld'
+PNACL_LD = PNACL_ROOT + '/bin/pnacl-ld'
 
-PNACL_LIB_DIR = 'toolchain/linux_arm-untrusted/libs-bitcode/'
+PNACL_LIB_DIR = PNACL_ROOT + '/libs-bitcode/'
 
 COMMANDS_llvm_pnacl_arm = [
     ('compile-bc',
      '%(CC)s %(src)s %(CFLAGS)s -c -o %(tmp)s.bc',
      ),
     ('translate-arm',
      '%(LD)s %(tmp)s.bc -o %(tmp)s.nexe  -L%(LIB_DIR)s -lc -lnacl -lnosys',
      ),
     ('qemu-sel_ldr',
      '%(EMU)s run %(SEL_LDR)s -Q %(tmp)s.nexe',
@@ skipping 59 matching lines @@
 
 TOOLCHAIN_CONFIGS['llvm_pnacl_x8664_O0'] = ToolchainConfig(
     desc='pnacl llvm [x8664]',
     commands=COMMANDS_llvm_pnacl_x86_O0,
     tools_needed=[PNACL_LLVM_GCC, PNACL_LD, SEL_LDR_X64],
     CC = PNACL_LLVM_GCC,
     LD = PNACL_LD + ' -arch x86-64',
     SEL_LDR = SEL_LDR_X64,
     LIB_DIR = PNACL_LIB_DIR,
     CFLAGS = '-O0 -static ' + GLOBAL_CFLAGS)