brucem created this revision. brucem added reviewers: clayborg, jasonmolenda. brucem added a subscriber: lldb-commits.
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. http://reviews.llvm.org/D12589 Files: source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt source/Plugins/SystemRuntime/MacOSX/Makefile Index: source/Plugins/SystemRuntime/MacOSX/Makefile =================================================================== --- source/Plugins/SystemRuntime/MacOSX/Makefile +++ source/Plugins/SystemRuntime/MacOSX/Makefile @@ -11,5 +11,4 @@ LIBRARYNAME := lldbPluginSystemRuntimeMacOSX BUILD_ARCHIVE = 1 -CPP.Flags += -I$(PROJ_SRC_DIR)/../../LanguageRuntime/ObjC/AppleObjCRuntime include $(LLDB_LEVEL)/Makefile Index: source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt =================================================================== --- source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt +++ source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt @@ -1,8 +1,5 @@ set(LLVM_NO_RTTI 1) -# We depend on AppleThreadPlanStepThroughObjCTrampoline.h -include_directories(../../LanguageRuntime/ObjC/AppleObjCRuntime) - add_lldb_library(lldbPluginSystemRuntimeMacOSX AppleGetItemInfoHandler.cpp AppleGetPendingItemsHandler.cpp Index: source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp +++ 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;
Index: source/Plugins/SystemRuntime/MacOSX/Makefile =================================================================== --- source/Plugins/SystemRuntime/MacOSX/Makefile +++ source/Plugins/SystemRuntime/MacOSX/Makefile @@ -11,5 +11,4 @@ LIBRARYNAME := lldbPluginSystemRuntimeMacOSX BUILD_ARCHIVE = 1 -CPP.Flags += -I$(PROJ_SRC_DIR)/../../LanguageRuntime/ObjC/AppleObjCRuntime include $(LLDB_LEVEL)/Makefile Index: source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt =================================================================== --- source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt +++ source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt @@ -1,8 +1,5 @@ set(LLVM_NO_RTTI 1) -# We depend on AppleThreadPlanStepThroughObjCTrampoline.h -include_directories(../../LanguageRuntime/ObjC/AppleObjCRuntime) - add_lldb_library(lldbPluginSystemRuntimeMacOSX AppleGetItemInfoHandler.cpp AppleGetPendingItemsHandler.cpp Index: source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp +++ 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;
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
