Updated LLVM to pick up fixes to the ARM instruction

tables.

llvm-svn: 129500
This commit is contained in:
Sean Callanan 2011-04-14 02:01:31 +00:00
parent 9eb0b7d2f1
commit 1b1bf6e982
4 changed files with 23 additions and 3 deletions

View File

@ -26,7 +26,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc
our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
our $llvm_revision = "128303";
our $llvm_revision = "129495";
our $llvm_source_dir = "$ENV{SRCROOT}";
our @archs = split (/\s+/, $ENV{ARCHS});

View File

@ -244,9 +244,27 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
// and other things that _are_ target specific really shouldn't just be
// using the host triple. This needs to be fixed in a better way.
if (target && target->GetArchitecture().IsValid())
m_compiler->getTargetOpts().Triple = target->GetArchitecture().GetTriple().str();
{
std::string triple = target->GetArchitecture().GetTriple().str();
int dash_count = 0;
for (int i = 0; i < triple.size(); ++i)
{
if (triple[i] == '-')
dash_count++;
if (dash_count == 3)
{
triple.resize(i);
break;
}
}
m_compiler->getTargetOpts().Triple = triple;
}
else
{
m_compiler->getTargetOpts().Triple = llvm::sys::getHostTriple();
}
// 3. Set up various important bits of infrastructure.
m_compiler->createDiagnostics(0, 0);

View File

@ -18,6 +18,7 @@
#include "lldb/Target/StackFrame.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Constants.h"
#include "llvm/Function.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h"

View File

@ -10,6 +10,7 @@
#include "lldb/Expression/IRForTarget.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Constants.h"
#include "llvm/InstrTypes.h"
#include "llvm/Instructions.h"
#include "llvm/Intrinsics.h"