aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/LLVMTargetMachine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/CodeGen/LLVMTargetMachine.cpp')
-rw-r--r--llvm/lib/CodeGen/LLVMTargetMachine.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
index f9b7bf613ff6..37c0b44ea2b2 100644
--- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
@@ -64,8 +64,12 @@ void LLVMTargetMachine::initAsmInfo() {
if (Options.BinutilsVersion.first > 0)
TmpAsmInfo->setBinutilsVersion(Options.BinutilsVersion);
- if (Options.DisableIntegratedAS)
+ if (Options.DisableIntegratedAS) {
TmpAsmInfo->setUseIntegratedAssembler(false);
+ // If there is explict option disable integratedAS, we can't use it for
+ // inlineasm either.
+ TmpAsmInfo->setParseInlineAsmUsingAsmParser(false);
+ }
TmpAsmInfo->setPreserveAsmComments(Options.MCOptions.PreserveAsmComments);