[MIPS] Adding validator for MIPS architecture.

pnacl/build.sh

 #!/bin/bash

[(google.com) Derek Schuff, 2012/04/12 16:46:39]

The build.sh changes appear to be partly focused on building binutils (which
belongs in a separate CL) and partly just adding the mips validator to the pnacl
package (which also does not need to be in this CL). So I think this whole file
should be removed for now.

[petarj, 2012/04/12 17:38:17]

Changes that enable building binutils for MIPS should land before or at the same
time with validator-mips changes, so validator tests can be compiled. I can
create a separate CL with just these changes for build.sh for binutils, if that
is the way it is preferred.

[(google.com) Derek Schuff, 2012/04/12 17:54:22]

true, but I don't see any validator tests in this CL that require binutils.
edit: nevermind, I was looking for (and not finding) a nacl.scons file. Didn't
see the compile_tests.sh. Perhaps that should be fixed as well.

however, changes to build binutils should still be in a separate CL.
Unfortunately you also can't land build.sh changes in the same CL as the
binutils changes themselves (different repo), so they can just be reviewed as a
2-CL unit.

On 2012/04/12 17:38:17, petarj wrote:

 # 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.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 ######################################################################
 # Directory Layout Description
@@ skipping 27 matching lines @@
 SetScriptPath "${PNACL_ROOT}/build.sh"
 SetLogDirectory "${PNACL_ROOT}/build/log"
 
 # For different levels of make parallelism change this in your env
 readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}
 # If true, we are in the middle of a merge.  Do not update the llvm branch
 # (except for clang, which has no local mods).
 readonly PNACL_MERGE_TESTING=${PNACL_MERGE_TESTING:-false}
 PNACL_PRUNE=${PNACL_PRUNE:-false}
 PNACL_BUILD_ARM=true
+# PNACL_BUILD_MIPS=true
 
 if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then
   # We don't yet support building ARM tools for mac or windows.

[Brad Chen, 2012/04/12 00:51:34]

Please update this comment.

[petarj, 2012/04/12 13:21:01]

Ok.

   PNACL_BUILD_ARM=false
+  PNACL_BUILD_MIPS=false
 fi
 
 readonly SB_JIT=${SB_JIT:-false}
 
 # TODO(pdox): Decide what the target should really permanently be
 readonly CROSS_TARGET_ARM=arm-none-linux-gnueabi
-readonly BINUTILS_TARGET=arm-pc-nacl
+readonly BINUTILS_TARGET=pc-nacl
 readonly REAL_CROSS_TARGET=pnacl
 readonly NACL64_TARGET=x86_64-nacl
 
 readonly DRIVER_DIR="${PNACL_ROOT}/driver"
 readonly ARM_ARCH=armv7-a
 readonly ARM_FPU=vfp
 
 readonly TOOLCHAIN_ROOT="${NACL_ROOT}/toolchain"
 
 readonly NNACL_BASE="${TOOLCHAIN_ROOT}/${SCONS_BUILD_PLATFORM}_x86"
@@ skipping 167 matching lines @@
 # separately, one for each architecture, so that each translator
 # can only target its own architecture.
 #
 # If SBTC_PRODUCTION is false, then we instead use PNaCl to
 # build a `fat` translator which can target all supported
 # architectures. This translator is built as a .pexe
 # which can then be translated to each individual architecture.
 SBTC_PRODUCTION=${SBTC_PRODUCTION:-false}
 
 # Which toolchain to use for each arch.
-SBTC_BUILD_WITH_PNACL="armv7 i686 x86_64"
+SBTC_BUILD_WITH_PNACL="armv7 mips32 i686 x86_64"
 if ${PNACL_IN_CROS_CHROOT}; then
-  SBTC_BUILD_WITH_PNACL="armv7"
+  SBTC_BUILD_WITH_PNACL="armv7 mips32"
 fi
 
 # Current milestones in each repo
 readonly UPSTREAM_REV=${UPSTREAM_REV:-4dd3419f60be}
 
 readonly NEWLIB_REV=346ea38d142f
 readonly BINUTILS_REV=f44074cff866
 readonly GOLD_REV=906eebd9b894
 readonly COMPILER_RT_REV=1a3a6ffb31ea
 
