Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

pnacl/build.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.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 #
@@ skipping 3030 matching lines @@
       install_lib \
       libdir="$(PosixToSysPath "${INSTALL_SDK_LIB}")"
   spopd
 }
 
 sdk-irt-shim() {
   # NOTE: This uses the nacl-gcc toolchain, causing
   #       the pnacl toolchain to depend on it.
   StepBanner "SDK" "IRT Shim"
   spushd "${NACL_ROOT}"
+  # NOTE: We specify bitcode=1, but it is really using nacl-gcc to build
+  # the library (it's only bitcode=1 because it's part of the pnacl sdk).
   RunWithLog "sdk.irt.shim" \
     ./scons -j${PNACL_CONCURRENCY} \
+            bitcode=1 \
             platform=x86-64 \
             naclsdk_validate=0 \
             --verbose \
             pnacl_irt_shim
-  local outdir="${SCONS_OUT}"/nacl-x86-64/obj/src/untrusted/pnacl_irt_shim
+  local out_dir_prefix="${SCONS_OUT}"/nacl-x86-64-pnacl-clang
+  local outdir="${out_dir_prefix}"/obj/src/untrusted/pnacl_irt_shim
   mkdir -p "${INSTALL_LIB_X8664}"
   cp "${outdir}"/libpnacl_irt_shim.a "${INSTALL_LIB_X8664}"
   spopd
 }
 
 sdk-verify() {
   # This avoids errors when *.o finds no matches.
   shopt -s nullglob
 
   StepBanner "SDK" "Verify"
@@ skipping 710 matching lines @@
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 hg-migrate
 
 "$@"