Add ARM toolchain support.

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_PACKAGES_BITSIZE should be unset or set to "32"
-# for a 32-bit build.  It should be set to "64" for a 64-bit build.
+# Environment variable NACL_ARCH should be unset or set to "i686"
+# for a 32-bit build.  It should be set to "x86_64", "pnacl", or "arm"
+# for a 64-bit, pnacl, or arm builds.
 
 
 # NAMING CONVENTION
 # =================
 #
 # This file is source'd by other scripts especially those inside libraries/
 # and makes functions env variables available to those scripts.
 # Only variables beginging with "NACL_" are intended to be used by those
 # scripts!
 
@@ skipping 18 matching lines @@
 elif [ $OS_NAME = "Linux" ]; then
   readonly OS_SUBDIR="linux"
   readonly OS_SUBDIR_SHORT="linux"
   readonly OS_JOBS=4
 else
   readonly OS_SUBDIR="windows"
   readonly OS_SUBDIR_SHORT="win"
   readonly OS_JOBS=1
 fi
 
-# Get the desired bit size,
-# Note(robertm): we abuse this to introduce a "pnacl" flavor.
-export NACL_PACKAGES_BITSIZE=${NACL_PACKAGES_BITSIZE:-"32"}
-if [ ${NACL_PACKAGES_BITSIZE} = "32" ] ; then
-  readonly CROSS_ID=i686
-elif [ ${NACL_PACKAGES_BITSIZE} = "64" ] ; then
-  readonly CROSS_ID=x86_64
-elif [ ${NACL_PACKAGES_BITSIZE} = "pnacl" ] ; then
-  readonly CROSS_ID=pnacl
+# Set default NACL_ARCH based on legacy NACL_PACKAGES_BITSIZE
+if [ "${NACL_PACKAGES_BITSIZE:-}" = "64" ] ; then
+  export NACL_ARCH=${NACL_ARCH:-"x86_64"}
+elif [ "${NACL_PACKAGES_BITSIZE:-}" = "pnacl" ] ; then
+  export NACL_ARCH=${NACL_ARCH:-"pnacl"}
 else
-  echo "Unknown value for NACL_PACKAGES_BITSIZE: '${NACL_PACKAGES_BITSIZE}'" 1>&2
+  export NACL_ARCH=${NACL_ARCH:-"i686"}
+fi
+
+# Set NACL_LIBDIR: the name of the lib folder within the toolchain.
+# For arm and pnacl toolchains this is just 'lib'.  For the x86
+# toolchain this is lib32 or lib64
+if [ ${NACL_ARCH} = "i686" ] ; then
+  export NACL_LIBDIR=lib32
+elif [ ${NACL_ARCH} = "x86_64" ] ; then
+  export NACL_LIBDIR=lib64
+elif [ ${NACL_ARCH} = "arm" ] ; then
+  export NACL_LIBDIR=lib
+elif [ ${NACL_ARCH} = "pnacl" ] ; then
+  export NACL_LIBDIR=lib
+else
+  echo "Unknown value for NACL_ARCH: '${NACL_ARCH}'" 1>&2
   exit -1
 fi
 
-if [ ${NACL_PACKAGES_BITSIZE} = "32" ] ; then
+if [ ${NACL_ARCH} = "i686" ] ; then
   readonly NACL_SEL_LDR=${NACL_SDK_ROOT}/tools/sel_ldr_x86_32
   readonly NACL_IRT=${NACL_SDK_ROOT}/tools/irt_core_x86_32.nexe
 else
   # TODO(eugenis): Is this correct for PNACL?
   readonly NACL_SEL_LDR=${NACL_SDK_ROOT}/tools/sel_ldr_x86_64
   readonly NACL_IRT=${NACL_SDK_ROOT}/tools/irt_core_x86_64.nexe
 fi
 
 # NACL_CROSS_PREFIX is the prefix of the executables in the
 # toolchain's "bin" directory. For example: i686-nacl-<toolname>.
