diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2015-02-06 10:57:40 +0000 |
|---|---|---|
| committer | Tamas Berghammer <tberghammer@google.com> | 2015-02-06 10:57:40 +0000 |
| commit | d858487eddc6947db4b764f747b756e0413bad00 (patch) | |
| tree | bd340635bdf5e6c8dacbca50615158ee87154634 /lldb/source/Plugins/Process | |
| parent | 5830aa755b3e0ca6f96efa934796fd5d09c87117 (diff) | |
| download | bcm5719-llvm-d858487eddc6947db4b764f747b756e0413bad00.tar.gz bcm5719-llvm-d858487eddc6947db4b764f747b756e0413bad00.zip | |
Fix build of lldb-gdbserver and lldb-platform for android (arm32, x86)
* Fix cmake script for android x86
* Reorder includes to avoid collision between system macros and local
variables in clang framework
Differential Revision: http://reviews.llvm.org/D7435
llvm-svn: 228388
Diffstat (limited to 'lldb/source/Plugins/Process')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 32 | ||||
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp | 30 |
2 files changed, 29 insertions, 33 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 99de1938e2e..a72b6a24063 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -17,23 +17,6 @@ #include <string.h> #include <stdint.h> #include <unistd.h> -#include <linux/unistd.h> -#if defined(__ANDROID_NDK__) && defined (__arm__) -#include <linux/personality.h> -#include <linux/user.h> -#else -#include <sys/personality.h> -#include <sys/user.h> -#endif -#ifndef __ANDROID__ -#include <sys/procfs.h> -#endif -#include <sys/ptrace.h> -#include <sys/uio.h> -#include <sys/socket.h> -#include <sys/syscall.h> -#include <sys/types.h> -#include <sys/wait.h> #if defined (__arm64__) || defined (__aarch64__) // NT_PRSTATUS and NT_FPREGSET definition @@ -69,6 +52,21 @@ #include "ThreadStateCoordinator.h" #include "Plugins/Process/POSIX/ProcessPOSIXLog.h" +// System includes - They have to be included after framework includes because they define some +// macros which collide with variable names in other modules +#include <linux/unistd.h> +#ifndef __ANDROID__ +#include <sys/procfs.h> +#endif +#include <sys/personality.h> +#include <sys/ptrace.h> +#include <sys/socket.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <sys/uio.h> +#include <sys/user.h> +#include <sys/wait.h> + #ifdef __ANDROID__ #define __ptrace_request int #define PT_DETACH PTRACE_DETACH diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index e87e6626852..81eb4d634a7 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -16,22 +16,6 @@ #include <stdint.h> #include <unistd.h> #include <elf.h> -#if defined(__ANDROID_NDK__) && defined (__arm__) -#include <linux/personality.h> -#include <linux/user.h> -#else -#include <sys/personality.h> -#include <sys/user.h> -#endif -#ifndef __ANDROID__ -#include <sys/procfs.h> -#endif -#include <sys/ptrace.h> -#include <sys/uio.h> -#include <sys/socket.h> -#include <sys/syscall.h> -#include <sys/types.h> -#include <sys/wait.h> // C++ Includes // Other libraries and framework includes @@ -52,6 +36,20 @@ #include "Plugins/Process/POSIX/ProcessPOSIXLog.h" #include "ProcessMonitor.h" +// System includes - They have to be included after framework includes because they define some +// macros which collide with variable names in other modules +#ifndef __ANDROID__ +#include <sys/procfs.h> +#endif +#include <sys/personality.h> +#include <sys/ptrace.h> +#include <sys/socket.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <sys/uio.h> +#include <sys/user.h> +#include <sys/wait.h> + #ifdef __ANDROID__ #define __ptrace_request int #define PT_DETACH PTRACE_DETACH |
