fix crashpad issue on aarch64

This commit is contained in:
Tom Callaway 2018-06-04 15:04:58 -04:00
parent 3bfff4f3c2
commit 022abfe75f
2 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff -up chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
--- chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix 2018-06-04 14:58:04.730083967 -0400
+++ chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S 2018-06-04 14:58:24.896572816 -0400
@@ -288,7 +288,7 @@ CAPTURECONTEXT_SYMBOL2:
#elif defined(__aarch64__)
// Zero out fault_address, which is unused.
- str x31, [x0, #0xb0] // context->uc_mcontext.fault_address
+ str xzr, [x0, #0xb0] // context->uc_mcontext.fault_address
// Save general purpose registers in context->uc_mcontext.regs[i].
// The original x0 can't be recovered.
diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h

View File

@ -252,6 +252,8 @@ Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.pa
# instead of the preferred alignment. This means int64_t is now 4 on i686 (instead of 8).
# Use __alignof__ to get the value we expect (and chromium checks for).
Patch98: chromium-66.0.3359.170-gcc8-alignof.patch
# https://chromium.googlesource.com/crashpad/crashpad/+/26ef5c910fc7e2edb441f1d2b39944195342dee9
Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@ -749,6 +751,7 @@ udev.
# %%patch96 -p1 -b .flatsetfix
# %%patch97 -p1 -b .arm-init-fix
%patch98 -p1 -b .gcc8-alignof
%patch99 -p1 -b .crashpad-aarch64-fix
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works