Add configure/CMake flags for conditionally building subzero targets.

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 286 matching lines @@
 
 # llvm-sb-configure - Configure llvm tools (sandboxed)
 llvm-sb-configure() {
   local arch=$1
 
   StepBanner "LLVM-SB" "Configure ${arch}"
   local srcdir="${TC_SRC_LLVM}"
   local objdir="${LLVM_SB_OBJDIR}"
   local installdir="$(GetTranslatorInstallDir ${arch})"
   local targets=""
+  local subzero_targets=""

[Jim Stichnoth, 2015/04/17 22:28:44]

Since we all love writing compact bash scripts, how about this instead of the
case statement:

declare -A targets=( [i686]=x86 [x86_64]=x86 [armv7]=arm \
                     [universal]=x86,arm )
declare -A subzero_targets=( [i686]=X8632 [x86_64]=X8664 [armv7]=ARM32 \
                             [universal]=X8632,ARM32 )

And below:
  --enable-targets=${targets[$arch]} \
  --enable-subzero-targets=${subzero_targets[$arch]} \

You're welcome.

   # For LLVM, "x86" brings in both i686 and x86_64.
   case ${arch} in
-    i686) targets=x86 ;;
-    x86_64) targets=x86 ;;
-    armv7) targets=arm ;;
-    universal) targets=x86,arm ;;
+    i686)
+      targets=x86
+      subzero_targets=X8632
+      ;;
+    x86_64)
+      targets=x86
+      subzero_targets=X8664
+      ;;
+    armv7)
+      targets=arm
+      subzero_targets=ARM32
+      ;;
+    universal)
+      targets=x86,arm
+      subzero_targets=X8632,ARM32
+      ;;
   esac
 
   spushd "${objdir}"
   # TODO(jvoung): remove ac_cv_func_getrusage=no once newlib has getrusage
   # in its headers.  Otherwise, configure thinks that we can link in
   # getrusage (stub is in libnacl), but we can't actually compile code
   # that uses ::getrusage because it's not in headers:
   # https://code.google.com/p/nativeclient/issues/detail?id=3657
   # Similar with getrlimit/setrlimit where struct rlimit isn't defined.
   RunWithLog \
       ${LLVM_SB_LOG_PREFIX}.configure \
       env -i \
       PATH="/usr/bin:/bin" \
       ${srcdir}/configure \
         "${LLVM_SB_CONFIGURE_ENV[@]}" \
         --prefix=${installdir} \
         --host=nacl \
         --enable-targets=${targets} \
+        --enable-subzero-targets=${subzero_targets} \
         --disable-assertions \
         --enable-pic=no \
         --enable-static \
         --enable-shared=no \
         --disable-jit \
         --enable-optimized \
         --enable-libcpp \
         --target=${CROSS_TARGET_ARM} \
         llvm_cv_link_use_export_dynamic=no \
         ac_cv_func_getrusage=no \
@@ skipping 675 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
 
 "$@"