summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/lib/Makefile1
-rw-r--r--lldb/source/Plugins/Makefile6
-rw-r--r--lldb/source/lldb.cpp4
3 files changed, 4 insertions, 7 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index 929728f88b1..6abd672f6eb 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -38,6 +38,7 @@ USEDLIBS = lldbAPI.a \
lldbPluginLanguageRuntimeObjCAppleObjCRuntime.a \
lldbPluginObjectContainerBSDArchive.a \
lldbPluginObjectFileELF.a \
+ lldbPluginObjectFilePECOFF.a \
lldbPluginPlatformGDBServer.a \
lldbPluginProcessGDBRemote.a \
lldbPluginSymbolFileDWARF.a \
diff --git a/lldb/source/Plugins/Makefile b/lldb/source/Plugins/Makefile
index 8ab8771c543..7806840b4a3 100644
--- a/lldb/source/Plugins/Makefile
+++ b/lldb/source/Plugins/Makefile
@@ -13,9 +13,9 @@ include $(LLDB_LEVEL)/../../Makefile.config
DIRS := ABI/MacOSX-arm ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm \
- ObjectContainer/BSD-Archive ObjectFile/ELF SymbolFile/DWARF \
- SymbolFile/Symtab Process/Utility DynamicLoader/Static \
- Platform Process/gdb-remote Instruction/ARM \
+ ObjectContainer/BSD-Archive ObjectFile/ELF ObjectFile/PECOFF \
+ SymbolFile/DWARF SymbolFile/Symtab Process/Utility \
+ DynamicLoader/Static Platform Process/gdb-remote Instruction/ARM \
UnwindAssembly/InstEmulation UnwindAssembly/x86 \
LanguageRuntime/CPlusPlus/ItaniumABI \
LanguageRuntime/ObjC/AppleObjCRuntime
diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp
index 7e9949df66d..0749f0c9c43 100644
--- a/lldb/source/lldb.cpp
+++ b/lldb/source/lldb.cpp
@@ -94,9 +94,7 @@ lldb_private::Initialize ()
UnwindAssemblyInstEmulation::Initialize();
UnwindAssembly_x86::Initialize();
EmulateInstructionARM::Initialize ();
-#if !defined (__linux__)
ObjectFilePECOFF::Initialize ();
-#endif
#if defined (__APPLE__)
//----------------------------------------------------------------------
// Apple/Darwin hosted plugins
@@ -168,9 +166,7 @@ lldb_private::Terminate ()
UnwindAssembly_x86::Terminate();
UnwindAssemblyInstEmulation::Terminate();
EmulateInstructionARM::Terminate ();
-#if !defined (__linux__)
ObjectFilePECOFF::Terminate ();
-#endif
#if defined (__APPLE__)
DynamicLoaderMacOSXDYLD::Terminate();
OpenPOWER on IntegriCloud