diff options
| author | Eric Christopher <echristo@gmail.com> | 2015-03-31 00:10:23 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2015-03-31 00:10:23 +0000 |
| commit | 7e0fadf837193ab1c71a1d51fc0ecda564b31462 (patch) | |
| tree | 8be0593a5679826cdd0be835bf0ab3b9a4355ec4 | |
| parent | f8019408dc0167c1227e51b3d54427db062c3e63 (diff) | |
| download | bcm5719-llvm-7e0fadf837193ab1c71a1d51fc0ecda564b31462.tar.gz bcm5719-llvm-7e0fadf837193ab1c71a1d51fc0ecda564b31462.zip | |
Update for llvm commit r233648.
llvm-svn: 233649
| -rw-r--r-- | clang/lib/Parse/ParseStmtAsm.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/driver/cc1as_main.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseStmtAsm.cpp b/clang/lib/Parse/ParseStmtAsm.cpp index 9523ec33432..85eff1712d2 100644 --- a/clang/lib/Parse/ParseStmtAsm.cpp +++ b/clang/lib/Parse/ParseStmtAsm.cpp @@ -530,7 +530,7 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { TheTarget->createMCAsmParser(*STI, *Parser, *MII, MCOptions)); std::unique_ptr<llvm::MCInstPrinter> IP( - TheTarget->createMCInstPrinter(1, *MAI, *MII, *MRI, *STI)); + TheTarget->createMCInstPrinter(llvm::Triple(TT), 1, *MAI, *MII, *MRI)); // Change to the Intel dialect. Parser->setAssemblerDialect(1); diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index e528b028dc3..89dd46714c8 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -358,9 +358,8 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, // FIXME: There is a bit of code duplication with addPassesToEmitFile. if (Opts.OutputType == AssemblerInvocation::FT_Asm) { - MCInstPrinter *IP = - TheTarget->createMCInstPrinter(Opts.OutputAsmVariant, *MAI, *MCII, *MRI, - *STI); + MCInstPrinter *IP = TheTarget->createMCInstPrinter( + llvm::Triple(Opts.Triple), Opts.OutputAsmVariant, *MAI, *MCII, *MRI); MCCodeEmitter *CE = nullptr; MCAsmBackend *MAB = nullptr; if (Opts.ShowEncoding) { |
