Index: lldb/trunk/lib/Makefile
===================================================================
--- lldb/trunk/lib/Makefile
+++ lldb/trunk/lib/Makefile
@@ -103,6 +103,7 @@
 	lldbPluginPlatformPOSIX.a \
 	lldbPluginPlatformKalimba.a \
 	lldbPluginPlatformAndroid.a \
+	lldbPluginJITLoaderGDB.a \
 	lldbPluginScriptInterpreterNone.a \
 	lldbPluginScriptInterpreterPython.a
 
@@ -125,24 +126,17 @@
               lldbPluginObjectFileMachO.a \
               lldbPluginSymbolVendorMacOSX.a \
               lldbPluginProcessDarwin.a \
-              lldbPluginProcessMachCore.a \
-              lldbPluginJITLoaderGDB.a
+              lldbPluginProcessMachCore.a
 endif
 
 ifeq ($(HOST_OS),Linux)
   USEDLIBS += lldbPluginProcessLinux.a \
-              lldbPluginProcessPOSIX.a \
-              lldbPluginJITLoaderGDB.a
-endif
-
-ifeq ($(HOST_OS),MingW)
-  USEDLIBS += lldbPluginJITLoaderGDB.a
+              lldbPluginProcessPOSIX.a
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
   USEDLIBS += lldbPluginProcessPOSIX.a \
-              lldbPluginProcessFreeBSD.a \
-              lldbPluginJITLoaderGDB.a
+              lldbPluginProcessFreeBSD.a
 endif
 
 include $(LEVEL)/Makefile.common
Index: lldb/trunk/source/Plugins/JITLoader/GDB/Makefile
===================================================================
--- lldb/trunk/source/Plugins/JITLoader/GDB/Makefile
+++ lldb/trunk/source/Plugins/JITLoader/GDB/Makefile
@@ -1,4 +1,4 @@
-##===- source/Plugins/JITLoader/GDBJIT/Makefile ------------*- Makefile -*-===##
+##===- source/Plugins/JITLoader/GDB/Makefile ---------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
Index: lldb/trunk/source/Plugins/Makefile
===================================================================
--- lldb/trunk/source/Plugins/Makefile
+++ lldb/trunk/source/Plugins/Makefile
@@ -31,6 +31,7 @@
 	DynamicLoader/Hexagon-DYLD \
 	DynamicLoader/MacOSX-DYLD \
 	DynamicLoader/Windows-DYLD \
+	JITLoader/GDB \
 	ExpressionParser/Clang \
 	OperatingSystem/Python \
 	SystemRuntime/MacOSX \
@@ -45,21 +46,14 @@
 PARALLEL_DIRS += SymbolVendor/MacOSX
 #PARALLEL_DIRS += Process/MacOSX-User
 PARALLEL_DIRS += Process/mach-core
-PARALLEL_DIRS += JITLoader/GDB
 endif
 
 ifeq ($(HOST_OS),Linux)
 PARALLEL_DIRS += Process/Linux Process/POSIX
-PARALLEL_DIRS += JITLoader/GDB
-endif
-
-ifeq ($(HOST_OS),MingW)
-PARALLEL_DIRS += JITLoader/GDB
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 PARALLEL_DIRS += Process/FreeBSD Process/POSIX
-PARALLEL_DIRS += JITLoader/GDB
 endif
 
 include $(LLDB_LEVEL)/Makefile