| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 # | 5 # |
| 6 #@ Untrusted Toolchain Manager | 6 #@ Untrusted Toolchain Manager |
| 7 #@------------------------------------------------------------------- | 7 #@------------------------------------------------------------------- |
| 8 #@ This script builds the ARM and PNaCl untrusted toolchains. | 8 #@ This script builds the ARM and PNaCl untrusted toolchains. |
| 9 #@ It MUST be run from the native_client/ directory. | 9 #@ It MUST be run from the native_client/ directory. |
| 10 ###################################################################### | 10 ###################################################################### |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 SetScriptPath "${PNACL_ROOT}/build.sh" | 39 SetScriptPath "${PNACL_ROOT}/build.sh" |
| 40 SetLogDirectory "${PNACL_ROOT}/build/log" | 40 SetLogDirectory "${PNACL_ROOT}/build/log" |
| 41 | 41 |
| 42 # For different levels of make parallelism change this in your env | 42 # For different levels of make parallelism change this in your env |
| 43 readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8} | 43 readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8} |
| 44 # If true, we are in the middle of a merge. Do not update the llvm branch | 44 # If true, we are in the middle of a merge. Do not update the llvm branch |
| 45 # (except for clang, which has no local mods). | 45 # (except for clang, which has no local mods). |
| 46 readonly PNACL_MERGE_TESTING=${PNACL_MERGE_TESTING:-false} | 46 readonly PNACL_MERGE_TESTING=${PNACL_MERGE_TESTING:-false} |
| 47 PNACL_PRUNE=${PNACL_PRUNE:-false} | 47 PNACL_PRUNE=${PNACL_PRUNE:-false} |
| 48 PNACL_BUILD_ARM=true | 48 PNACL_BUILD_ARM=true |
| 49 # PNACL_BUILD_MIPS=true |
| 49 | 50 |
| 50 if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then | 51 if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then |
| 51 # We don't yet support building ARM tools for mac or windows. | 52 # We don't yet support building ARM tools for mac or windows. |
| 52 PNACL_BUILD_ARM=false | 53 PNACL_BUILD_ARM=false |
| 54 PNACL_BUILD_MIPS=false |
| 53 fi | 55 fi |
| 54 | 56 |
| 55 readonly SB_JIT=${SB_JIT:-false} | 57 readonly SB_JIT=${SB_JIT:-false} |
| 56 | 58 |
| 57 # TODO(pdox): Decide what the target should really permanently be | 59 # TODO(pdox): Decide what the target should really permanently be |
| 58 readonly CROSS_TARGET_ARM=arm-none-linux-gnueabi | 60 readonly CROSS_TARGET_ARM=arm-none-linux-gnueabi |
| 59 readonly BINUTILS_TARGET=arm-pc-nacl | 61 readonly BINUTILS_TARGET=arm-pc-nacl |
| 60 readonly REAL_CROSS_TARGET=pnacl | 62 readonly REAL_CROSS_TARGET=pnacl |
| 61 readonly NACL64_TARGET=x86_64-nacl | 63 readonly NACL64_TARGET=x86_64-nacl |
| 62 | 64 |
| (...skipping 2014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2077 sysinfo=0 \ | 2079 sysinfo=0 \ |
| 2078 arm-ncval-core | 2080 arm-ncval-core |
| 2079 rm -rf "${INSTALL_ROOT}/tools-x86" | 2081 rm -rf "${INSTALL_ROOT}/tools-x86" |
| 2080 mkdir "${INSTALL_ROOT}/tools-x86" | 2082 mkdir "${INSTALL_ROOT}/tools-x86" |
| 2081 cp ${SCONS_OUT}/opt-linux-x86-32-to-arm/obj/src/trusted/validator_arm/\ | 2083 cp ${SCONS_OUT}/opt-linux-x86-32-to-arm/obj/src/trusted/validator_arm/\ |
| 2082 arm-ncval-core ${INSTALL_ROOT}/tools-x86 | 2084 arm-ncval-core ${INSTALL_ROOT}/tools-x86 |
| 2083 spopd | 2085 spopd |
| 2084 else | 2086 else |
| 2085 StepBanner "MISC-ARM" "Skipping ARM validator (Not yet supported on Mac)" | 2087 StepBanner "MISC-ARM" "Skipping ARM validator (Not yet supported on Mac)" |
| 2086 fi | 2088 fi |
| 2089 |
| 2090 if ${BUILD_PLATFORM_LINUX} ; then |
| 2091 StepBanner "MISC-MIPS" "Building validator (MIPS)" |
| 2092 spushd "${NACL_ROOT}" |
| 2093 RunWithLog mips_ncval_core \ |
| 2094 ./scons MODE=opt-host \ |
| 2095 targetplatform=mips \ |
| 2096 sysinfo=0 \ |
| 2097 mips-ncval-core |
| 2098 cp scons-out/opt-linux-x86-32-to-mips/obj/src/trusted/validator_mips/\ |
| 2099 mips-ncval-core ${INSTALL_ROOT}/tools-x86/mips-ncval-core |
| 2100 spopd |
| 2101 else |
| 2102 StepBanner "MISC-MIPS" "Skipping MIPS validator (Not yet supported on Mac)" |
| 2103 fi |
| 2087 } | 2104 } |
| 2088 | 2105 |
| 2089 ######################################################################### | 2106 ######################################################################### |
| 2090 # < LIBELF > | 2107 # < LIBELF > |
| 2091 ######################################################################### | 2108 ######################################################################### |
| 2092 #+ libelf-host - Build and install libelf (using the host CC) | 2109 #+ libelf-host - Build and install libelf (using the host CC) |
| 2093 libelf-host() { | 2110 libelf-host() { |
| 2094 StepBanner "LIBELF-HOST" "Building and installing libelf" | 2111 StepBanner "LIBELF-HOST" "Building and installing libelf" |
| 2095 | 2112 |
| 2096 local extra_headers=false | 2113 local extra_headers=false |
| (...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3970 #Usage | 3987 #Usage |
| 3971 echo "ERROR: unknown function '$1'." >&2 | 3988 echo "ERROR: unknown function '$1'." >&2 |
| 3972 echo "For help, try:" | 3989 echo "For help, try:" |
| 3973 echo " $0 help" | 3990 echo " $0 help" |
| 3974 exit 1 | 3991 exit 1 |
| 3975 fi | 3992 fi |
| 3976 | 3993 |
| 3977 hg-migrate | 3994 hg-migrate |
| 3978 | 3995 |
| 3979 "$@" | 3996 "$@" |
| OLD | NEW |