Index: include/lldb/Expression/ClangExpressionVariable.h
===================================================================
--- include/lldb/Expression/ClangExpressionVariable.h	(revision 131411)
+++ include/lldb/Expression/ClangExpressionVariable.h	(working copy)
@@ -156,7 +156,7 @@
     EnableJITVars()
     {
         if (!m_jit_vars.get())
-            m_jit_vars.reset(new struct JITVars);
+            m_jit_vars.reset(new JITVars);
     }
     
     //----------------------------------------------------------------------
Index: source/Plugins/UnwindAssembly/x86/Makefile
===================================================================
--- source/Plugins/UnwindAssembly/x86/Makefile	(revision 0)
+++ source/Plugins/UnwindAssembly/x86/Makefile	(revision 0)
@@ -0,0 +1,14 @@
+##===- source/Plugins/UnwindAssembly/x86/Makefile ----------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginUnwindAssemblyX86
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/UnwindAssembly/InstEmulation/Makefile
===================================================================
--- source/Plugins/UnwindAssembly/InstEmulation/Makefile	(revision 0)
+++ source/Plugins/UnwindAssembly/InstEmulation/Makefile	(revision 0)
@@ -0,0 +1,14 @@
+##===-source/Plugins/UnwindAssembly/InstEmulation/Makefile -*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginUnwindAssemblyInstEmulation
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile
===================================================================
--- source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile	(revision 0)
+++ source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/Makefile	(revision 0)
@@ -0,0 +1,14 @@
+##===- source/Plugins/LangRuntime/C++/ItaniumABI/Makefile --*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../../..
+LIBRARYNAME := lldbPluginLanguageRuntimeCPlusPlusItaniumABI
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile	(revision 0)
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/Makefile	(revision 0)
@@ -0,0 +1,14 @@
+##===- source/Plugins/LangRuntime/ObjC/AppleRT/Makefile ----*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../../..
+LIBRARYNAME := lldbPluginLanguageRuntimeObjCAppleObjCRuntime
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h
===================================================================
--- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h	(revision 131411)
+++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h	(working copy)
@@ -74,7 +74,7 @@
         {
              eOBJC_TRAMPOLINE_MESSAGE = (1<<0),   // trampoline acts like objc_msgSend                                                           
              eOBJC_TRAMPOLINE_STRET   = (1<<1),   // trampoline is struct-returning                                                              
-             eOBJC_TRAMPOLINE_VTABLE  = (1<<2),   // trampoline is vtable dispatcher                                                             
+             eOBJC_TRAMPOLINE_VTABLE  = (1<<2)    // trampoline is vtable dispatcher                                                             
         };
             
     private:
Index: source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
===================================================================
--- source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h	(revision 131411)
+++ source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h	(working copy)
@@ -72,7 +72,7 @@
         dwarf_ymm4 = dwarf_xmm4,
         dwarf_ymm5 = dwarf_xmm5,
         dwarf_ymm6 = dwarf_xmm6,
-        dwarf_ymm7 = dwarf_xmm7,
+        dwarf_ymm7 = dwarf_xmm7
     };
     
     enum
Index: source/Plugins/Makefile
===================================================================
--- source/Plugins/Makefile	(revision 131411)
+++ source/Plugins/Makefile	(working copy)
@@ -12,14 +12,17 @@
 include $(LLDB_LEVEL)/../../Makefile.config
 
 
-DIRS := ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm  \
+DIRS := ABI/MacOSX-i386 ABI/MacOSX-arm 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
+	Platform Process/gdb-remote Instruction/ARM UnwindAssembly/InstEmulation \
+    UnwindAssembly/x86 LanguageRuntime/CPlusPlus/ItaniumABI \
+    LanguageRuntime/ObjC/AppleObjCRuntime
 
 ifeq ($(HOST_OS),Darwin)
 DIRS += DynamicLoader/MacOSX-DYLD ObjectContainer/Universal-Mach-O \
-	ObjectFile/Mach-O SymbolVendor/MacOSX Process/MacOSX-User
+	ObjectFile/Mach-O SymbolVendor/MacOSX
+#DIRS += Process/MacOSX-User
 endif
 
 ifeq ($(HOST_OS),Linux)
Index: source/Symbol/ClangASTContext.cpp
===================================================================
--- source/Symbol/ClangASTContext.cpp	(revision 131411)
+++ source/Symbol/ClangASTContext.cpp	(working copy)
@@ -1474,7 +1474,7 @@
     
     // Populate the method decl with parameter decls
     