-if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ]; then
+if [ ${NACL_ARCH} = "pnacl" ]; then
   export NACL_CROSS_PREFIX=pnacl
 else
-  export NACL_CROSS_PREFIX=${CROSS_ID}-nacl
+  export NACL_CROSS_PREFIX=${NACL_ARCH}-nacl
 fi
 
 # configure spec for if MMX/SSE/SSE2/Assembly should be enabled/disabled
 # TODO: Currently only x86-32 will encourage MMX, SSE & SSE2 intrinsics
 #       and handcoded assembly.
-if [ $NACL_PACKAGES_BITSIZE = "32" ] ; then
+if [ $NACL_ARCH = "i686" ] ; then
   readonly NACL_OPTION="enable"
 else
   readonly NACL_OPTION="disable"
 fi
 
 if [ -z "${NACL_SDK_ROOT:-}" ]; then
   echo "-------------------------------------------------------------------"
   echo "NACL_SDK_ROOT is unset."
   echo "This environment variable needs to be pointed at some version of"
   echo "the Native Client SDK (the directory containing toolchain/)."
   echo "NOTE: set this to an absolute path."
   echo "-------------------------------------------------------------------"
   exit -1
 fi
 
 
 # sha1check python script
 readonly SHA1CHECK=${NACL_SRC}/build_tools/sha1check.py
 
 # packages subdirectories
 readonly NACL_PACKAGES_LIBRARIES=${NACL_PACKAGES}/libraries
 readonly NACL_PACKAGES_OUT=${NACL_SRC}/out