@@ skipping 542 matching lines @@
   # This is needed to build misc-tools and run ARM tests.
   # We check this early so that there are no surprises later, and we can
   # handle all user interaction early.
   check-for-trusted
 
   clean-install
 
   clean-logs
 
   llvm
-  binutils
+  binutils arm
+  binutils mipsel
   binutils-gold
 
   driver
 
   libs
 
   # NOTE: we delay the tool building till after the sdk is essentially
   #      complete, so that sdk sanity checks don't fail
   misc-tools
   verify
@@ skipping 999 matching lines @@
       sysinfo=0 \
       arm-ncval-core
     rm -rf  "${INSTALL_ROOT}/tools-x86"
     mkdir "${INSTALL_ROOT}/tools-x86"
     cp ${SCONS_OUT}/opt-linux-x86-32-to-arm/obj/src/trusted/validator_arm/\
 arm-ncval-core ${INSTALL_ROOT}/tools-x86
     spopd
   else
     StepBanner "MISC-ARM" "Skipping ARM validator (Not yet supported on Mac)"
   fi
+
+  if ${BUILD_PLATFORM_LINUX} ; then
+    StepBanner "MISC-MIPS" "Building validator (MIPS32)"
+    spushd "${NACL_ROOT}"
+    RunWithLog mips_ncval_core \
+      ./scons MODE=opt-host \
+      targetplatform=mips32 \
+      sysinfo=0 \
+     mips-ncval-core
+    cp scons-out/opt-linux-x86-32-to-mips32/obj/src/trusted/validator_mips/\
+mips-ncval-core ${INSTALL_ROOT}/tools-x86/mips-ncval-core
+    spopd
+  else
+    StepBanner "MISC-MIPS" "Skipping MIPS validator (Not yet supported on Mac)"
+  fi
 }
 
 #########################################################################
 #     < LIBELF >
 #########################################################################
 #+ libelf-host           - Build and install libelf (using the host CC)
 libelf-host() {
   StepBanner "LIBELF-HOST" "Building and installing libelf"
 
   local extra_headers=false
@@ skipping 37 matching lines @@
       "${PNACL_ROOT}"/libelf/build-libelf.sh
 }
 
 #########################################################################
 #     < BINUTILS >
 #########################################################################
 
 #+-------------------------------------------------------------------------
 #+ binutils          - Build and install binutils (cross-tools)
 binutils() {
-  StepBanner "BINUTILS (HOST)"
+  local arch=$1
+  StepBanner "BINUTILS (HOST) for ${arch}"
 
   local srcdir="${TC_SRC_BINUTILS}"
 
   assert-dir "${srcdir}" "You need to checkout binutils."
 
-  if binutils-needs-configure; then
-    binutils-clean
-    binutils-configure
+  if binutils-needs-configure ${arch}; then
+    binutils-clean ${arch}
+    binutils-configure ${arch}
   else
     SkipBanner "BINUTILS" "configure"
   fi
 
-  binutils-dlwrap
-  binutils-make
-  binutils-install
+  binutils-dlwrap  ${arch}
+  binutils-make    ${arch}
+  binutils-install ${arch}
 }
 
 #+ binutils-clean    - Clean binutils
 binutils-clean() {
+  local arch=$1
   StepBanner "BINUTILS" "Clean"
-  local objdir="${TC_BUILD_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}-${arch}"
   rm -rf ${objdir}
 }
 
 binutils-dlwrap() {
+  local arch=$1
   local srcdir="${TC_SRC_BINUTILS}"
-  local objdir="${TC_BUILD_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}-${arch}"
 
   if ! [ -f "${LLVM_GOLD_PLUGIN}" ]; then
     Fatal "LLVM must be installed before building binutils."
   fi
 
   # Build libdlwrap.a
   mkdir -p "${objdir}/dlwrap"
   spushd "${objdir}/dlwrap"
   ${CC} -c "${srcdir}"/dlwrap/dlwrap.c -o dlwrap.o
   cp "${LLVM_GOLD_PLUGIN}" gold_plugin_static.o
   ${AR} crs libdlwrap.a dlwrap.o gold_plugin_static.o
   spopd
 }
 
