From c923a3dc00c5dfdf68fabd6d9d85ccf2bedc6066 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Mon, 8 Aug 2016 12:40:11 +0000 Subject: [PATCH] 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 --- lldb/include/lldb/Host/android/Android.h | 2 -- lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 1 - lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lldb/include/lldb/Host/android/Android.h b/lldb/include/lldb/Host/android/Android.h index 5a2b31b..08e7dd9 100644 --- a/lldb/include/lldb/Host/android/Android.h +++ b/lldb/include/lldb/Host/android/Android.h @@ -14,8 +14,6 @@ #include #include -#define SYS_tgkill __NR_tgkill - namespace std { template diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 6d822ce..49d57c0 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 070b1bc..6509022 100644 --- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp @@ -30,7 +30,7 @@ #include // 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; -- 2.7.4