summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2015-09-03 23:57:09 +0000
committerBruce Mitchener <bruce.mitchener@gmail.com>2015-09-03 23:57:09 +0000
commitcfe7d6c4862c5095f92329cc3d6289737194108e (patch)
treedd00c5bf92e9530b8839ecfac052957933e19abb
parent0f4873d7d0417c9f0ff35b911047aa7852dc9742 (diff)
downloadbcm5719-llvm-cfe7d6c4862c5095f92329cc3d6289737194108e.tar.gz
bcm5719-llvm-cfe7d6c4862c5095f92329cc3d6289737194108e.zip
SystemRuntime/MacOSX no longer need ObjCRuntime header.
Summary: The AppleGetQueuesHandler code no longer needs to include a header from the AppleObjCRuntime, so we can remove workarounds that were present in the build systems. Reviewers: clayborg, jasonmolenda Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D12589 llvm-svn: 246821
-rw-r--r--lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp4
-rw-r--r--lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt3
-rw-r--r--lldb/source/Plugins/SystemRuntime/MacOSX/Makefile1
3 files changed, 2 insertions, 6 deletions
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp b/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
index 1d9dac5b161..d5b1380e273 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
@@ -13,8 +13,6 @@
// C++ Includes
// Other libraries and framework includes
// Project includes
-#include "AppleThreadPlanStepThroughObjCTrampoline.h"
-
#include "clang/AST/ASTContext.h"
#include "clang/AST/DeclCXX.h"
@@ -30,6 +28,8 @@
#include "lldb/Symbol/Symbol.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
index c0f0f7ca40e..d1580cce20d 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
@@ -1,6 +1,3 @@
-# We depend on AppleThreadPlanStepThroughObjCTrampoline.h
-include_directories(../../LanguageRuntime/ObjC/AppleObjCRuntime)
-
add_lldb_library(lldbPluginSystemRuntimeMacOSX
AppleGetItemInfoHandler.cpp
AppleGetPendingItemsHandler.cpp
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/Makefile b/lldb/source/Plugins/SystemRuntime/MacOSX/Makefile
index 32e1d9be6b5..eebfb52073d 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/Makefile
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/Makefile
@@ -11,5 +11,4 @@ LLDB_LEVEL := ../../../..
LIBRARYNAME := lldbPluginSystemRuntimeMacOSX
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../LanguageRuntime/ObjC/AppleObjCRuntime
include $(LLDB_LEVEL)/Makefile
OpenPOWER on IntegriCloud