diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-02-25 20:32:43 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-02-25 20:32:43 +0000 |
| commit | 4c5c8ccf40295da236405aa89f9f5d06fc15ae28 (patch) | |
| tree | 950f9557c3a68ec32b3dd20787f46a8a1634c964 /clang/lib/Driver | |
| parent | 25326f060d5139becacee2759b0d7bb550e97f7a (diff) | |
| download | bcm5719-llvm-4c5c8ccf40295da236405aa89f9f5d06fc15ae28.tar.gz bcm5719-llvm-4c5c8ccf40295da236405aa89f9f5d06fc15ae28.zip | |
Temporarily revert r151288:
ARM: enable the integrated assembler by default for Darwin.
llvm-svn: 151454
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/ToolChains.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h index 0fb213828ff..98c226b0e13 100644 --- a/clang/lib/Driver/ToolChains.h +++ b/clang/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 { |
