Add ARM toolchain support.

examples/systems/bochs-2.4.6/nacl-bochs-2.4.6.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.
 #
 
 # nacl-bochs-2.4.6.sh
 #
 # usage:  nacl-bochs-2.4.6.sh
 #
@@ skipping 14 matching lines @@
 
 BOCHS_EXAMPLE_DIR=${NACL_SRC}/examples/systems/bochs-2.4.6
 
 CustomConfigureStep() {
   Banner "Configuring ${PACKAGE_NAME}"
   # export the nacl tools
   export CC=${NACLCC}
   export CXX=${NACLCXX}
   export CXXFLAGS="-O2 -g"
   export LDFLAGS=""
-  if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then
+  if [ ${NACL_ARCH} = "pnacl" ] ; then
     export CXXFLAGS="-O3 -g"
     export LDFLAGS="-O0 -static"
   fi
   export AR=${NACLAR}
   export RANLIB=${NACLRANLIB}
   # path and package magic to make sure we call the right
   # sdl-config, etc.
   export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
   export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
   export PATH=${NACL_BIN_PATH}:${PATH};
   export PATH="${NACL_SDK_USR_BIN}:${PATH}"
 
   export NACLBXLIBS="-lnacl-mounts -lpthread"
 
   # Hacky way of getting around the bochs configuration tools which don't allow
   # --whole-archive and don't allow for multiple libraries with the same name
   # on the linker line
   PWD=$(pwd)
   # TODO(bradnelson): take this out once the sdk is fixed (and do the line
   # after).
-  if [ "$NACL_PACKAGES_BITSIZE" = "64" ]; then
+  if [ "$NACL_ARCH" = "x86_64" ]; then
     ChangeDir ${NACL_TOOLCHAIN_ROOT}/x86_64-nacl/lib
-  elif [ "$NACL_PACKAGES_BITSIZE" = "32" ]; then
+  elif [ "$NACL_ARCH" = "i686" ]; then
     ChangeDir ${NACL_TOOLCHAIN_ROOT}/x86_64-nacl/lib32
+  elif [ "$NACL_ARCH" = "arm" ]; then
+    ChangeDir ${NACL_TOOLCHAIN_ROOT}/arm-nacl/lib
   else
     ChangeDir ${NACL_TOOLCHAIN_ROOT}/sdk/lib
   fi
-  #ChangeDir ${NACL_TOOLCHAIN_ROOT}/x86_64-nacl/lib${NACL_PACKAGES_BITSIZE}
   cp libppapi_cpp.a libppapi_cpp_COPY.a
   ChangeDir ${PWD}
 
   export LIBS=
   export LIBS="$LIBS -Wl,--start-group"
   export LIBS="$LIBS -lppapi"
   export LIBS="$LIBS -lppapi_cpp"
   export LIBS="$LIBS -Lbochs_ppapi -lbochs_ppapi"
   export LIBS="$LIBS -lnacl-mounts"
   export LIBS="$LIBS -lpthread"
   export LIBS="$LIBS -lppapi_cpp_COPY"
   # TOOD(robertm): investigate why this is only necessary for pnacl
-  if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then
+  if [ ${NACL_ARCH} = "pnacl" ] ; then
     export LIBS="$LIBS -lnosys"
   fi
   export LIBS="$LIBS -Wl,--end-group"
 
   ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
   Remove ${PACKAGE_NAME}-build
   MakeDir ${PACKAGE_NAME}-build
   cd ${PACKAGE_NAME}-build
   ../configure \
     --host=nacl \
@@ skipping 33 matching lines @@
   cp -r ${BOCHS_DIR}/msrs.def img/
   cd img
 
   PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}"
   MakeDir ${PUBLISH_DIR}
 
   tar cf ${PUBLISH_DIR}/img.tar ./
 
   cp ${START_DIR}/bochs.html ${PUBLISH_DIR}
   cp ${START_DIR}/bochs.nmf ${PUBLISH_DIR}
-  cp ${BOCHS_BUILD}/bochs \
-      ${PUBLISH_DIR}/bochs_x86-${NACL_PACKAGES_BITSIZE}.nexe \
+  cp ${BOCHS_BUILD}/bochs ${PUBLISH_DIR}/bochs_${NACL_ARCH}.nexe
 
   cd ..
 }
 
 CustomCheck() {
   # verify sha1 checksum for tarball
   if ${SHA1CHECK} <$1 &>/dev/null; then
     return 0
   else
     return 1
@@ skipping 62 matching lines @@
 
 CustomPackageInstall() {
   GameGetStep ${LINUX_IMG_URL} ${LINUX_IMG_NAME}
   DefaultPreInstallStep
   CustomDownloadStep2 ${URL} ${PACKAGE_NAME} \
     ${BOCHS_EXAMPLE_DIR}/bochs-2.4.6.sha1
   DefaultExtractStep
   CustomPatchStep
   CustomConfigureStep
   DefaultBuildStep
-  if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then
+  if [ ${NACL_ARCH} = "pnacl" ] ; then
     DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bochs
   fi
   CustomInstallStep
   DefaultCleanUpStep
 }
 
 CustomPackageInstall
 exit 0