diff options
| author | Shawn Best <sbest@blueshiftinc.com> | 2014-11-08 01:41:49 +0000 |
|---|---|---|
| committer | Shawn Best <sbest@blueshiftinc.com> | 2014-11-08 01:41:49 +0000 |
| commit | 8da0bf3b7cf3670095d7ce9eac885dfc5976720e (patch) | |
| tree | 05ff1512e3eb73a6f0e0387105bba0df772c671e /lldb/source/Plugins/Process | |
| parent | ed9825848281163a14c55f48def81b6e04ef7ffe (diff) | |
| download | bcm5719-llvm-8da0bf3b7cf3670095d7ce9eac885dfc5976720e.tar.gz bcm5719-llvm-8da0bf3b7cf3670095d7ce9eac885dfc5976720e.zip | |
LLGS Android target support - for Andy Chien : http://reviews.llvm.org/D6166
llvm-svn: 221570
Diffstat (limited to 'lldb/source/Plugins/Process')
3 files changed, 13 insertions, 3 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 2810b701c5c..abda9baecdb 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -18,7 +18,13 @@ #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 @@ -27,7 +33,6 @@ #include <sys/socket.h> #include <sys/syscall.h> #include <sys/types.h> -#include <sys/user.h> #include <sys/wait.h> #if defined (__arm64__) || defined (__aarch64__) diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index 5bc8c51d74c..3efeb5de627 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -16,7 +16,13 @@ #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 @@ -25,7 +31,6 @@ #include <sys/socket.h> #include <sys/syscall.h> #include <sys/types.h> -#include <sys/user.h> #include <sys/wait.h> // C++ Includes diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp index 5579b0b64fc..a2ab67438b7 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp @@ -150,7 +150,7 @@ RegisterContextMacOSXFrameBackchain::ReadRegister (const RegisterInfo *reg_info, // TOOD: need a better way to detect when "long double" types are // the same bytes size as "double" #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) && !defined(_MSC_VER) && \ - !defined(__mips__) && !defined(__powerpc__) + !defined(__mips__) && !defined(__powerpc__) && !defined(__ANDROID_NDK__) case sizeof (long double): if (sizeof (long double) == sizeof(uint32_t)) { |