-readonly NACL_PACKAGES_REPOSITORY=${NACL_PACKAGES_OUT}/repository-${CROSS_ID}
+readonly NACL_PACKAGES_REPOSITORY=${NACL_PACKAGES_OUT}/repository-${NACL_ARCH}
 readonly NACL_PACKAGES_PUBLISH=${NACL_PACKAGES_OUT}/publish
 readonly NACL_PACKAGES_TARBALLS=${NACL_PACKAGES_OUT}/tarballs
 
 
 InitializeNaClGccToolchain() {
   # locate default nacl_sdk toolchain
   # TODO: x86 only at the moment
   NACL_GLIBC=${NACL_GLIBC:-0}
-  if [ $NACL_GLIBC = "1" ] ; then
+  if [ $NACL_ARCH = "arm" ] ; then
+    local TOOLCHAIN_ARCH="arm"
+  else
+    local TOOLCHAIN_ARCH="x86"
+  fi
+
+  if [ $NACL_ARCH = "arm" ] ; then
+    local TOOLCHAIN_DIR=${OS_SUBDIR_SHORT}_arm_newlib
+  elif [ $NACL_GLIBC = "1" ] ; then
     # m15-m17 SDK layouts have the glibc toolchain without the _glibc suffix
-    local TENTATIVE_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_glibc/bin/i686-nacl-gcc
-    local TENTATIVE_NEWLIB_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_newlib/bin/i686-nacl-gcc
+    local TENTATIVE_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_glibc/bin/${NACL_CROSS_PREFIX}-gcc
+    local TENTATIVE_NEWLIB_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_newlib/bin/${NACL_CROSS_PREFIX}-gcc
 
-    echo ${TENTATIVE_NACL_GCC}
     if [ -e ${TENTATIVE_NACL_GCC} ]; then
       local TOOLCHAIN_SUFFIX="_glibc"
     elif [ -e ${TENTATIVE_NEWLIB_NACL_GCC} ]; then
       local TOOLCHAIN_SUFFIX=""
     else
       # if neither _newlib or _glibc suffixes exist,
       # this is a pre-m15 release which has no glibc
       echo "------------------------------------------------------------------"
       echo "error: glibc toolchain not present"
       echo "Your SDK appears to be pre pepper_15, please upgrade to use glibc."
       echo "------------------------------------------------------------------"
       exit -1
     fi
+    local TOOLCHAIN_DIR=${OS_SUBDIR_SHORT}_x86${TOOLCHAIN_SUFFIX}
   else
     # Fall back to pre-m15 SDK layout if we can't find i686-nacl-gcc.
-    local TENTATIVE_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_newlib/bin/i686-nacl-gcc
+    local TENTATIVE_NACL_GCC=${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86_newlib/bin/${NACL_CROSS_PREFIX}-gcc
 
-    echo ${TENTATIVE_NACL_GCC}
     if [ -e ${TENTATIVE_NACL_GCC} ]; then
       local TOOLCHAIN_SUFFIX="_newlib"
     else
       local TOOLCHAIN_SUFFIX=""
     fi
+    local TOOLCHAIN_DIR=${OS_SUBDIR_SHORT}_x86${TOOLCHAIN_SUFFIX}
   fi
 
 
-  readonly NACL_TOOLCHAIN_ROOT=${NACL_TOOLCHAIN_ROOT:-${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR_SHORT}_x86${TOOLCHAIN_SUFFIX}}
+  readonly NACL_TOOLCHAIN_ROOT=${NACL_TOOLCHAIN_ROOT:-${NACL_SDK_ROOT}/toolchain/${TOOLCHAIN_DIR}}
   # TODO(robertm): can we get rid of NACL_SDK_BASE?
   readonly NACL_SDK_BASE=${NACL_SDK_BASE:-${NACL_TOOLCHAIN_ROOT}}
 
   readonly NACL_BIN_PATH=${NACL_TOOLCHAIN_ROOT}/bin
 
   # export nacl tools for direct use in patches.
   export NACLCC=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-gcc
   export NACLCXX=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-g++
   export NACLAR=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ar
   export NACLRANLIB=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ranlib
   export NACLLD=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ld
   export NACLSTRINGS=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
   export NACLSTRIP=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip
 
   # NACL_SDK_GCC_SPECS_PATH is where nacl-gcc 'specs' file will be installed
   readonly NACL_SDK_GCC_SPECS_PATH=${NACL_TOOLCHAIN_ROOT}/lib/gcc/x86_64-nacl/4.4.3
 
   # NACL_SDK_USR is where the headers, libraries, etc. will be installed
   readonly NACL_SDK_USR=${NACL_TOOLCHAIN_ROOT}/${NACL_CROSS_PREFIX}/usr
   readonly NACL_SDK_USR_INCLUDE=${NACL_SDK_USR}/include
-  readonly NACL_SDK_LIB=${NACL_TOOLCHAIN_ROOT}/x86_64-nacl/lib${NACL_PACKAGES_BITSIZE}
+  readonly NACL_SDK_LIB=${NACL_TOOLCHAIN_ROOT}/${NACL_ARCH}-nacl/${NACL_LIBDIR}
   readonly NACL_SDK_USR_LIB=${NACL_SDK_USR}/lib
   readonly NACL_SDK_USR_BIN=${NACL_SDK_USR}/bin
 
   # NACL_SDK_MULITARCH_USR is a version of NACL_SDK_USR that gets passed into
-  # the gcc specs file.  It has a gcc spec-file conditional for ${CROSS_ID}
+  # the gcc specs file.  It has a gcc spec-file conditional for ${NACL_ARCH}
   readonly NACL_SDK_MULTIARCH_USR=${NACL_TOOLCHAIN_ROOT}/\%\(nacl_arch\)/usr
   readonly NACL_SDK_MULTIARCH_USR_INCLUDE=${NACL_SDK_MULTIARCH_USR}/include
   readonly NACL_SDK_MULTIARCH_USR_LIB=${NACL_SDK_MULTIARCH_USR}/lib
 }
 
 
 InitializePNaClToolchain() {
   NACL_GLIBC=${NACL_GLIBC:-0}
   if [ $NACL_GLIBC = "1" ] ; then
     local TOOLCHAIN_SUFFIX="glibc"
@@ skipping 24 matching lines @@
   export NACLSTRINGS="$(which strings)"
 
   # NACL_SDK_USR is where the headers, libraries, etc. will be installed
   # FIXME:
   readonly NACL_SDK_USR=${NACL_SDK_BASE}/usr
   readonly NACL_SDK_USR_INCLUDE=${NACL_SDK_USR}/include
   readonly NACL_SDK_USR_LIB=${NACL_SDK_USR}/lib
   readonly NACL_SDK_USR_BIN=${NACL_SDK_USR}/bin
 }
 
-if [ ${NACL_PACKAGES_BITSIZE} = "pnacl" ] ; then
+if [ ${NACL_ARCH} = "pnacl" ] ; then
   InitializePNaClToolchain
 else
   InitializeNaClGccToolchain
 fi
 
 ######################################################################
 # Always run
 ######################################################################
 
 CheckPatchVersion() {
@@ skipping 274 matching lines @@
   export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
   export FREETYPE_CONFIG=${NACL_SDK_USR_BIN}/freetype-config
   export PATH=${NACL_BIN_PATH}:${PATH};
   ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
   Remove ${PACKAGE_NAME}-build
   MakeDir ${PACKAGE_NAME}-build
   cd ${PACKAGE_NAME}-build
   echo "Directory: $(pwd)"
 
   local conf_host=${NACL_CROSS_PREFIX}
-  if [[ ${NACL_PACKAGES_BITSIZE} == "pnacl" ]]; then
+  if [[ ${NACL_ARCH} = "pnacl" ]]; then
     # The PNaCl tools use "pnacl-" as the prefix, but config.sub
     # does not know about "pnacl".  It only knows about "le32-nacl".
     # Unfortunately, most of the config.subs here are so old that
     # it doesn't know about that "le32" either.  So we just say "nacl".
     conf_host="nacl"
   fi
   ../configure \
     --host=${conf_host} \
     --disable-shared \
     --prefix=${NACL_SDK_USR} \
@@ skipping 16 matching lines @@
   Banner "Build ${PACKAGE_NAME}"
   echo "Directory: $(pwd)"
   # assumes pwd has makefile
   make clean
   make -j${OS_JOBS}
 }
 
 
 DefaultTouchStep() {
   FULL_PACKAGE="${START_DIR/#${NACL_PACKAGES}\//}"
-  SENTFILE="${NACL_PACKAGES_OUT}/sentinels/bits${NACL_PACKAGES_BITSIZE}/${FULL_PACKAGE}"
+  SENTFILE="${NACL_PACKAGES_OUT}/sentinels/${NACL_ARCH}/${FULL_PACKAGE}"
   SENTDIR=$(dirname "${SENTFILE}")
   mkdir -p "${SENTDIR}" && touch "${SENTFILE}"
 }
 
 
 DefaultInstallStep() {
   # assumes pwd has makefile
   make install
   DefaultTouchStep
 }
 
 
 DefaultCleanUpStep() {
-  if [ ${NACL_PACKAGES_BITSIZE} != "pnacl" ] ; then
+  if [ ${NACL_ARCH} != "pnacl" -a ${NACL_ARCH} != "arm" ] ; then
     PatchSpecFile
   fi
   AddToInstallFile ${PACKAGE_NAME}
   ChangeDir ${SAVE_PWD}
 }
 
 
 RunCommand() {
   echo "$@"
   time "$@"
@@ skipping 70 matching lines @@
 DefaultPackageInstall() {
   DefaultPreInstallStep
   DefaultDownloadStep
   DefaultExtractStep
   DefaultPatchStep
   DefaultConfigureStep
   DefaultBuildStep
   DefaultInstallStep
   DefaultCleanUpStep
 }