diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2011-07-08 01:53:10 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-08 01:53:10 +0000 |
| commit | ebdeeab812beec0385b445f3d4c41a114e0d972f (patch) | |
| tree | 20eaafc6f227ca94201b0b6ac02d94b06b608229 /tools | |
| parent | 1fb0955cab05ff71f5bbad523b0374db3b08b201 (diff) | |
| download | llvm-ebdeeab812beec0385b445f3d4c41a114e0d972f.tar.gz llvm-ebdeeab812beec0385b445f3d4c41a114e0d972f.tar.bz2 llvm-ebdeeab812beec0385b445f3d4c41a114e0d972f.tar.xz | |
Eliminate asm parser's dependency on TargetMachine:
- Each target asm parser now creates its own MCSubtatgetInfo (if needed).
- Changed AssemblerPredicate to take subtarget features which tablegen uses
to generate asm matcher subtarget feature queries. e.g.
"ModeThumb,FeatureThumb2" is translated to
"(Bits & ModeThumb) != 0 && (Bits & FeatureThumb2) != 0".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134678 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-mc/llvm-mc.cpp | 3 | ||||
| -rw-r--r-- | tools/lto/LTOModule.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index cf260480f3..15304fcc09 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -371,7 +371,8 @@ static int AssembleInput(const char *ProgName) { OwningPtr<MCAsmParser> Parser(createMCAsmParser(*TheTarget, SrcMgr, Ctx, *Str.get(), *MAI)); - OwningPtr<TargetAsmParser> TAP(TheTarget->createAsmParser(*Parser, *TM)); + OwningPtr<TargetAsmParser> + TAP(TheTarget->createAsmParser(TripleName, MCPU, FeaturesStr, *Parser)); if (!TAP) { errs() << ProgName << ": error: this target does not support assembly parsing.\n"; diff --git a/tools/lto/LTOModule.cpp b/tools/lto/LTOModule.cpp index f8b42f1393..1794c9755b 100644 --- a/tools/lto/LTOModule.cpp +++ b/tools/lto/LTOModule.cpp @@ -619,7 +619,10 @@ bool LTOModule::addAsmGlobalSymbols(MCContext &Context) { Context, *Streamer, *_target->getMCAsmInfo())); OwningPtr<TargetAsmParser> - TAP(_target->getTarget().createAsmParser(*Parser.get(), *_target.get())); + TAP(_target->getTarget().createAsmParser(_target->getTargetTriple(), + _target->getTargetCPU(), + _target->getTargetFeatureString(), + *Parser.get())); Parser->setTargetParser(*TAP); int Res = Parser->Run(false); if (Res) |