aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-02-25 20:32:43 +0000
committerChad Rosier <mcrosier@apple.com>2012-02-25 20:32:43 +0000
commitf1868793bfb3ffcb6f569cf362f7c5db1f52525c (patch)
tree88c555dd83844ea49543c2885895cdd5c7d3a218
parentee7a1981c69e06b81eccde0c5409dfd1ef5784de (diff)
Temporarily revert r151288:
ARM: enable the integrated assembler by default for Darwin. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151454 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/ToolChains.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 0fb213828f..98c226b0e1 100644
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -329,8 +329,9 @@ public:
#ifdef DISABLE_DEFAULT_INTEGRATED_ASSEMBLER
return false;
#else
- // Default integrated assembler to on for Darwin.
- return true;
+ // Default integrated assembler to on for x86.
+ return (getTriple().getArch() == llvm::Triple::x86 ||
+ getTriple().getArch() == llvm::Triple::x86_64);
#endif
}
virtual bool IsStrictAliasingDefault() const {