Index: lldb/trunk/cmake/LLDBDependencies.cmake
===================================================================
--- lldb/trunk/cmake/LLDBDependencies.cmake
+++ lldb/trunk/cmake/LLDBDependencies.cmake
@@ -89,7 +89,6 @@
   list(APPEND LLDB_USED_LIBS
     lldbPluginProcessLinux
     lldbPluginProcessPOSIX
-    lldbPluginProcessElfCore
    )
 endif ()
 
@@ -98,7 +97,6 @@
   list(APPEND LLDB_USED_LIBS
     lldbPluginProcessFreeBSD
     lldbPluginProcessPOSIX
-    lldbPluginProcessElfCore
     )
 endif ()
 
Index: lldb/trunk/lib/Makefile
===================================================================
--- lldb/trunk/lib/Makefile
+++ lldb/trunk/lib/Makefile
@@ -71,6 +71,7 @@
 	lldbPluginObjectFilePECOFF.a \
 	lldbPluginOSPython.a \
 	lldbPluginPlatformGDB.a \
+	lldbPluginProcessElfCore.a \
 	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
@@ -124,26 +125,22 @@
               lldbPluginSymbolVendorMacOSX.a \
               lldbPluginProcessDarwin.a \
               lldbPluginProcessMachCore.a \
-              lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
 endif
 
 ifeq ($(HOST_OS),Linux)
   USEDLIBS += lldbPluginProcessLinux.a \
               lldbPluginProcessPOSIX.a \
-              lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
 endif
 
 ifeq ($(HOST_OS),MingW)
-  USEDLIBS += lldbPluginProcessElfCore.a \
-              lldbPluginJITLoaderGDB.a
+  USEDLIBS += lldbPluginJITLoaderGDB.a
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
   USEDLIBS += lldbPluginProcessPOSIX.a \
               lldbPluginProcessFreeBSD.a \
-              lldbPluginProcessElfCore.a \
               lldbPluginJITLoaderGDB.a
 endif
 
Index: lldb/trunk/source/Plugins/Makefile
===================================================================
--- lldb/trunk/source/Plugins/Makefile
+++ lldb/trunk/source/Plugins/Makefile
@@ -18,7 +18,7 @@
 	ObjectContainer/BSD-Archive ObjectFile/ELF ObjectFile/PECOFF \
 	ObjectContainer/Universal-Mach-O ObjectFile/Mach-O \
 	ObjectFile/JIT SymbolFile/DWARF SymbolFile/Symtab Process/Utility \
-	DynamicLoader/Static Platform Process/gdb-remote \
+	DynamicLoader/Static Platform Process/elf-core Process/gdb-remote \
 	Instruction/ARM Instruction/ARM64 Instruction/MIPS Instruction/MIPS64 \
 	UnwindAssembly/InstEmulation UnwindAssembly/x86 \
 	LanguageRuntime/CPlusPlus/ItaniumABI \
@@ -45,24 +45,20 @@
 PARALLEL_DIRS += SymbolVendor/MacOSX
 #PARALLEL_DIRS += Process/MacOSX-User
 PARALLEL_DIRS += Process/mach-core
-PARALLEL_DIRS += Process/elf-core
 PARALLEL_DIRS += JITLoader/GDB
 endif
 
 ifeq ($(HOST_OS),Linux)
 PARALLEL_DIRS += Process/Linux Process/POSIX
-PARALLEL_DIRS += Process/elf-core
 PARALLEL_DIRS += JITLoader/GDB
 endif
 
 ifeq ($(HOST_OS),MingW)
-PARALLEL_DIRS += Process/elf-core
 PARALLEL_DIRS += JITLoader/GDB
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 PARALLEL_DIRS += Process/FreeBSD Process/POSIX
-PARALLEL_DIRS += Process/elf-core
 PARALLEL_DIRS += JITLoader/GDB
 endif