diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-05-13 01:24:18 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-05-13 01:24:18 +0000 |
| commit | 77056237d79556156cd5f0afb900ac2c73a3afd9 (patch) | |
| tree | def7372028dd2a19cd630171bed04aae0b833d33 /clang | |
| parent | 227144c23c4748cac2cd6523e8752cf24f56d3b4 (diff) | |
| download | bcm5719-llvm-77056237d79556156cd5f0afb900ac2c73a3afd9.tar.gz bcm5719-llvm-77056237d79556156cd5f0afb900ac2c73a3afd9.zip | |
Update for LLVM interface change in r181680.
llvm-svn: 181681
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Parse/ParseStmt.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/driver/cc1as_main.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp index 43b6965d314..f47b0e54357 100644 --- a/clang/lib/Parse/ParseStmt.cpp +++ b/clang/lib/Parse/ParseStmt.cpp @@ -2091,8 +2091,8 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { const std::string &TT = TheTriple.getTriple(); const llvm::Target *TheTarget = llvm::TargetRegistry::lookupTarget(TT, Error); - OwningPtr<llvm::MCAsmInfo> MAI(TheTarget->createMCAsmInfo(TT)); OwningPtr<llvm::MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TT)); + OwningPtr<llvm::MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, TT)); OwningPtr<llvm::MCObjectFileInfo> MOFI(new llvm::MCObjectFileInfo()); OwningPtr<llvm::MCSubtargetInfo> STI(TheTarget->createMCSubtargetInfo(TT, "", "")); diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index 232ea2f6681..46ba2463f11 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -287,12 +287,12 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, // it later. SrcMgr.setIncludeDirs(Opts.IncludePaths); - OwningPtr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(Opts.Triple)); - assert(MAI && "Unable to create target asm info!"); - OwningPtr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(Opts.Triple)); assert(MRI && "Unable to create target register info!"); + OwningPtr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, Opts.Triple)); + assert(MAI && "Unable to create target asm info!"); + bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj; formatted_raw_ostream *Out = GetOutputStream(Opts, Diags, IsBinary); if (!Out) |
