Put plug-ins into the correct directories as they were incorrectly located

in a Utility directory.

llvm-svn: 130135

8 files changed, 32 insertions, 34 deletions

diff --git a/lldb/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp b/lldb/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
index f73bdde7850..de8b5f8ff67 100644
--- a/lldb/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
+++ b/lldb/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.cpp
@@ -10,7 +10,7 @@
 #include "ArchDefaultUnwindPlan-x86.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/PluginManager.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h b/lldb/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
index a0d315c62c8..7938ef05978 100644
--- a/lldb/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.h
+++ b/lldb/source/Plugins/ArchDefaultUnwindPlan/ArchDefaultUnwindPlan-x86.h
@@ -11,7 +11,7 @@
 #define liblldb_ArchDefaultUnwindPlan_x86_h_
 
 #include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Symbol/UnwindPlan.h"
 
diff --git a/lldb/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp b/lldb/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
index b47f54ad529..915dbf9bb7e 100644
--- a/lldb/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
+++ b/lldb/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.cpp
@@ -8,15 +8,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "ArchVolatileRegs-x86.h"
+
+#include <set>
+
 #include "llvm/Support/MachO.h"
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
+
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/PluginManager.h"
-#include "lldb/lldb-enumerations.h"
+#include "lldb/Target/ArchVolatileRegs.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/RegisterContext.h"
-#include <set>
+
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h b/lldb/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h
index 4aa5828784c..70e1d202672 100644
--- a/lldb/source/Plugins/Process/Utility/ArchVolatileRegs-x86.h
+++ b/lldb/source/Plugins/ArchVolatileRegs/ArchVolatileRegs-x86.h
@@ -12,7 +12,7 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Core/ArchSpec.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
+#include "lldb/Target/ArchVolatileRegs.h"
 #include <set>
 
 namespace lldb_private {
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
index 4a27d3b63fd..1b63ad795b7 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
@@ -7,25 +7,26 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/lldb-private.h"
 #include "RegisterContextLLDB.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Symbol/Symbol.h"
+
+#include "lldb/lldb-private.h"
 #include "lldb/Core/Address.h"
 #include "lldb/Core/AddressRange.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Target/Process.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
-#include "lldb/Symbol/FuncUnwinders.h"
 #include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Utility/ArchVolatileRegs.h"
 #include "lldb/Core/Log.h"
-#include "lldb/Expression/DWARFExpression.h"
 #include "lldb/Core/Value.h"
+#include "lldb/Symbol/FuncUnwinders.h"
+#include "lldb/Symbol/Function.h"
+#include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Expression/DWARFExpression.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/ArchVolatileRegs.h"
 #include "lldb/Target/ExecutionContext.h"
+#include "lldb/Target/Process.h"
 #include "lldb/Target/StackFrame.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
index e972c8408e8..98078195c45 100644
--- a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
+++ b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
@@ -7,16 +7,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Target/Thread.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Target/Process.h"
-#include "lldb/Target/RegisterContext.h"
 #include "lldb/Core/Module.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Symbol/FuncUnwinders.h"
 #include "lldb/Symbol/Function.h"
-#include "lldb/Utility/ArchDefaultUnwindPlan.h"
 #include "lldb/Symbol/UnwindPlan.h"
-#include "lldb/Core/Log.h"
+#include "lldb/Target/ArchDefaultUnwindPlan.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Target/RegisterContext.h"
 
 #include "UnwindLLDB.h"
 #include "RegisterContextLLDB.h"
diff --git a/lldb/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp b/lldb/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
index 855aa69f89c..6f6baa8ee22 100644
--- a/lldb/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.cpp
@@ -9,24 +9,19 @@
 
 #include "UnwindAssemblyProfiler-x86.h"
 
-#include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "llvm-c/EnhancedDisassembly.h"
+
 #include "lldb/Core/Address.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/PluginManager.h"
+#include "lldb/Symbol/UnwindPlan.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Symbol/UnwindPlan.h"
-
-#include "lldb/lldb-enumerations.h"
-#include "llvm-c/EnhancedDisassembly.h"
-
-#include "UnwindAssemblyProfiler-x86.h"
-
+#include "lldb/Target/UnwindAssemblyProfiler.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h b/lldb/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h
index 637c504d4f9..c1572996251 100644
--- a/lldb/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.h
+++ b/lldb/source/Plugins/UnwindAssembly/UnwindAssemblyProfiler-x86.h
@@ -11,7 +11,7 @@
 #define liblldb_UnwindAssemblyProfiler_x86_h_
 
 #include "lldb/lldb-private.h"
-#include "lldb/Utility/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssemblyProfiler.h"
 #include "lldb/Target/Thread.h"
 
 namespace lldb_private {