Add support for new pnacl native toolchain driver

build_tools/common.sh

 # 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.
 #
 # Environment variable NACL_ARCH should be set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 52 matching lines @@
 # i686-nacl-clang doesn't currently know about i686-nacl/usr/include
 # or i686-nacl/usr/lib.  Instead it shared the headers with x86_64
 # and uses x86_64-nacl/usr/lib32.
 # TODO(sbc): remove this once we fix:
 # https://code.google.com/p/nativeclient/issues/detail?id=4108
 if [ "${TOOLCHAIN}" = "clang-newlib" -a "${NACL_ARCH}" = "i686" ]; then
   NACLPORTS_CPPFLAGS+=" -isystem ${NACLPORTS_INCLUDE}"
   NACLPORTS_LDFLAGS+=" -L${NACLPORTS_LIBDIR}"
 fi
 
+if [ "${TOOLCHAIN}" = "pnacl" -a "${NACL_ARCH}" = "le32" ]; then
+  NACLPORTS_CPPFLAGS+=" -isystem ${NACLPORTS_INCLUDE}"
+fi
+
 if [ "${TOOLCHAIN}" = "clang-newlib" -o "${TOOLCHAIN}" = "pnacl" -o \
      "${TOOLCHAIN}" = "emscripten" ]; then
   NACLPORTS_CLANG=1
 else
   NACLPORTS_CLANG=0
 fi
 
 # If stderr is a tty enable clang color compiler diagnostics
 if [ -t 1 -a "${NACLPORTS_CLANG}" = "1" ]; then
   NACLPORTS_CPPFLAGS+=" -fcolor-diagnostics"
@@ skipping 424 matching lines @@
   if IsCMakeProject; then
     return
   fi
 
   if [ "${NACL_DEBUG}" = "1" ]; then
     NACLPORTS_CFLAGS+=" -g -O0"
     NACLPORTS_CXXFLAGS+=" -g -O0"
   else
     NACLPORTS_CFLAGS+=" -DNDEBUG -O2"
     NACLPORTS_CXXFLAGS+=" -DNDEBUG -O2"
-    if [ "${NACL_ARCH}" = "pnacl" ]; then
+    if [ "${NACL_ARCH}" = "pnacl"  -a "${NACL_ARCH}" == "le32" ]; then
       NACLPORTS_LDFLAGS+=" -DNDEBUG -O2"
     fi
   fi
 }
 
 EnableCliMain() {
   if [[ ${TOOLCHAIN} == emscripten ]]; then
     return
   fi
   NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LDFLAGS}"
@@ skipping 223 matching lines @@
   LIBDOT_SEARCH_PATH=${CHROMEAPPS} LogExecute "${LIB_DOT}/bin/concat.sh" \
       -i "${HTERM}/concat/hterm_deps.concat" -o "${INSTALL_DIR}/hterm.concat.js"
   LIBDOT_SEARCH_PATH=${CHROMEAPPS} LogExecute ${LIB_DOT}/bin/concat.sh \
       -i "${HTERM}/concat/hterm.concat" -o "${INSTALL_DIR}/hterm2.js"
   chmod +w "${INSTALL_DIR}/hterm.concat.js" "${INSTALL_DIR}/hterm2.js"
   cat "${INSTALL_DIR}/hterm2.js" >> "${INSTALL_DIR}/hterm.concat.js"
   Remove "${INSTALL_DIR}/hterm2.js"
 
   LogExecute cp "${TOOLS_DIR}/naclterm.js" "${INSTALL_DIR}"
   LogExecute cp "${TOOLS_DIR}/pipeserver.js" "${INSTALL_DIR}"
-  if [ "${NACL_ARCH}" = "pnacl" ] ; then
+  if [[ "${NACL_ARCH}" = "pnacl" || "${NACL_ARCH}" = "le32" ]] ; then
     sed 's/x-nacl/x-pnacl/' \
         "${TOOLS_DIR}/naclprocess.js" > "${INSTALL_DIR}/naclprocess.js"
   else
     LogExecute cp "${TOOLS_DIR}/naclprocess.js" "${INSTALL_DIR}"
   fi
 }
 
 
 #
 # Build step for projects based on the NaCl SDK build