-    ParmVarDecl *params[num_params];
+    ParmVarDecl **params = new ParmVarDecl *[num_params];
     
     for (int param_index = 0;
          param_index < num_params;
Index: source/Target/ArchDefaultUnwindPlan.cpp
===================================================================
--- source/Target/ArchDefaultUnwindPlan.cpp	(revision 131411)
+++ source/Target/ArchDefaultUnwindPlan.cpp	(working copy)
@@ -1,54 +0,0 @@
-//===-- ArchDefaultUnwindPlan.cpp -------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/PluginManager.h"
-
-#include <map>
-
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/PluginInterface.h"
-#include "lldb/Host/Mutex.h"
-#include "lldb/Target/ArchDefaultUnwindPlan.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-ArchDefaultUnwindPlanSP
-ArchDefaultUnwindPlan::FindPlugin (const ArchSpec &arch)
-{
-    ArchDefaultUnwindPlanCreateInstance create_callback;
-    typedef std::map <const ArchSpec, ArchDefaultUnwindPlanSP> ArchDefaultUnwindPlanMap;
-    static ArchDefaultUnwindPlanMap g_plugin_map;
-    static Mutex g_plugin_map_mutex (Mutex::eMutexTypeRecursive);
-    Mutex::Locker locker (g_plugin_map_mutex);
-    ArchDefaultUnwindPlanMap::iterator pos = g_plugin_map.find (arch);
-    if (pos != g_plugin_map.end())
-        return pos->second;
-
-    for (uint32_t idx = 0;
-         (create_callback = PluginManager::GetArchDefaultUnwindPlanCreateCallbackAtIndex(idx)) != NULL;
-         ++idx)
-    {
-        ArchDefaultUnwindPlanSP default_unwind_plan_sp (create_callback (arch));
-        if (default_unwind_plan_sp)
-        {
-            g_plugin_map[arch] = default_unwind_plan_sp;
-            return default_unwind_plan_sp;
-        }
-    }
-    return ArchDefaultUnwindPlanSP();
-}
-
-ArchDefaultUnwindPlan::ArchDefaultUnwindPlan ()
-{
-}
-
-ArchDefaultUnwindPlan::~ArchDefaultUnwindPlan ()
-{
-}
Index: source/Target/ArchVolatileRegs.cpp
===================================================================
--- source/Target/ArchVolatileRegs.cpp	(revision 131411)
+++ source/Target/ArchVolatileRegs.cpp	(working copy)
@@ -1,40 +0,0 @@
-//===-- ArchVolatileRegs.cpp ------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/lldb-private.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/PluginInterface.h"
-#include "lldb/Target/ArchVolatileRegs.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-ArchVolatileRegs*
-ArchVolatileRegs::FindPlugin (const ArchSpec &arch)
-{
-    ArchVolatileRegsCreateInstance create_callback;
-
-    for (uint32_t idx = 0;
-         (create_callback = PluginManager::GetArchVolatileRegsCreateCallbackAtIndex(idx)) != NULL;
-         ++idx)
-    {
-        std::auto_ptr<ArchVolatileRegs> default_volatile_regs_ap (create_callback (arch));
-        if (default_volatile_regs_ap.get ())
-            return default_volatile_regs_ap.release ();
-    }
-    return NULL;
-}
-
-ArchVolatileRegs::ArchVolatileRegs ()
-{
-}
-
-ArchVolatileRegs::~ArchVolatileRegs ()
-{
-}
Index: source/Host/macosx/Host.mm
===================================================================
--- source/Host/macosx/Host.mm	(revision 131411)
+++ source/Host/macosx/Host.mm	(working copy)
@@ -565,7 +565,7 @@
 
 extern "C" {
     const char *__crashreporter_info__ = NULL;
-};
+}
 
 asm(".desc ___crashreporter_info__, 0x10");
 
Index: source/Host/macosx/cfcpp/Makefile
===================================================================
--- source/Host/macosx/cfcpp/Makefile	(revision 0)
+++ source/Host/macosx/cfcpp/Makefile	(revision 0)
@@ -0,0 +1,15 @@
+##===- source/Host/macosx/cfcpp/Makefile -------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := CoreFoundationCPP
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
+
Index: source/Host/macosx/Makefile
===================================================================
--- source/Host/macosx/Makefile	(revision 131411)
+++ source/Host/macosx/Makefile	(working copy)
@@ -10,7 +10,9 @@
 LLDB_LEVEL := ../../..
 LIBRARYNAME := lldbHostMacOSX
 BUILD_ARCHIVE = 1
+DIRS := cfcpp
 
-SOURCES := $(notdir $(wildcard *.cpp *.mm))
+SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm))
 
 include $(LLDB_LEVEL)/Makefile
+
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 131411)
+++ lib/Makefile	(working copy)
@@ -29,16 +29,21 @@
 	lldbInitAndLog.a \
 	lldbInterpreter.a \
 	lldbPluginABIMacOSX_i386.a \
+    lldbPluginABIMacOSX_arm.a \
 	lldbPluginABISysV_x86_64.a \
 	lldbPluginDisassemblerLLVM.a \
 	lldbPluginDynamicLoaderStatic.a \
 	lldbPluginEmulateInstructionARM.a \
+    lldbPluginLanguageRuntimeCPlusPlusItaniumABI.a \
+    lldbPluginLanguageRuntimeObjCAppleObjCRuntime.a \
 	lldbPluginObjectContainerBSDArchive.a \
 	lldbPluginObjectFileELF.a \
 	lldbPluginPlatformGDBServer.a \
 	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
 	lldbPluginSymbolFileSymtab.a \
+    lldbPluginUnwindAssemblyInstEmulation.a \
+    lldbPluginUnwindAssemblyX86.a \
 	lldbPluginUtility.a \
 	lldbSymbol.a \
 	lldbTarget.a \
@@ -60,10 +65,11 @@
 include $(LLDB_LEVEL)/../../Makefile.config
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
-                   ipo selectiondag jit mc
+                   instrumentation ipo selectiondag jit mc
 
 ifeq ($(HOST_OS),Darwin)
   USEDLIBS += lldbHostMacOSX.a \
+              CoreFoundationCPP.a \
               lldbPluginDynamicLoaderMacOSX.a \
               lldbPluginObjectContainerUniversalMachO.a \
               lldbPluginObjectFileMachO.a \
@@ -91,7 +97,8 @@
     # extra options to override libtool defaults 
     LLVMLibsOptions += -avoid-version
 	LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
-	LLVMLibsOptions += -framework Foundation -framework CoreFoundation 
+	LLVMLibsOptions += -framework Foundation -framework CoreFoundation
+    LLVMLibsOptions += -framework CoreServices -framework Carbon
 	LLVMLibsOptions += -framework DebugSymbols $(PYTHON_BUILD_FLAGS) -lobjc
 	LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports" 
     # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
