| Index: pnacl/build.sh
|
| diff --git a/pnacl/build.sh b/pnacl/build.sh
|
| index 291faf7aea48ad3d4bb264d6c6580255a256bd82..e1acf299cc6c3e8fda8ebc23abd587bc081876bb 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
|
|
|
| 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
|
| fi
|
|
|
| readonly SB_JIT=${SB_JIT:-false}
|
| @@ -142,6 +144,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"
|
| @@ -241,7 +244,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"
|
|
|