From 8e8be001cb06aa9b5389c7bceab183ac06fdc6b3 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Thu, 20 Aug 2015 14:30:38 +0000 Subject: Add user_regs_struct and user_fpsimd_struct for aarch64 on Android. Android's sys/user.h is missing user_regs_struct and user_fpsimd_struct. Add them to the Android specific user.h used by breakpad to workaround Android / glibc compatibility issues. A bug has been filed on the Android NDK team to add the missing structures to the NDK, at which point this hack can be removed. Also remove the mxcsr_mask hack on x64, which is no longer required since we have moved to the r10d NDK which fixes this issue. R=primiano@chromium.org Review URL: https://codereview.chromium.org/1291983003 . git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1495 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/android/include/sys/user.h | 41 ++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'src/common/android') diff --git a/src/common/android/include/sys/user.h b/src/common/android/include/sys/user.h index 24a0243a..5f036047 100644 --- a/src/common/android/include/sys/user.h +++ b/src/common/android/include/sys/user.h @@ -34,29 +34,14 @@ // glibc) and therefore avoid doing otherwise awkward #ifdefs in the code. // The following quirks are currently handled by this file: // - i386: Use the Android NDK but alias user_fxsr_struct > user_fpxregs_struct. -// - x86_64: Override a typo in user_fpregs_struct (mxcsr_mask -> mxcr_mask). -// The typo has been fixed in NDK r10d, but a preprocessor workaround is -// required to make breakpad build with r10c and lower (more details below). +// - aarch64: Add missing user_regs_struct and user_fpsimd_struct structs. // - Other platforms: Just use the Android NDK unchanged. -// TODO(primiano): remove this after Chromium has stably rolled to NDK r10d. -// Historical context: NDK releases < r10d had a typo in sys/user.h (mxcsr_mask -// instead of mxcr_mask), which is fixed in r10d. However, just switching to use -// the correct one (mxcr_mask) would put Breakpad in a state where it can be -// rolled in chromium only atomically with the r10d NDK. A revert of either -// project (android_tools, breakpad) would make the other one unrollable. -// This hack makes breakpad code compatible with both r10c and r10d NDKs, -// reducing the dependency entangling with android_tools. -#if defined(__x86_64__) -#define mxcsr_mask mxcr_mask -#endif +// TODO(primiano): remove these changes after Chromium has stably rolled to +// an NDK with the appropriate fixes. #include_next -#if defined(__x86_64__) -#undef mxcsr_mask -#endif - #ifdef __i386__ #ifdef __cplusplus extern "C" { @@ -67,4 +52,24 @@ typedef struct user_fxsr_struct user_fpxregs_struct; #endif // __cplusplus #endif // __i386__ +#ifdef __aarch64__ +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus +struct user_regs_struct { + __u64 regs[31]; + __u64 sp; + __u64 pc; + __u64 pstate; +}; +struct user_fpsimd_struct { + __uint128_t vregs[32]; + __u32 fpsr; + __u32 fpcr; +}; +#ifdef __cplusplus +} // extern "C" +#endif // __cplusplus +#endif // __aarch64__ + #endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H -- cgit v1.2.1