diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2011-07-25 23:25:09 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-25 23:25:09 +0000 |
| commit | 21118dc86e38132662430c10f1bb4c6f5923270a (patch) | |
| tree | dcc2e1dadc54b3ef29443a8849dbd1dcb67fb8e5 /tools/driver | |
| parent | 48a8d14fc6f064a5297024c2b34733a4080b2efe (diff) | |
Rename TargetAsmBackend to MCAsmBackend; rename createAsmBackend to createMCAsmBackend.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136011 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/driver')
| -rw-r--r-- | tools/driver/cc1as_main.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp index 9776614356..4bee907c9c 100644 --- a/tools/driver/cc1as_main.cpp +++ b/tools/driver/cc1as_main.cpp @@ -34,7 +34,7 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" -#include "llvm/MC/TargetAsmBackend.h" +#include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/TargetAsmParser.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FormattedStream.h" @@ -299,14 +299,14 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, Diagnostic &Diags) { MCInstPrinter *IP = TheTarget->createMCInstPrinter(Opts.OutputAsmVariant, *MAI); MCCodeEmitter *CE = 0; - TargetAsmBackend *TAB = 0; + MCAsmBackend *MAB = 0; if (Opts.ShowEncoding) { CE = TheTarget->createCodeEmitter(*TM->getInstrInfo(), STI, Ctx); - TAB = TheTarget->createAsmBackend(Opts.Triple); + MAB = TheTarget->createMCAsmBackend(Opts.Triple); } Str.reset(TheTarget->createAsmStreamer(Ctx, *Out, /*asmverbose*/true, /*useLoc*/ true, - /*useCFI*/ true, IP, CE, TAB, + /*useCFI*/ true, IP, CE, MAB, Opts.ShowInst)); } else if (Opts.OutputType == AssemblerInvocation::FT_Null) { Str.reset(createNullStreamer(Ctx)); @@ -315,8 +315,8 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, Diagnostic &Diags) { "Invalid file type!"); MCCodeEmitter *CE = TheTarget->createCodeEmitter(*TM->getInstrInfo(), STI, Ctx); - TargetAsmBackend *TAB = TheTarget->createAsmBackend(Opts.Triple); - Str.reset(TheTarget->createObjectStreamer(Opts.Triple, Ctx, *TAB, *Out, + MCAsmBackend *MAB = TheTarget->createMCAsmBackend(Opts.Triple); + Str.reset(TheTarget->createObjectStreamer(Opts.Triple, Ctx, *MAB, *Out, CE, Opts.RelaxAll, Opts.NoExecStack)); Str.get()->InitSections(); @@ -364,7 +364,6 @@ int cc1as_main(const char **ArgBegin, const char **ArgEnd, // Initialize targets and assembly printers/parsers. InitializeAllTargetInfos(); InitializeAllTargetMCs(); - InitializeAllAsmPrinters(); InitializeAllAsmParsers(); // Construct our diagnostic client. |