diff options
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 2 | ||||
| -rw-r--r-- | lldb/source/Expression/ClangExpressionParser.cpp | 22 | ||||
| -rw-r--r-- | lldb/source/Expression/IRDynamicChecks.cpp | 1 | ||||
| -rw-r--r-- | lldb/source/Expression/IRForTarget.cpp | 1 |
4 files changed, 23 insertions, 3 deletions
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index 3ada7ce6c2f..37874059422 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -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}); diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp index 59849351e19..0d693ce0aeb 100644 --- a/lldb/source/Expression/ClangExpressionParser.cpp +++ b/lldb/source/Expression/ClangExpressionParser.cpp @@ -244,10 +244,28 @@ 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); diff --git a/lldb/source/Expression/IRDynamicChecks.cpp b/lldb/source/Expression/IRDynamicChecks.cpp index a84fe8e7b52..584de69501f 100644 --- a/lldb/source/Expression/IRDynamicChecks.cpp +++ b/lldb/source/Expression/IRDynamicChecks.cpp @@ -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" diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp index a6d1651727f..4581712ceaa 100644 --- a/lldb/source/Expression/IRForTarget.cpp +++ b/lldb/source/Expression/IRForTarget.cpp @@ -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" |
