Add support for new pnacl native toolchain driver

ports/pnacl/build.sh

 # 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.
 
 EnableGlibcCompat
 EnableCliMain
 
 PatchStep() {
   DefaultPatchStep
   MakeDir ${SRC_DIR}/toolchain_build/src
@@ skipping 43 matching lines @@
   GOLD_LDADD+=" -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils"
   GOLD_LDADD+=" -lLLVMARMDisassembler -lLLVMARMCodeGen"
   GOLD_LDADD+=" -lLLVMNaClTransforms"
   GOLD_LDADD+=" -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMARMInfo"
   GOLD_LDADD+=" -lLLVMARMAsmPrinter -lLLVMMipsDisassembler -lLLVMMipsCodeGen"
   GOLD_LDADD+=" -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen"
   GOLD_LDADD+=" -lLLVMMipsAsmParser -lLLVMMipsDesc -lLLVMMipsInfo"
   GOLD_LDADD+=" -lLLVMMipsAsmPrinter -lLLVMMCDisassembler -lLLVMLTO"
   GOLD_LDADD+=" -lLLVMMCParser -lLLVMLinker -lLLVMipo -lLLVMObjCARCOpts"
   GOLD_LDADD+=" -lLLVMVectorize -lLLVMScalarOpts -lLLVMInstCombine"
-  GOLD_LDADD+=" -lLLVMJSBackendCodeGen -lLLVMJSBackendDesc -lLLVMJSBackendInfo"
   GOLD_LDADD+=" -lLLVMTransformUtils -lLLVMipa -lLLVMBitWriter"
   GOLD_LDADD+=" -lLLVMBitReader -lLLVMAnalysis -lLLVMTarget -lLLVMMC"
   GOLD_LDADD+=" -lLLVMObject -lLLVMCore -lLLVMSupport"
   GOLD_LDADD+=" -Wl,--end-group"
 
   EXTRA_CONFIGURE="--extra-configure-arg=--disable-compiler-version-checks"
   EXTRA_CONFIGURE+=" --extra-configure-arg=--enable-libcpp"
   # Without this configure will detect vfork as missing and define
   # vfork to fork which clobbers that define in "spawn.h".
   EXTRA_CONFIGURE+=" --extra-configure-arg=ac_cv_func_vfork_works=yes"
   EXTRA_CONFIGURE+=" --extra-configure-arg=ac_cv_func_getrusage=no"
   if [[ ${NACL_DEBUG} == 1 ]]; then
     EXTRA_CONFIGURE+=" --host-flavor=debug"
   fi
 
   # Some code in llvm uses intrisics not supported in the pnacl stable abi.
   if [[ ${TOOLCHAIN} == pnacl ]]; then
     EXTRA_CC_ARGS="-fgnu-inline-asm"
-    EXTRA_CC_ARGS+=" --pnacl-disable-abi-check"
+    if [[ ${NACL_ARCH} == le32 ]]; then
+      GOLD_LDADD+=" -Wl,-plugin-opt=no-abi-verify"
+    else
+      EXTRA_CC_ARGS+=" --pnacl-disable-abi-check"
+    fi
   fi
   if [[ ${TOOLCHAIN} != glibc ]]; then
     EXTRA_CC_ARGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
   fi
 
   EXTRA_CC_ARGS+=" -include spawn.h"
   EXTRA_CC_ARGS+=" -I${NACL_SDK_ROOT}/include"
-  EXTRA_CC_ARGS+=" -I${NACLPORTS_INCLUDE}"
+  EXTRA_CC_ARGS+=" -isystem${NACLPORTS_INCLUDE}"
 
   # export WEBPORTS_EXTRA_LIBS so that compiler_wapper.py can access it
   export WEBPORTS_EXTRA_LIBS="${NACLPORTS_LDFLAGS} ${NACLPORTS_LIBS}"
   echo "WEBPORTS_EXTRA_LIBS=${WEBPORTS_EXTRA_LIBS}"
 
   # Inject a shim that speed up pnacl invocations for configure.
   if [ "${NACL_ARCH}" = "pnacl" ]; then
     local PNACL_CONF_SHIM="${TOOLS_DIR}/pnacl-configure-shim.py"
     NACLCC="${PNACL_CONF_SHIM} ${NACLCC}"
     NACLCXX="${PNACL_CONF_SHIM} ${NACLCXX}"
@@ skipping 11 matching lines @@
   export RANLIB=${NACLRANLIB}
   LogExecute ${SRC_DIR}/toolchain_build/toolchain_build_pnacl.py -v \
     --no-use-cached-results \
     --no-use-remote-cache \
     --no-annotator \
     --pnacl-in-pnacl \
     --output=${OUT_DIR} \
     --install=${OUT_INSTALL} \
     "--extra-cc-args=${EXTRA_CC_ARGS}" \
     ${EXTRA_CONFIGURE} \
-    "--binutils-pnacl-extra-configure=${GOLD_LDADD}"
+    "--binutils-extra-configure=${GOLD_LDADD}"
 
   CreateHybridToolchain
 }
 
 CreateHybridToolchain() {
   Banner "Creating Hybrid Toolchain"
 
   # Build a full toolchain based on the one in NACL_SDK_ROOT, but overlayed
   # with the one we just compiled.
   Remove toolchain
@@ skipping 58 matching lines @@
     Remove $f ${f%.*}
     LogExecute ln -s clang ${f%.*}
   done
   for f in $(find ${INSTALL_DIR} -type f -name "*${NACL_EXEEXT}"); do
     LogExecute mv $f ${f%.*}
   done
 }
 
 TestStep() {
   # Verify that binaries at least load under sel_ldr
-  LogExecute toolchain/bin/le32-nacl-strings --version
+  LogExecute toolchain/bin/le32-nacl-clang --version
   LogExecute toolchain/bin/arm-nacl-readelf --version
   LogExecute toolchain/bin/x86_64-nacl-as --version
   LogExecute toolchain/bin/clang --version
 
   TestNaClClang
 }
 
 TestNaClClang() {
   # Try compiling and running a simple hello world program.  We have to
   # use explicit compile, assemble and link commands since sel_ldr doesn't
@@ skipping 29 matching lines @@
   -L$PWD/toolchain/bin/../x86_64-nacl/usr/lib
   -L$PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl
   ./hello.o --start-group -lc -lgcc --as-needed -lgcc_eh --no-as-needed
   --end-group
   $PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl/crtend.o
   $PWD/toolchain/bin/../x86_64-nacl/lib/crtn.o
   "
   LogExecute $link_command
   RunSelLdrCommand hello.nexe
 }