[Lldb-commits] [lldb] r109016 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj llvm.zip scripts/build-llvm.pl source/Plugins/Disassembler/llvm/DisassemblerLLVM.h

[Greg Clayton]

Author: gclayton
Date: Wed Jul 21 11:57:26 2010
New Revision: 109016

URL: http://llvm.org/viewvc/llvm-project?rev=109016&view=rev
Log:
Updated LLVM and Clang to July 20 at 16:00.


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=109016&r1=109015&r2=109016&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Jul 21 11:57:26 2010
@@ -2764,7 +2764,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
@@ -2817,7 +2817,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",
@@ -2927,7 +2927,7 @@
 					"$(LLVM_BUILD_DIR)",
 				);
 				LLVM_BUILD_DIR = "$(DERIVED_FILE_DIR)/llvm.build";
-				LLVM_CONFIGURATION = "Release+Asserts";
+				LLVM_CONFIGURATION = Release;
 				OTHER_CFLAGS = (
 					"-DFOR_DYLD=0",
 					"-DSUPPORT_REMOTE_UNWINDING",

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=109016&r1=109015&r2=109016&view=diff
==============================================================================
Binary files - no diff available.

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=109016&r1=109015&r2=109016&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Wed Jul 21 11:57:26 2010
@@ -25,7 +25,7 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "'{2010-07-13T13:00}'";
+our $llvm_revision = "'{2010-07-20T16:00}'";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
 our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";
@@ -70,6 +70,7 @@
 	"$llvm_configuration/lib/libLLVMLinker.a",
 	"$llvm_configuration/lib/libLLVMMC.a",
 	"$llvm_configuration/lib/libLLVMMCParser.a",
+	"$llvm_configuration/lib/libLLVMMCDisassembler.a",
 	"$llvm_configuration/lib/libLLVMScalarOpts.a",
 	"$llvm_configuration/lib/libLLVMSelectionDAG.a",
 	"$llvm_configuration/lib/libLLVMSupport.a",
@@ -200,6 +201,10 @@
 			if (!-e $llvm_dstroot_arch_archive)
 			{
 				$do_make = 1;
+			}
+			else
+			{
+				print "LLVM architecture archive for ${arch} is '$llvm_dstroot_arch_archive'\n";
 			}		
 		}
 		else

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h?rev=109016&r1=109015&r2=109016&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h Wed Jul 21 11:57:26 2010
@@ -10,14 +10,11 @@
 #ifndef liblldb_DisassemblerLLVM_h_
 #define liblldb_DisassemblerLLVM_h_
 
-#include "lldb/Core/Disassembler.h"
-#include "lldb/Host/Mutex.h"
 
-struct EDDisassembler;
-typedef EDDisassembler *EDDisassemblerRef;
+#include "llvm-c/EnhancedDisassembly.h"
 
-struct EDInst;
-typedef EDInst *EDInstRef;
+#include "lldb/Core/Disassembler.h"
+#include "lldb/Host/Mutex.h"
 
 class DisassemblerLLVM : public lldb_private::Disassembler
 {