@@ skipping 394 matching lines @@
 }
 
 
 #
 # Validate a given NaCl executable (.nexe file)
 # $1 - Execuatable file (.nexe)
 #
 Validate() {
   local binary=$1
 
-  if [[ ${NACL_ARCH} = pnacl || ${NACL_ARCH} = emscripten ]]; then
+  if [[ ${NACL_ARCH} = pnacl || ${NACL_ARCH} = le32
+    || ${NACL_ARCH} = emscripten ]]; then
     if [[ ! -f $binary ]]; then
       echo "error: missing binary: ${binary}"
       exit 1
     fi
     return
   fi
 
   LogExecute "${NACL_SDK_ROOT}/tools/ncval" "${binary}"
   if [[ $? != 0 ]]; then
     exit 1
   fi
 }
 
 
 #
 # PostBuildStep by default will validate (using ncval) any executables
 # specified in the ${EXECUTABLES} as well as create wrapper scripts
 # for running them in sel_ldr.
 #
 DefaultPostBuildStep() {
   if [[ -z ${EXECUTABLES} ]]; then
     return
   fi
-
-  if [[ ${NACL_ARCH} == pnacl ]]; then
-    for pexe in ${EXECUTABLES}; do
-      FinalizePexe "${pexe}"
-    done
+  if [[ ${NACL_ARCH} == pnacl  || ${NACL_ARCH} == le32 ]]; then
+    if [[ ${NACL_ARCH} == pnacl ]]; then
+      for pexe in ${EXECUTABLES}; do
+        FinalizePexe "${pexe}"
+      done
+    fi
     if [[ ${TRANSLATE_PEXES:-} == no ]]; then
       return
     fi
     for pexe in ${EXECUTABLES}; do
       TranslatePexe "${pexe}"
     done
   fi
-
   for nexe in ${EXECUTABLES}; do
     Validate "${nexe}"
     # Create a script which will run the executable in sel_ldr.  The name
     # of the script is the same as the name of the executable, either without
     # any extension or with the .sh extension.
 
     local script_name="${nexe}.sh"
     if [[ ${nexe} == *${NACL_EXEEXT} && ! -d ${nexe%%${NACL_EXEEXT}} ]]; then
       script_name="${nexe%%${NACL_EXEEXT}}"
     fi
 
     nexe="$(basename ${nexe})"
-    if [[ ${NACL_ARCH} == pnacl ]]; then
+    if [[ ${NACL_ARCH} == pnacl || ${NACL_ARCH} == le32 ]]; then
       local basename="${nexe%.*}"
       nexe=${basename}.x86-64.nexe
     fi
     WriteLauncherScript "${script_name}" "${nexe}"
   done
 
   VerifySharedLibraryOrder
 }
 
 
 #
 # Run an executable (under sel_ldr or node.js).
 # $1 - Executable (.nexe or .pexe) name
 #
 RunSelLdrCommand() {
   if [ "${SKIP_SEL_LDR_TESTS}" = "1" ]; then
     return
   fi
 
-  if [ "${NACL_ARCH}" = "pnacl" ]; then
+  if [ "${NACL_ARCH}" = "pnacl" -o  "${NACL_ARCH}" = "le32" ]; then
     # For PNaCl we translate to each arch where we have sel_ldr, then run it.
     local PEXE=$1
     local NEXE_32=$1_32.nexe
     local NEXE_64=$1_64.nexe
     local SCRIPT_32=$1_32.sh
     local SCRIPT_64=$1_64.sh
     shift
     TranslateAndWriteLauncherScript "${PEXE}" x86-32 "${NEXE_32}" "${SCRIPT_32}"
     echo "[sel_ldr x86-32] ${SCRIPT_32} $*"
     "./${SCRIPT_32}" "$@"
@@ skipping 110 matching lines @@
 TranslateAndWriteLauncherScript() {
   local pexe=$1
   local arch=$2
   local nexe=$3
   local script=$4
   if [[ ! -f ${pexe} ]]; then
     echo "pexe not found: ${pexe}"
     exit 1
   fi
   if [[ ${pexe} -nt ${nexe} ]]; then
-    echo "Finalizing -> ${pexe}"
-    "${PNACLFINALIZE}" "${pexe}"
+    if [[ ${NACL_ARCH} != le32 ]]; then
+      echo "Finalizing -> ${pexe}"
+      "${PNACLFINALIZE}" "${pexe}"
+    else
+      echo "Skipping finalizing: ${pexe} -> ${nexe}"
+    fi
     echo "Translating -> ${nexe}"
     "${TRANSLATOR}" "${pexe}" -arch "${arch}" -o "${nexe}"
   else
     echo "Skipping finalization and translation: ${pexe} -> ${nexe}"
   fi
   WriteLauncherScript "${script}" $(basename "${nexe}")
 }
 
 
 #
@@ skipping 241 matching lines @@
 ######################################################################
 # Always run
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs