diff options
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/sandbox_linux.gypi | 5 | ||||
| -rw-r--r-- | sandbox/linux/seccomp-bpf/syscall.cc | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi index da77077..366e55a 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -77,11 +77,6 @@ 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], - 'ldflags!': [ - # Remove warnings about text relocations, to prevent build - # failure. - '-Wl,--warn-shared-textrel' - ], }], ], }, diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc index 0b5cbcc..fd599e8 100644 --- a/sandbox/linux/seccomp-bpf/syscall.cc +++ b/sandbox/linux/seccomp-bpf/syscall.cc @@ -143,7 +143,7 @@ namespace sandbox { // used as a marker that BPF code inspects. "cmp r0, #0\n" "bge 1f\n" - "ldr r0, =2f\n" + "adr r0, 2f\n" "b 2f\n" // We declared (almost) all clobbered registers to the compiler. On // ARM there is no particular register pressure. So, we can go |