[Lldb-commits] [lldb] 6960e39 - [LLDB] Fix LinuxPTraceDefines_arm64sve.h for AArch64 Linux host

[Muhammad Omair Javaid via lldb-commits]

Author: Muhammad Omair Javaid
Date: 2020-07-21T14:31:47+05:00
New Revision: 6960e39eff0a3363ca7dc6b7cf8134180b7d101f

URL: https://github.com/llvm/llvm-project/commit/6960e39eff0a3363ca7dc6b7cf8134180b7d101f
DIFF: https://github.com/llvm/llvm-project/commit/6960e39eff0a3363ca7dc6b7cf8134180b7d101f.diff

LOG: [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

Added: 
    

Modified: 
    lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h b/lldb/source/Plugins/Process/Utility/LinuxPTraceDefines_arm64sve.h
index bc0b773d1a53..04d49bf53918 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 <stdint.h>
 
 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