-#+ binutils-configure- Configure binutils for ARM
+#+ binutils-configure- Configure binutils for ARM or MIPS
 binutils-configure() {
+  local arch=$1
+  local enable_gold='yes'
+  if [ ${arch} == 'mips' ]; then
+    enable_gold='no'
+  fi
   StepBanner "BINUTILS" "Configure"
 
   local srcdir="${TC_SRC_BINUTILS}"
-  local objdir="${TC_BUILD_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}-${arch}"
 
   # enable multiple targets so that we can use the same ar with all .o files
   local targ="arm-pc-nacl,i686-pc-nacl,x86_64-pc-nacl"
   mkdir -p "${objdir}"
   spushd "${objdir}"
 
   # The --enable-gold and --enable-plugins options are on so that we
   # can use gold's support for plugin to link PNaCl modules.
 
   # TODO(pdox): Building binutils for nacl/nacl64 target currently requires
   # providing NACL_ALIGN_* defines. This should really be defined inside
   # binutils instead.
   local flags="-DNACL_ALIGN_BYTES=32 -DNACL_ALIGN_POW2=5 \
                -I${TC_SRC_BINUTILS}/dlwrap -DENABLE_DLWRAP"
-  RunWithLog binutils.configure \
+  RunWithLog binutils-${arch}.configure \
     env -i \
     PATH="/usr/bin:/bin" \
     CC="${CC}" \
     CXX="${CXX}" \
     LDFLAGS="-L${objdir}/dlwrap" \
     CFLAGS="${flags}" \
     CXXFLAGS="${flags}" \
     ${srcdir}/binutils-2.20/configure --prefix="${BINUTILS_INSTALL_DIR}" \
-                                      --target=${BINUTILS_TARGET} \
+                                      --target=${arch}-${BINUTILS_TARGET} \
                                       --enable-targets=${targ} \
-                                      --enable-gold=yes \
+                                      --enable-gold=${enable_gold} \
                                       --enable-ld=yes \
                                       --enable-plugins \
                                       --disable-werror \
                                       --with-sysroot="${NONEXISTENT_PATH}"
   # There's no point in setting the correct path as sysroot, because we
   # want the toolchain to be relocatable. The driver will use ld command-line
   # option --sysroot= to override this value and set it to the correct path.
   # However, we need to include --with-sysroot during configure to get this
   # option. So fill in a non-sense, non-existent path.
 
   spopd
 }
 
 binutils-needs-configure() {
-  [ ! -f "${TC_BUILD_BINUTILS}/config.status" ]
+  local arch=$1
+  [ ! -f "${TC_BUILD_BINUTILS}-${arch}/config.status" ]
   return $?
 }
 
-#+ binutils-make     - Make binutils for ARM
+#+ binutils-make     - Make binutils for ARM or MIPS
 binutils-make() {
+  local arch=$1
   StepBanner "BINUTILS" "Make"
   local srcdir="${TC_SRC_BINUTILS}"
-  local objdir="${TC_BUILD_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}-${arch}"
   spushd "${objdir}"
 
   ts-touch-open "${objdir}"
 
-  RunWithLog binutils.make \
+  RunWithLog binutils-${arch}.make \
     env -i PATH="/usr/bin:/bin" \
     make ${MAKE_OPTS}
 
   ts-touch-commit "${objdir}"
 
   spopd
 }
 
-#+ binutils-install  - Install binutils for ARM
+#+ binutils-install  - Install binutils for ARM or MIPS
 binutils-install() {
+  local arch=$1
   StepBanner "BINUTILS" "Install"
-  local objdir="${TC_BUILD_BINUTILS}"
+  local objdir="${TC_BUILD_BINUTILS}-${arch}"
   spushd "${objdir}"
 
-  RunWithLog binutils.install \
+  RunWithLog binutils-${arch}.install \
     env -i PATH="/usr/bin:/bin" \
     make \
       install ${MAKE_OPTS}
 
   spopd
 }
 
 #+-------------------------------------------------------------------------
 #+ binutils-liberty      - Build native binutils libiberty
 binutils-liberty() {
@@ skipping 243 matching lines @@
 
   StepBanner "LLVM-SB" "Configure ${SB_ARCH} ${SB_SRPCMODE}"
   local srcdir="${TC_SRC_LLVM}"
   local objdir="${LLVM_SB_OBJDIR}"
   local installdir="${SB_INSTALL_DIR}"
   local targets=""
   case ${SB_ARCH} in
     i686) targets=x86 ;;
     x86_64) targets=x86_64 ;;
     armv7) targets=arm ;;
