summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-08-08 12:40:11 +0000
committerPavel Labath <labath@google.com>2016-08-08 12:40:11 +0000
commitc923a3dc00c5dfdf68fabd6d9d85ccf2bedc6066 (patch)
treed70e71a567b8d95d9268103097f079b29ad91113
parent6b73456865926b5279faa68e771c513e969d0a64 (diff)
downloadbcm5719-llvm-c923a3dc00c5dfdf68fabd6d9d85ccf2bedc6066.tar.gz
bcm5719-llvm-c923a3dc00c5dfdf68fabd6d9d85ccf2bedc6066.zip
Remove SYS_tgkill from Android.h
instead, use __NR_tgkill directly, which seems to be the preferred form in the codebase anyway. llvm-svn: 277999
-rw-r--r--lldb/include/lldb/Host/android/Android.h2
-rw-r--r--lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp1
-rw-r--r--lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp2
3 files changed, 1 insertions, 4 deletions
diff --git a/lldb/include/lldb/Host/android/Android.h b/lldb/include/lldb/Host/android/Android.h
index 5a2b31b7eb3..08e7dd93b28 100644
--- a/lldb/include/lldb/Host/android/Android.h
+++ b/lldb/include/lldb/Host/android/Android.h
@@ -14,8 +14,6 @@
#include <string>
#include <errno.h>
-#define SYS_tgkill __NR_tgkill
-
namespace std
{
template <typename T>
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index 6d822ce200f..49d57c0a0ad 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -60,7 +60,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"
// Support hardware breakpoints in case it has not been defined
#ifndef TRAP_HWBKPT
diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
index 070b1bcda3b..6509022b6c6 100644
--- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
@@ -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;
OpenPOWER on IntegriCloud