diff options
| author | Greg Clayton <gclayton@apple.com> | 2010-07-21 16:57:26 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2010-07-21 16:57:26 +0000 |
| commit | d1daf00b2815db911aec8aba22b60539f1e8fa89 (patch) | |
| tree | ab2963421cbbbccf45336e2c3d12018a0d35ebcb | |
| parent | b3fa6bf0effbc31db845d09b6e41c683364ac3b9 (diff) | |
| download | bcm5719-llvm-d1daf00b2815db911aec8aba22b60539f1e8fa89.tar.gz bcm5719-llvm-d1daf00b2815db911aec8aba22b60539f1e8fa89.zip | |
Updated LLVM and Clang to July 20 at 16:00.
llvm-svn: 109016
| -rw-r--r-- | lldb/lldb.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 7 | ||||
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj index b8b0d505c8b..d14976fc0ee 100644 --- a/lldb/lldb.xcodeproj/project.pbxproj +++ b/lldb/lldb.xcodeproj/project.pbxproj @@ -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", diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index aaf7d8e951c..1f260818829 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -25,7 +25,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc 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 @@ our @archive_files = ( "$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 @@ sub build_llvm if (!-e $llvm_dstroot_arch_archive) { $do_make = 1; + } + else + { + print "LLVM architecture archive for ${arch} is '$llvm_dstroot_arch_archive'\n"; } } else diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h index 7116e595233..181710c5ffe 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h @@ -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 { |
