r177398 - Go back to using the integrated assembler on windows ever when passed

[Rafael Espindola]

Author: rafael
Date: Tue Mar 19 09:23:00 2013
New Revision: 177398

URL: http://llvm.org/viewvc/llvm-project?rev=177398&view=rev
Log:
Go back to using the integrated assembler on windows ever when passed
-no-integrated-as. It is the only assembler we have there.

Added:
    cfe/trunk/test/Driver/no-integrated-as-win.c
Modified:
    cfe/trunk/lib/Driver/WindowsToolChain.cpp

Modified: cfe/trunk/lib/Driver/WindowsToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=177398&r1=177397&r2=177398&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Tue Mar 19 09:23:00 2013
@@ -41,8 +41,9 @@ Tool *Windows::constructTool(Action::Act
   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:

Added: cfe/trunk/test/Driver/no-integrated-as-win.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/no-integrated-as-win.c?rev=177398&view=auto
==============================================================================
--- cfe/trunk/test/Driver/no-integrated-as-win.c (added)
+++ cfe/trunk/test/Driver/no-integrated-as-win.c Tue Mar 19 09:23:00 2013
@@ -0,0 +1,3 @@
+// RUN: %clang -target x86_64-pc-win32 -no-integrated-as %s -c -v 2>&1 | FileCheck %s
+
+// CHECK: cc1as -triple x86_64-pc-win32