Author: hans
Date: Fri Aug 12 13:10:54 2016
New Revision: 278540
URL: http://llvm.org/viewvc/llvm-project?rev=278540&view=rev
Log:
Merging r277997, r277999 and r278001:
------------------------------------------------------------------------
r277997 | labath | 2016-08-08 05:26:57 -0700 (Mon, 08 Aug 2016) | 3 lines
Remove _isatty from Android.h
it is just #defined to isatty anyway, which lldb already knows how to use.
------------------------------------------------------------------------
------------------------------------------------------------------------
r277999 | labath | 2016-08-08 05:40:11 -0700 (Mon, 08 Aug 2016) | 3 lines
Remove SYS_tgkill from Android.h
instead, use __NR_tgkill directly, which seems to be the preferred form in the
codebase anyway.
------------------------------------------------------------------------
------------------------------------------------------------------------
r278001 | labath | 2016-08-08 06:13:03 -0700 (Mon, 08 Aug 2016) | 5 lines
Clean up linux/Ptrace.h
This removes references to PT_XXX macros from the file, as they were not used
anyway. It also
changes the macro used to check for the definition of __ptrace_request, as
there are other C
libraries which do not define this type.
------------------------------------------------------------------------
Modified:
lldb/branches/release_39/ (props changed)
lldb/branches/release_39/include/lldb/Host/android/Android.h
lldb/branches/release_39/include/lldb/Host/linux/Ptrace.h
lldb/branches/release_39/source/Host/common/File.cpp
lldb/branches/release_39/source/Plugins/Process/Linux/NativeProcessLinux.cpp
lldb/branches/release_39/source/Plugins/Process/Linux/NativeThreadLinux.cpp
Propchange: lldb/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 12 13:10:54 2016
@@ -1,3 +1,3 @@
/lldb/branches/apple/python-GIL:156467-162159
/lldb/branches/iohandler:198360-200250
-/lldb/trunk:277343,277426
+/lldb/trunk:277343,277426,277997,277999,278001
Modified: lldb/branches/release_39/include/lldb/Host/android/Android.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/branches/release_39/include/lldb/Host/android/Android.h?rev=278540&r1=278539&r2=278540&view=diff
==============================================================================
--- lldb/branches/release_39/include/lldb/Host/android/Android.h (original)
+++ lldb/branches/release_39/include/lldb/Host/android/Android.h Fri Aug 12
13:10:54 2016
@@ -14,9 +14,6 @@
#include <string>
#include <errno.h>
-#define _isatty isatty
-#define SYS_tgkill __NR_tgkill
-
namespace std
{
template <typename T>
Modified: lldb/branches/release_39/include/lldb/Host/linux/Ptrace.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/branches/release_39/include/lldb/Host/linux/Ptrace.h?rev=278540&r1=278539&r2=278540&view=diff
==============================================================================
--- lldb/branches/release_39/include/lldb/Host/linux/Ptrace.h (original)
+++ lldb/branches/release_39/include/lldb/Host/linux/Ptrace.h Fri Aug 12
13:10:54 2016
@@ -14,33 +14,24 @@
#include <sys/ptrace.h>
-#ifdef __ANDROID_NDK__
-#define PT_DETACH PTRACE_DETACH
+#ifndef __GLIBC__
typedef int __ptrace_request;
#endif
#define DEBUG_PTRACE_MAXBYTES 20
// Support ptrace extensions even when compiled without required kernel support
-#ifndef PT_GETREGS
- #ifndef PTRACE_GETREGS
- #define PTRACE_GETREGS 12
- #endif
+#ifndef PTRACE_GETREGS
+ #define PTRACE_GETREGS 12
#endif
-#ifndef PT_SETREGS
- #ifndef PTRACE_SETREGS
- #define PTRACE_SETREGS 13
- #endif
+#ifndef PTRACE_SETREGS
+ #define PTRACE_SETREGS 13
#endif
-#ifndef PT_GETFPREGS
- #ifndef PTRACE_GETFPREGS
- #define PTRACE_GETFPREGS 14
- #endif
+#ifndef PTRACE_GETFPREGS
+ #define PTRACE_GETFPREGS 14
#endif
-#ifndef PT_SETFPREGS
- #ifndef PTRACE_SETFPREGS
- #define PTRACE_SETFPREGS 15
- #endif
+#ifndef PTRACE_SETFPREGS
+ #define PTRACE_SETFPREGS 15
#endif
#ifndef PTRACE_GETREGSET
#define PTRACE_GETREGSET 0x4204
Modified: lldb/branches/release_39/source/Host/common/File.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/branches/release_39/source/Host/common/File.cpp?rev=278540&r1=278539&r2=278540&view=diff
==============================================================================
--- lldb/branches/release_39/source/Host/common/File.cpp (original)
+++ lldb/branches/release_39/source/Host/common/File.cpp Fri Aug 12 13:10:54
2016
@@ -1010,7 +1010,7 @@ File::CalculateInteractiveAndTerminal ()
{
m_is_interactive = eLazyBoolNo;
m_is_real_terminal = eLazyBoolNo;
-#if (defined(_WIN32) || defined(__ANDROID_NDK__))
+#if defined(_WIN32)
if (_isatty(fd))
{
m_is_interactive = eLazyBoolYes;
Modified:
lldb/branches/release_39/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/branches/release_39/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=278540&r1=278539&r2=278540&view=diff
==============================================================================
---
lldb/branches/release_39/source/Plugins/Process/Linux/NativeProcessLinux.cpp
(original)
+++
lldb/branches/release_39/source/Plugins/Process/Linux/NativeProcessLinux.cpp
Fri Aug 12 13:10:54 2016
@@ -58,7 +58,6 @@
#include "lldb/Host/linux/Personality.h"
#include "lldb/Host/linux/Ptrace.h"
#include "lldb/Host/linux/Uio.h"
-#include "lldb/Host/android/Android.h"
#define LLDB_PERSONALITY_GET_CURRENT_SETTINGS 0xffffffff
Modified:
lldb/branches/release_39/source/Plugins/Process/Linux/NativeThreadLinux.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/branches/release_39/source/Plugins/Process/Linux/NativeThreadLinux.cpp?rev=278540&r1=278539&r2=278540&view=diff
==============================================================================
--- lldb/branches/release_39/source/Plugins/Process/Linux/NativeThreadLinux.cpp
(original)
+++ lldb/branches/release_39/source/Plugins/Process/Linux/NativeThreadLinux.cpp
Fri Aug 12 13:10:54 2016
@@ -30,7 +30,7 @@
#include <sys/syscall.h>
// Try to define a macro to encapsulate the tgkill syscall
#define tgkill(pid, tid, sig) \
- syscall(SYS_tgkill, static_cast< ::pid_t>(pid), static_cast<
::pid_t>(tid), sig)
+ syscall(__NR_tgkill, static_cast< ::pid_t>(pid), static_cast<
::pid_t>(tid), sig)
using namespace lldb;
using namespace lldb_private;
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
