1 files changed, 4 insertions, 2 deletions
diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp
index 83acbd0d663..5ea30e01fb3 100644
--- a/lldb/source/lldb.cpp
+++ b/lldb/source/lldb.cpp
@@ -76,7 +76,8 @@ lldb_private::Initialize ()
         SymbolFileDWARF::Initialize();
         SymbolFileSymtab::Initialize();
         UnwindAssemblyProfiler_x86::Initialize();
-        ArchDefaultUnwindPlan_x86::Initialize();
+        ArchDefaultUnwindPlan_x86_64::Initialize();
+        ArchDefaultUnwindPlan_i386::Initialize();
         ArchVolatileRegs_x86::Initialize();
         ScriptInterpreter::Initialize ();
 
@@ -123,7 +124,8 @@ lldb_private::Terminate ()
     SymbolFileDWARF::Terminate();
     SymbolFileSymtab::Terminate();
     UnwindAssemblyProfiler_x86::Terminate();
-    ArchDefaultUnwindPlan_x86::Terminate();
+    ArchDefaultUnwindPlan_i386::Terminate();
+    ArchDefaultUnwindPlan_x86_64::Terminate();
     ArchVolatileRegs_x86::Terminate();
     ScriptInterpreter::Terminate ();