Add support for new pnacl native toolchain driver

build_tools/webports-env.sh

 #!/bin/bash
 # Copyright (c) 2013 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.
 
 # Echo the environment variables need to to build/configure standard
 # GNU make/automake/configure projects.  e.g. CC, CXX, CFLAGS, etc.
 # The values for these variables are calculated based on the following
 # environment variables:
 #
-# $NACL_ARCH - i386, x86_64, arm or pnacl.  Default: x86_64
+# $NACL_ARCH - i386, x86_64, arm, pnacl or le32.  Default: x86_64
 # $TOOLCHAIN - clang-newlib, glibc or pnacl.  Default: pnacl
 #
 # You can run a command within the NaCl environment
 # by passing the command line. e.g:
 # ./webports-env.sh ./configure --host=nacl
 # ./webports-env.sh make
 #
 # Alternatively you can see just the essential environment
 # variables by passing --print.  This can by used within
 # a script using:
@@ skipping 49 matching lines @@
 
 # Default value for NACL_ARCH
 NACL_ARCH=${NACL_ARCH:-${DEFAULT_ARCH}}
 
 # Default Value for TOOLCHAIN
 TOOLCHAIN=${TOOLCHAIN:-pnacl}
 
 # Check NACL_ARCH
 if [ ${NACL_ARCH} != "i686" -a ${NACL_ARCH} != "x86_64" -a \
      ${NACL_ARCH} != "arm" -a ${NACL_ARCH} != "pnacl" -a \
-     ${NACL_ARCH} != "emscripten" ]; then
+     ${NACL_ARCH} != "emscripten" -a ${NACL_ARCH} != "le32" ]; then
   echo "Unknown value for NACL_ARCH: '${NACL_ARCH}'" 1>&2
   exit 1
 fi
 
 # Check TOOLCHAIN
 if [ ${TOOLCHAIN} != "pnacl" -a ${TOOLCHAIN} != "glibc" -a \
      ${TOOLCHAIN} != "clang-newlib" -a ${TOOLCHAIN} != "emscripten" ]; then
   echo "Unknown value for TOOLCHAIN: '${TOOLCHAIN}'" 1>&2
   exit 1
 fi
 
 if [ "${NACL_ARCH}" = "emscripten" -a -z "${EMSCRIPTEN:-}" ]; then
   echo "-------------------------------------------------------------------"
   echo "EMSCRIPTEN is unset."
   echo "This environment variable needs to be pointed at some version of"
   echo "the emscripten repository."
   echo "NOTE: set this to an absolute path."
   echo "-------------------------------------------------------------------"
   exit 1
 fi
 
 if [ "${TOOLCHAIN}" = "pnacl" ]; then
-  if [ "${NACL_ARCH}" != "pnacl" ]; then
+  if [ "${NACL_ARCH}" != "pnacl" -a "${NACL_ARCH}" != "le32" ]; then
     echo "PNaCl does not support the selected architecture: ${NACL_ARCH}" 1>&2
     exit 1
   fi
 fi
 
 if [ "${TOOLCHAIN}" = "glibc" ]; then
   if [ "${NACL_ARCH}" = "pnacl" ]; then
     echo "PNaCl is not supported by the glibc toolchain" 1>&2
     exit 1
   fi
@@ skipping 24 matching lines @@
 elif [ ${NACL_ARCH} = "emscripten" ]; then
   NACL_CROSS_PREFIX=emscripten
 else
   NACL_CROSS_PREFIX=${NACL_ARCH}-nacl
 fi
 
 export NACL_LIBC
 export NACL_ARCH
 export NACL_CROSS_PREFIX
 
+NACL_EXCEPTIONS_FLAG=""
+
 InitializeNaClGccToolchain() {
   if [ ${NACL_ARCH} = "arm" ]; then
     local TOOLCHAIN_ARCH="arm"
   else
     local TOOLCHAIN_ARCH="x86"
   fi
 
   local TOOLCHAIN_DIR=${OS_SUBDIR}_${TOOLCHAIN_ARCH}_${NACL_LIBC}
   readonly NACL_TOOLCHAIN_ROOT=${NACL_SDK_ROOT}/toolchain/${TOOLCHAIN_DIR}
   readonly NACL_BIN_PATH=${NACL_TOOLCHAIN_ROOT}/bin
@@ skipping 83 matching lines @@
       local NACL_LIBDIR=x86_64-nacl/lib64
     else
       local NACL_LIBDIR=x86_64-nacl/lib32
     fi
   else
     # TODO(sbc): figure our why we do not have a pnacl-strings
     #NACLSTRINGS=${NACL_BIN_PATH}/pnacl-strings
     # until then use the host's strings tool
     # (used only by the cairo package)
     NACLSTRINGS="$(which strings)"
+    if [ ${NACL_ARCH} = "le32" ]; then
+      NACLSTRINGS=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
+      NACL_EXCEPTIONS_FLAG="-fcxx-exceptions"
+    fi
     NACLSTRIP=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip
     NACL_EXEEXT=".pexe"
-
     # pnacl's translator
-    TRANSLATOR=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-translate
-    PNACLFINALIZE=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-finalize
+    # This should always be pnacl-translate, pnacl-finalize
+    TRANSLATOR=${NACL_BIN_PATH}/${TOOLCHAIN}-translate
+    PNACLFINALIZE=${NACL_BIN_PATH}/${TOOLCHAIN}-finalize
     # pnacl's pexe optimizer
     PNACL_OPT=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-opt
 
     NACL_SDK_LIBDIR="${NACL_SDK_ROOT}/lib/${TOOLCHAIN}"
     local NACL_LIBDIR=le32-nacl/lib
   fi
 
   readonly NACL_SDK_LIB=${NACL_TOOLCHAIN_ROOT}/${NACL_LIBDIR}
 }
 
@@ skipping 71 matching lines @@
       echo "export PATH=${NACL_PREFIX}/bin:\${PATH}:${NACL_BIN_PATH}"
       echo "export CPPFLAGS=\"${NACL_CPPFLAGS}\""
       echo "export ARFLAGS=\"${NACL_ARFLAGS}\""
       echo "export LDFLAGS=\"${NACL_LDFLAGS}\""
     else
       NaClEnvExport
       exec "$@"
     fi
   fi
 fi