[MIPS] Implementation of sel_ldr for MIPS architecture.

pnacl/build.sh

Index: pnacl/build.sh
diff --git a/pnacl/build.sh b/pnacl/build.sh
index c8c8ded41d90dd72a2aeb3ace4a5aebbd20f179f..686775dcd435e5b0b2a1c95d1da5c0dd365aac14 100755
--- a/pnacl/build.sh
+++ b/pnacl/build.sh
@@ -43,10 +43,12 @@ SetLogDirectory "${PNACL_ROOT}/build/log"
 readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}
 PNACL_PRUNE=${PNACL_PRUNE:-false}
 PNACL_BUILD_ARM=true
+PNACL_BUILD_MIPS=true

[Mark Seaborn, 2012/09/18 03:24:34]

Since PNaCl toolchain-build changes aren't covered by the commit queue (unless,
I think, a given changeset only make changes to the pnacl/ directory), can you
take out the changes to the pnacl/ dir from this change, please, and send them
in a separate change to jvoung + dschuff to review?  (Feel free to CC me on that
separated-out change.)  I'm not the best reviewer for the pnacl/ directory.

[petarj, 2012/09/19 17:27:51]

Removed. I will file a separate CL for this right after.

 
 if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then
   # We don't yet support building ARM tools for mac or windows.
   PNACL_BUILD_ARM=false
+  PNACL_BUILD_MIPS=true

[Mark Seaborn, 2012/09/18 03:24:34]

Did you mean 'false' here?  If not, this is unnecessary, since this is set to
'true' above.

[petarj, 2012/09/19 17:27:51]

Done.

 fi
 
 readonly SB_JIT=${SB_JIT:-false}
@@ -143,6 +145,7 @@ readonly INSTALL_LIB_NATIVE="${INSTALL_ROOT}/lib-"
 readonly INSTALL_LIB_ARM="${INSTALL_LIB_NATIVE}arm"
 readonly INSTALL_LIB_X8632="${INSTALL_LIB_NATIVE}x86-32"
 readonly INSTALL_LIB_X8664="${INSTALL_LIB_NATIVE}x86-64"
+readonly INSTALL_LIB_MIPS32="${INSTALL_LIB_NATIVE}mips32"
 
 # PNaCl client-translators (sandboxed) binary locations
 readonly INSTALL_TRANSLATOR="${TOOLCHAIN_ROOT}/pnacl_translator"
@@ -242,7 +245,7 @@ GetInstallDir() {
 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"
 
 # Current milestones in each repo
 
@@ -1783,6 +1786,27 @@ misc-tools() {
     StepBanner "MISC-TOOLS" "Skipping arm sel_ldr (No trusted arm toolchain)"
   fi
 
+  if ${PNACL_BUILD_MIPS} ; then
+    StepBanner "MISC-TOOLS" "Building sel_ldr (mips32)"
+    # TODO(petarj): revisit some of these options, remove werror when ready
+    spushd "${NACL_ROOT}"
+    RunWithLog mips32_sel_ldr \
+      ./scons MODE=opt-host \
+      platform=mips32 \
+      naclsdk_validate=0 \
+      sysinfo=0 \
+      werror=0 \
+      sel_ldr
+    rm -rf  "${INSTALL_ROOT}/tools-mips32"
+    mkdir "${INSTALL_ROOT}/tools-mips32"
+    local sconsdir="scons-out/opt-${SCONS_BUILD_PLATFORM}-mips32"
+    cp "${sconsdir}/obj/src/trusted/service_runtime/sel_ldr" \
+       "${INSTALL_ROOT}/tools-mips32"
+    spopd
+  else
+    StepBanner "MISC-TOOLS" "Skipping mips sel_ldr (No trusted mips32 toolchain)"
+  fi
+
   if ${BUILD_PLATFORM_LINUX} ; then
     rm -rf  "${INSTALL_ROOT}/tools-x86"
     mkdir "${INSTALL_ROOT}/tools-x86"