Skip to content

Commit

Permalink
Ensure all targets build when target_arch="arm" and target_os="linux"
Browse files Browse the repository at this point in the history
Also requires these third party changes:
https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1060155
https://chromium-review.googlesource.com/c/native_client/src/native_client/+/1060158

BUG=843240
R=thakis
TBR=wfh

Change-Id: I9288967e238ab5319e1c963fffd58b9fe4be3692
Reviewed-on: https://chromium-review.googlesource.com/1060129
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558953}
  • Loading branch information
tanderson-google authored and Commit Bot committed May 16, 2018
1 parent 274455d commit 0ae1244
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions chrome/installer/linux/rpm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ cd "${OUTPUTDIR}"
case "$TARGETARCH" in
arm )
export ARCHITECTURE="armhf"
stage_install_rpm
;;
ia32 )
export ARCHITECTURE="i386"
Expand Down
3 changes: 2 additions & 1 deletion sandbox/win/src/crosscall_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <stddef.h>
#include <stdint.h>

#include "base/compiler_specific.h"
#include "sandbox/win/src/crosscall_params.h"
#include "sandbox/win/src/sandbox.h"

Expand Down Expand Up @@ -150,7 +151,7 @@ class CopyHelper<const wchar_t*> {
// We provide our not very optimized version of wcslen(), since we don't
// want to risk having the linker use the version in the CRT since the CRT
// might not be present when we do an early IPC call.
static size_t __cdecl StringLength(const wchar_t* wcs) {
static size_t CDECL StringLength(const wchar_t* wcs) {
const wchar_t* eos = wcs;
while (*eos++)
;
Expand Down
2 changes: 1 addition & 1 deletion third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
#endif // !PTRACE_GET_THREAD_AREA && !PT_GET_THREAD_AREA && defined(__GLIBC__)

// https://sourceware.org/bugzilla/show_bug.cgi?id=22433
#if !defined(PTRACE_GETVFPREGS) && \
#if !defined(PTRACE_GETVFPREGS) && !defined(PT_GETVFPREGS) && \
defined(__GLIBC__) && (defined(__arm__) || defined(__arm64__))
static constexpr __ptrace_request PTRACE_GETVFPREGS =
static_cast<__ptrace_request>(27);
Expand Down

0 comments on commit 0ae1244

Please sign in to comment.