mirror of
https://github.com/chromium/crashpad.git
synced 2025-03-09 14:06:33 +00:00
Use __aarch64__ instead of __arm64__
__aarch64__ should always be defined for 64-bit ARM, while __arm64__ only sometimes is. Change-Id: I46a6469d8f5e74ad79b6ded51a809fbf88e5170a Reviewed-on: https://chromium-review.googlesource.com/1151541 Reviewed-by: Mark Mentovai <mark@chromium.org> Commit-Queue: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
parent
52ff1accbb
commit
063ff78a25
@ -26,7 +26,7 @@
|
||||
static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
|
||||
static_cast<__ptrace_request>(25);
|
||||
#define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
|
||||
static_cast<__ptrace_request>(22);
|
||||
#define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
|
||||
@ -42,7 +42,7 @@ static constexpr __ptrace_request PTRACE_GET_THREAD_AREA_3264 =
|
||||
|
||||
// https://sourceware.org/bugzilla/show_bug.cgi?id=22433
|
||||
#if !defined(PTRACE_GETVFPREGS) && !defined(PT_GETVFPREGS) && \
|
||||
defined(__GLIBC__) && (defined(__arm__) || defined(__arm64__))
|
||||
defined(__GLIBC__) && (defined(__arm__) || defined(__aarch64__))
|
||||
static constexpr __ptrace_request PTRACE_GETVFPREGS =
|
||||
static_cast<__ptrace_request>(27);
|
||||
#define PTRACE_GETVFPREGS PTRACE_GETVFPREGS
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <features.h>
|
||||
|
||||
// glibc for 64-bit ARM uses different names for these structs prior to 2.20.
|
||||
#if defined(__arm64__) && defined(__GLIBC__)
|
||||
#if defined(__aarch64__) && defined(__GLIBC__)
|
||||
#if !__GLIBC_PREREQ(2, 20)
|
||||
using user_regs_struct = user_pt_regs;
|
||||
using user_fpsimd_struct = user_fpsimd_state;
|
||||
|
@ -101,7 +101,7 @@ constexpr const char* kFlavorNames[] = {
|
||||
"PPC_THREAD_STATE64",
|
||||
"PPC_EXCEPTION_STATE64",
|
||||
"THREAD_STATE_NONE",
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
// sed -Ene 's/^#define ((ARM|THREAD)_[[:graph:]]+)[[:space:]]+[[:digit:]]{1,2}.*$/ "\1",/p'
|
||||
// usr/include/mach/arm/thread_status.h
|
||||
// (iOS 7 SDK)
|
||||
@ -153,7 +153,7 @@ std::string ThreadStateFlavorFullToShort(const base::StringPiece& flavor) {
|
||||
static constexpr char kArchPrefix[] = "x86_";
|
||||
#elif defined(__ppc__) || defined(__ppc64__)
|
||||
static constexpr char kArchPrefix[] = "PPC_";
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
static constexpr char kArchPrefix[] = "ARM_"
|
||||
#endif
|
||||
prefix_len = strlen(kArchPrefix);
|
||||
|
@ -801,7 +801,7 @@ constexpr struct {
|
||||
{PPC_VECTOR_STATE, "PPC_VECTOR_STATE", "VECTOR"},
|
||||
{PPC_THREAD_STATE64, "PPC_THREAD_STATE64", "THREAD64"},
|
||||
{PPC_EXCEPTION_STATE64, "PPC_EXCEPTION_STATE64", "EXCEPTION64"},
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
{ARM_THREAD_STATE, "ARM_THREAD_STATE", "THREAD"},
|
||||
{ARM_VFP_STATE, "ARM_VFP_STATE", "VFP"},
|
||||
{ARM_EXCEPTION_STATE, "ARM_EXCEPTION_STATE", "EXCEPTION"},
|
||||
@ -860,7 +860,7 @@ TEST(SymbolicConstantsMach, ThreadStateFlavorToString) {
|
||||
flavor <= x86_AVX_STATE
|
||||
#elif defined(__ppc__) || defined(__ppc64__)
|
||||
flavor <= THREAD_STATE_NONE
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
(flavor <= ARM_EXCEPTION_STATE64 || flavor == ARM_THREAD_STATE32 ||
|
||||
(flavor >= ARM_DEBUG_STATE32 && flavor <= ARM_NEON_STATE64))
|
||||
#endif
|
||||
@ -948,7 +948,7 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
|
||||
"PPC_JUNK_STATE32",
|
||||
"x86_THREAD_STATE",
|
||||
"ARM_THREAD_STATE",
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
" ARM_THREAD_STATE64",
|
||||
"ARM_THREAD_STATE64 ",
|
||||
"ARM_THREAD_STATE642",
|
||||
@ -1013,7 +1013,7 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
|
||||
NUL_TEST_DATA("PPC_THREAD_\0STATE64"),
|
||||
NUL_TEST_DATA("PPC_THREAD_STA\0TE64"),
|
||||
NUL_TEST_DATA("PPC_THREAD_STATE\00064"),
|
||||
#elif defined(__arm__) || defined(__arm64__)
|
||||
#elif defined(__arm__) || defined(__aarch64__)
|
||||
NUL_TEST_DATA("\0ARM_THREAD_STATE64"),
|
||||
NUL_TEST_DATA("ARM\0_THREAD_STATE64"),
|
||||
NUL_TEST_DATA("ARM_\0THREAD_STATE64"),
|
||||
|
Loading…
x
Reference in New Issue
Block a user