From 6960e39eff0a3363ca7dc6b7cf8134180b7d101f Mon Sep 17 00:00:00 2001 From: Muhammad Omair Javaid Date: Tue, 21 Jul 2020 14:02:06 +0500 Subject: [PATCH] [LLDB] Fix LinuxPTraceDefines_arm64sve.h for AArch64 Linux host LinuxPTraceDefines_arm64sve.h defines essential macros for manipulating AArch64 SVE core dump registers. Add guard for aarch64/Linux hosts where newer versions of ptrace.h or sigcontext.h might already define SVE macros. Differential Revision: https://reviews.llvm.org/D83541 --- lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h b/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h index bc0b773..04d49bf 100644 --- a/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h +++ b/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h @@ -9,6 +9,11 @@ #ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_LINUXPTRACEDEFINES_ARM64SVE_H #define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_LINUXPTRACEDEFINES_ARM64SVE_H +// LinuxPTraceDefines_arm64sve.h defines essential macros for manipulating +// AArch64 SVE core dump registers. Add guard for aarch64/Linux hosts where +// newer versions of ptrace.h or sigcontext.h might already define SVE macros. +#ifndef SVE_SIG_REGS_OFFSET + #include struct _aarch64_context { @@ -257,4 +262,6 @@ struct user_sve_header { ? SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq, flags) \ : SVE_PT_FPSIMD_OFFSET + SVE_PT_FPSIMD_SIZE(vq, flags)) +#endif // SVE_SIG_REGS_OFFSET + #endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_LINUXPTRACEDEFINES_ARM64SVE_H -- 2.7.4