[Lldb-commits] [PATCH] D132514: [lldb] Remove obsolete Android-specific definitions

[Pirama Arumuga Nainar via Phabricator via lldb-commits]

pirama created this revision.
Herald added subscribers: danielkiss, pengfei, krytarowski.
Herald added a project: All.
pirama requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

Bionic's <sys/procfs.h> defines the necessary symbols.  Remove the
specialization for Android and the now-unnecessary include of
<sys/ptrace.h>.  This also helps resolve issues when building the
x86/x86_64 lldb-server for Android.

Curiously, the default branch to include <sys/procfs.h> doesn't seem
necessary on Linux.  I'll remove it and add it back if it breaks other
builders.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D132514

Files:
  lldb/source/Plugins/Process/Linux/Procfs.h


Index: lldb/source/Plugins/Process/Linux/Procfs.h
===================================================================
--- lldb/source/Plugins/Process/Linux/Procfs.h
+++ lldb/source/Plugins/Process/Linux/Procfs.h
@@ -6,32 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// source/Plugins/Process/Linux/Procfs.h defines the symbols we need from
-// sys/procfs.h on Android/Linux for all supported architectures.
-
 #include "lldb/lldb-types.h"
 #include "llvm/Support/Error.h"
-#include <sys/ptrace.h>
 #include <vector>
 
-#ifdef __ANDROID__
-#if defined(__arm64__) || defined(__aarch64__)
-typedef unsigned long elf_greg_t;
-typedef elf_greg_t
-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
-typedef struct user_fpsimd_state elf_fpregset_t;
-#ifndef NT_FPREGSET
-#define NT_FPREGSET NT_PRFPREG
-#endif // NT_FPREGSET
-#elif defined(__mips__)
-#ifndef NT_FPREGSET
-#define NT_FPREGSET NT_PRFPREG
-#endif // NT_FPREGSET
-#endif
-#else // __ANDROID__
-#include <sys/procfs.h>
-#endif // __ANDROID__
-
 namespace lldb_private {
 namespace process_linux {
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132514.455001.patch
Type: text/x-patch
Size: 1128 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20220823/2dc8f371/attachment.bin>