diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2011-07-20 19:53:19 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-20 19:53:19 +0000 |
| commit | 66488ed140f00daee0c3f0370bac337819ee8bc0 (patch) | |
| tree | 795be727b9726a17e0ca97cebf3c2c42fc897d08 | |
| parent | dd4286b5b7b02b8bb962e4b996b8f36cb7935d4f (diff) | |
Match MCContext change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135612 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/driver/cc1as_main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp index fe7e4f7606..17967302ab 100644 --- a/tools/driver/cc1as_main.cpp +++ b/tools/driver/cc1as_main.cpp @@ -48,7 +48,6 @@ #include "llvm/Support/Signals.h" #include "llvm/Support/system_error.h" #include "llvm/Target/TargetAsmBackend.h" -#include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetAsmParser.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetInstrInfo.h" @@ -277,13 +276,13 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, Diagnostic &Diags) { return false; } - const TargetAsmInfo *tai = new TargetAsmInfo(*TM); // FIXME: This is not pretty. MCContext has a ptr to MCObjectFileInfo and // MCObjectFileInfo needs a MCContext reference in order to initialize itself. OwningPtr<MCObjectFileInfo> MOFI(new MCObjectFileInfo()); - MCContext Ctx(*MAI, *MRI, MOFI.get(), tai); + MCContext Ctx(*MAI, *MRI, MOFI.get()); // FIXME: Assembler behavior can change with -static. - MOFI->InitMCObjectFileInfo(Opts.Triple, Reloc::Default, Ctx); + MOFI->InitMCObjectFileInfo(Opts.Triple, + Reloc::Default, CodeModel::Default, Ctx); if (Opts.SaveTemporaryLabels) Ctx.setAllowTemporaryLabels(false); |