diff options
author | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-02-12 15:39:20 +0000 |
---|---|---|
committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-02-12 15:39:20 +0000 |
commit | 7580df334e9fd8964bd158d7feeadc4f9cdf43bb (patch) | |
tree | b31c6c72d6130dbb77cd2b212f014fc4304c0c0b /lib/CodeGen/LLVMTargetMachine.cpp | |
parent | 57edb9588bce544551b3034170eb66c632c3540b (diff) | |
download | llvm-7580df334e9fd8964bd158d7feeadc4f9cdf43bb.tar.gz llvm-7580df334e9fd8964bd158d7feeadc4f9cdf43bb.tar.bz2 llvm-7580df334e9fd8964bd158d7feeadc4f9cdf43bb.tar.xz |
Revert r201237+r201238: Demote EmitRawText call in AsmPrinter::EmitInlineAsm() and remove hasRawTextSupport() call
It introduced multiple test failures in the buildbots.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201241 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/LLVMTargetMachine.cpp')
-rw-r--r-- | lib/CodeGen/LLVMTargetMachine.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index 51cd9d6861..d897757ab7 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -53,10 +53,6 @@ static cl::opt<cl::boolOrDefault> AsmVerbose("asm-verbose", cl::desc("Add comments to directives."), cl::init(cl::BOU_UNSET)); -static cl::opt<bool> -NoIntegratedAssembler("no-integrated-as", cl::Hidden, - cl::desc("Disable integrated assembler")); - static bool getVerboseAsm() { switch (AsmVerbose) { case cl::BOU_UNSET: return TargetMachine::getAsmVerbosityDefault(); @@ -67,20 +63,14 @@ static bool getVerboseAsm() { } void LLVMTargetMachine::initAsmInfo() { - MCAsmInfo *TmpAsmInfo = TheTarget.createMCAsmInfo(*getRegisterInfo(), - TargetTriple); + AsmInfo = TheTarget.createMCAsmInfo(*getRegisterInfo(), TargetTriple); // TargetSelect.h moved to a different directory between LLVM 2.9 and 3.0, // and if the old one gets included then MCAsmInfo will be NULL and // we'll crash later. // Provide the user with a useful error message about what's wrong. - assert(TmpAsmInfo && "MCAsmInfo not initialized. " + assert(AsmInfo && "MCAsmInfo not initialized. " "Make sure you include the correct TargetSelect.h" "and that InitializeAllTargetMCs() is being invoked!"); - - if (NoIntegratedAssembler) - TmpAsmInfo->setUseIntegratedAssembler(false); - - AsmInfo = TmpAsmInfo; } LLVMTargetMachine::LLVMTargetMachine(const Target &T, StringRef Triple, |