diff options
| -rw-r--r-- | build/config/compiler/BUILD.gn | 3 | ||||
| -rw-r--r-- | docs/linux_chromium_arm.md | 17 | ||||
| -rw-r--r-- | mojo/runner/host/linux_sandbox.cc | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 08d10a4..ca65333 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -53,7 +53,7 @@ declare_args() { # TODO(GYP): We should be using 64-bit gold for linking on both 64-bit Linux # and 32-bit linux; 32-bit Gold runs out of address-space on 32-bit builds. # However, something isn't quite working right on the 32-bit builds. - use_gold = is_linux && current_cpu == "x64" + use_gold = is_linux && (current_cpu == "x64" || current_cpu == "arm") # When we are going to use gold we need to find it. # This is initialized below, after use_gold might have been overridden. @@ -553,6 +553,7 @@ config("compiler_cpu_abi") { "-arch", "arm-nonsfi", "--pnacl-bias=arm-nonsfi", + "--target=arm-unknown-nacl", ] ldflags += [ "-arch", diff --git a/docs/linux_chromium_arm.md b/docs/linux_chromium_arm.md index ea465d4..da5114c 100644 --- a/docs/linux_chromium_arm.md +++ b/docs/linux_chromium_arm.md @@ -4,13 +4,7 @@ ## Recipe1: Building for an ARM CrOS device -This recipe uses `ninja` (instead of `make`) so its startup time is much lower -(sub-1s, instead of tens of seconds), is integrated with goma (for -google-internal users) for very high parallelism, and uses `sshfs` instead of -`scp` to significantly speed up the compile-run cycle. It has moved to https://sites.google.com/a/chromium.org/dev/developers/how-tos/-quickly-building-for-cros-arm-x64 -(mostly b/c of the ease of attaching files to sites). - ## Recipe2: Explicit Cross compiling @@ -40,13 +34,14 @@ To install the sysroot manually you can run: ### Building To build for ARM, using the clang binary in the chrome tree, use the following -settings: +gn args: + + target_cpu = "arm" - export GYP_CROSSCOMPILE=1 - export GYP_DEFINES="target_arch=arm" +Or the following gyp settings: -There variables need to be set at gyp-time (when you run `gyp_chromium`), -but are not needed at build-time (when you run make/ninja). + GYP_CROSSCOMPILE=1 + GYP_DEFINES="target_arch=arm" ## Testing diff --git a/mojo/runner/host/linux_sandbox.cc b/mojo/runner/host/linux_sandbox.cc index 23b8443..20f7ba8 100644 --- a/mojo/runner/host/linux_sandbox.cc +++ b/mojo/runner/host/linux_sandbox.cc @@ -83,7 +83,11 @@ class SandboxPolicy : public sandbox::BaselinePolicy { case __NR_sched_getaffinity: return sandbox::RestrictSchedTarget(policy_pid(), sysno); case __NR_ftruncate: +#if defined(__NR_getrlimit) + // __NR_getrlimit does not exist on all systems (e.g. in the arm/linux + // build). case __NR_getrlimit: +#endif case __NR_uname: case __NR_getsockopt: case __NR_setsockopt: |