diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-19 14:23:00 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-19 14:23:00 +0000 |
| commit | a5981ba8ef41de067574fa3eef81e96226ffc0f6 (patch) | |
| tree | 9c04b8f23a3e7a9b917b0938e6b2181229814d9c /clang/lib | |
| parent | d3b56605f1d76310aa3ff0e0151204f28bc3280d (diff) | |
| download | bcm5719-llvm-a5981ba8ef41de067574fa3eef81e96226ffc0f6.tar.gz bcm5719-llvm-a5981ba8ef41de067574fa3eef81e96226ffc0f6.zip | |
Go back to using the integrated assembler on windows ever when passed
-no-integrated-as. It is the only assembler we have there.
llvm-svn: 177398
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/WindowsToolChain.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Driver/WindowsToolChain.cpp b/clang/lib/Driver/WindowsToolChain.cpp index b3fdb35d4c8..ae782727e4d 100644 --- a/clang/lib/Driver/WindowsToolChain.cpp +++ b/clang/lib/Driver/WindowsToolChain.cpp @@ -41,8 +41,9 @@ Tool *Windows::constructTool(Action::ActionClass AC) const { case Action::AssembleJobClass: if (getTriple().getEnvironment() == llvm::Triple::MachO) return new tools::darwin::Assemble(*this); - llvm_unreachable("We only have the integrated assembler on this TC"); - break; + // There no assembler we can use on windows other than the integrated + // assembler, so we ignore -no-integrated-as. + return new tools::ClangAs(*this); case Action::LinkJobClass: return new tools::visualstudio::Link(*this); default: |