-    universal) targets=x86,x86_64,arm ;;
+    mips32) targets=mips ;;
+    universal) targets=x86,x86_64,arm,mips ;;
   esac
 
   spushd "${objdir}"
   RunWithLog \
       ${LLVM_SB_LOG_PREFIX}.configure \
       env -i \
       PATH="/usr/bin:/bin" \
       ${srcdir}/configure \
         "${LLVM_SB_CONFIGURE_ENV[@]}" \
         --prefix=${installdir} \
@@ skipping 168 matching lines @@
     RANLIB="${PNACL_RANLIB}" \
     LDFLAGS_FOR_BUILD="-L${TC_BUILD_BINUTILS_LIBERTY}/libiberty/" \
     LDFLAGS="")
 
 
   case ${SB_ARCH} in
     i686)      BINUTILS_SB_ELF_TARGETS=i686-pc-nacl ;;
     x86_64)    BINUTILS_SB_ELF_TARGETS=x86_64-pc-nacl ;;
     armv7)     BINUTILS_SB_ELF_TARGETS=arm-pc-nacl ;;
     universal) BINUTILS_SB_ELF_TARGETS=arm-pc-nacl,i686-pc-nacl,x86_64-pc-nacl ;;
+    mips32)    BINUTILS_SB_ELF_TARGETS=mipsel-pc-nacl ;;
   esac
 }
 
 #+-------------------------------------------------------------------------
 #+ binutils-sb <arch> <mode> - Build and install binutils (sandboxed)
 binutils-sb() {
   binutils-sb-setup "$@"
   StepBanner "BINUTILS-SB" "Sandboxed ld [${SB_LABEL}]"
 
   local srcdir="${TC_SRC_BINUTILS}"
@@ skipping 42 matching lines @@
 
   spushd "${objdir}"
   RunWithLog \
       ${BINUTILS_SB_LOG_PREFIX}.configure \
       env -i \
       PATH="/usr/bin:/bin" \
       ${srcdir}/binutils-2.20/configure \
         "${BINUTILS_SB_CONFIGURE_ENV[@]}" \
         --prefix=${installdir} \
         --host=nacl \
-        --target=${BINUTILS_TARGET} \
+        --target=${BINUTILS_SB_ARCH}-${BINUTILS_TARGET} \
         --enable-targets=${BINUTILS_SB_ELF_TARGETS} \
         --disable-nls \
         --disable-werror \
         --disable-plugins \
         --enable-static \
         --enable-shared=no
   spopd
 }
 
 binutils-sb-needs-make() {
@@ skipping 695 matching lines @@
   local libmode=$1
   check-libmode ${libmode}
   local destdir="${INSTALL_ROOT}/${libmode}/bin"
 
   driver-install-python "${destdir}" "pnacl-*.py"
 
   # Tell the driver the library mode
   echo "LIBMODE=${libmode}" > "${destdir}"/driver.conf
 
   # Install readelf and size
-  cp -a "${BINUTILS_INSTALL_DIR}/bin/${BINUTILS_TARGET}-readelf" \
+  cp -a "${BINUTILS_INSTALL_DIR}/bin/arm-${BINUTILS_TARGET}-readelf" \

[Brad Chen, 2012/04/12 00:51:34]

Why do these names need to be changed? Where are the MIPS versions installed?

[petarj, 2012/04/12 13:21:01]

This patch tends to contain minimal (yet self-sufficient) set of changes that
are needed for MIPS validator testing. Thus, not all changes for this script
have been included.
With this change, binutils build produces '$ARCH-pc-nacl-executables', see the
changes at L61 and L1906:1924 in this file.

         "${destdir}/readelf"
-  cp -a "${BINUTILS_INSTALL_DIR}/bin/${BINUTILS_TARGET}-size" \
+  cp -a "${BINUTILS_INSTALL_DIR}/bin/arm-${BINUTILS_TARGET}-size" \
         "${destdir}/size"
 
   # On windows, copy the cygwin DLLs needed by the driver tools
   if ${BUILD_PLATFORM_WIN}; then
     StepBanner "DRIVER" "Copying cygwin libraries"
     local deps="gcc_s-1 iconv-2 win1 intl-8 stdc++-6 z"
     for name in ${deps}; do
       cp "/bin/cyg${name}.dll" "${destdir}"
     done
   fi
@@ skipping 590 matching lines @@
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 hg-migrate
 
 "$@"