Unverified Commit b4ee532f authored by Rahul Butani's avatar Rahul Butani
Browse files

llvmPackages_15.lldb: fix the build on `i686`

as detailed within, adding `asm/ptrace.h` leads to `asm/ptrace-abi.h`
being included which defines preprocessor symbols that clash with
identifiers used in the LLVM headers (`FS` and `CS` only defined on
i686)
parent 1d3ca423
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
--- a/source/Plugins/Process/Linux/Procfs.h
+++ b/source/Plugins/Process/Linux/Procfs.h
@@ -10,6 +10,7 @@
@@ -10,6 +10,13 @@
 // sys/procfs.h on Android/Linux for all supported architectures.
 
 #include <sys/ptrace.h>
+#include <asm/ptrace.h>
+
+// on i686 preprocessor symbols with these register names are defined as
+// numeric constants; these symbols clash with identifier names used in
+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h`
+#undef FS
+#undef CS
 
 #include "lldb/lldb-types.h"
 
@@ -17,23 +18,13 @@
@@ -17,23 +24,13 @@
 
 #include <vector>