Add subzero nexe to the pnacl translator build (NaCl build scripts).

pnacl/build.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 #@                 PNaCl toolchain build script
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 ######################################################################
@@ skipping 48 matching lines @@
 
 readonly PNACL_MAKE_OPTS="${PNACL_MAKE_OPTS:-}"
 readonly MAKE_OPTS="-j${PNACL_CONCURRENCY} VERBOSE=1 ${PNACL_MAKE_OPTS}"
 
 readonly NONEXISTENT_PATH="/going/down/the/longest/road/to/nowhere"
 
 # Git sources
 readonly PNACL_GIT_ROOT="${NACL_ROOT}/toolchain_build/src"
 readonly TC_SRC_BINUTILS="${PNACL_GIT_ROOT}/binutils"
 readonly TC_SRC_LLVM="${PNACL_GIT_ROOT}/llvm"
+readonly TC_SRC_SUBZERO="${PNACL_GIT_ROOT}/subzero"
 
 readonly TOOLCHAIN_BUILD_OUT="${NACL_ROOT}/toolchain_build/out"
 
 readonly TIMESTAMP_FILENAME="make-timestamp"
 
 # PNaCl toolchain installation directories (absolute paths)
 readonly SDK_INSTALL_ROOT="${TOOLCHAIN_BASE}/pnacl_newlib"
 readonly INSTALL_ROOT="${TOOLCHAIN_BUILD_OUT}/translator_compiler_install"
 readonly INSTALL_BIN="${INSTALL_ROOT}/bin"
 
@@ skipping 265 matching lines @@
 
 # llvm-sb-make - Make llvm tools (sandboxed)
 llvm-sb-make() {
   local arch=$1
   StepBanner "LLVM-SB" "Make ${arch}"
   local objdir="${LLVM_SB_OBJDIR}"
 
   spushd "${objdir}"
   ts-touch-open "${objdir}"
 
-  local tools_to_build="pnacl-llc"
+  local tools_to_build="pnacl-llc subzero"
   local export_dyn_env="llvm_cv_link_use_export_dynamic=no"
   local isjit=0
   RunWithLog ${LLVM_SB_LOG_PREFIX}.make \
       env -i PATH="/usr/bin:/bin:${HOST_CLANG_PATH}" \
       LD_LIBRARY_PATH="${HOST_LIBCXX}/lib" \
       ONLY_TOOLS="${tools_to_build}" \
       PNACL_BROWSER_TRANSLATOR=1 \
       KEEP_SYMBOLS=1 \
       NO_DEAD_STRIP=1 \
       VERBOSE=1 \
-    BUILD_CC="${HOST_CLANG}" \
-    BUILD_CXX="${HOST_CLANG}++" \
-    BUILD_CXXFLAGS="-stdlib=libc++ -I${HOST_LIBCXX}/include/c++/v1" \
-    BUILD_LDFLAGS="-L${HOST_LIBCXX}/lib" \
+      SUBZERO_SRC_ROOT="${TC_SRC_SUBZERO}" \
+      BUILD_CC="${HOST_CLANG}" \
+      BUILD_CXX="${HOST_CLANG}++" \
+      BUILD_CXXFLAGS="-stdlib=libc++ -I${HOST_LIBCXX}/include/c++/v1" \
+      BUILD_LDFLAGS="-L${HOST_LIBCXX}/lib" \
       ${export_dyn_env} \
       make ${MAKE_OPTS} tools-only
 
   ts-touch-commit "${objdir}"
 
   spopd
 }
 
 # llvm-sb-install - Install llvm tools (sandboxed)
 llvm-sb-install() {
   local arch=$1
   StepBanner "LLVM-SB" "Install ${arch}"
 
-  local toolname="pnacl-llc"
   local installdir="$(GetTranslatorInstallDir ${arch})"/bin
   mkdir -p "${installdir}"
   spushd "${installdir}"
   local objdir="${LLVM_SB_OBJDIR}"
-  cp -f "${objdir}"/Release*/bin/${toolname} .
-  mv -f ${toolname} ${toolname}.pexe
-  local arches=${arch}
-  if [[ "${arch}" == "universal" ]]; then
-    arches="${SBTC_ARCHES_ALL}"
-  elif [[ "${arch}" == "i686" ]]; then
-    # LLVM does not separate the i686 and x86_64 backends.
-    # Translate twice to get both nexes.
-    arches="i686 x86_64"
+
+  local tools="pnacl-llc"
+  if [[ "${arch}" == "i686" ]]; then
+    tools+=" pnacl-sz"
   fi
-  local have_segment_gap="false"
-  translate-sb-tool ${toolname} "${arches}" "${have_segment_gap}"
-  install-sb-tool ${toolname} "${arches}"
+  for toolname in ${tools}; do
+    cp -f "${objdir}"/Release*/bin/${toolname} .
+    mv -f ${toolname} ${toolname}.pexe
+    local arches=${arch}
+    if [[ "${arch}" == "universal" ]]; then
+      arches="${SBTC_ARCHES_ALL}"
+    elif [[ "${arch}" == "i686" ]]; then
+      # LLVM does not separate the i686 and x86_64 backends.
+      # Translate twice to get both nexes.
+      arches="i686 x86_64"
+    fi
+    local have_segment_gap="false"
+    if [ "${toolname}" == "pnacl-sz" ]; then
+      have_segment_gap="true"
+    fi
+    translate-sb-tool ${toolname} "${arches}" "${have_segment_gap}"
+    install-sb-tool ${toolname} "${arches}"
+  done
   spopd
 }
 
 # translate-sb-tool <toolname> <arches> <have_segment_gap>
 #
 # Translate <toolname>.pexe to <toolname>.<arch>.nexe in the current directory.
 translate-sb-tool() {
   local toolname=$1
   local arches=$2
   local have_segment_gap=$3
@@ skipping 594 matching lines @@
 
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"