r195422 - Tidy up the no-external-assembler diag

[Alp Toker]

Author: alp
Date: Fri Nov 22 02:27:46 2013
New Revision: 195422

URL: http://llvm.org/viewvc/llvm-project?rev=195422&view=rev
Log:
Tidy up the no-external-assembler diag

Diags aren't usually in the first person, and 'windows' isn't the correct
product spelling to use in prose. Sidestep issues completely by making this
error message platform-neutral.

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
    cfe/trunk/lib/Driver/WindowsToolChain.cpp
    cfe/trunk/test/Driver/no-integrated-as-win.c

Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=195422&r1=195421&r2=195422&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Fri Nov 22 02:27:46 2013
@@ -35,8 +35,8 @@ def err_drv_output_argument_with_multipl
   "cannot specify -o when generating multiple output files">;
 def err_drv_out_file_argument_with_multiple_sources : Error<
   "cannot specify '%0%1' when compiling multiple source files">;
-def err_no_external_windows_assembler : Error<
-  "there is no external assembler we can use on windows">;
+def err_no_external_assembler : Error<
+  "there is no external assembler that can be used on this platform">;
 def err_drv_unable_to_remove_file : Error<
   "unable to remove file: %0">;
 def err_drv_command_failure : Error<

Modified: cfe/trunk/lib/Driver/WindowsToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/WindowsToolChain.cpp?rev=195422&r1=195421&r2=195422&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/WindowsToolChain.cpp Fri Nov 22 02:27:46 2013
@@ -45,7 +45,7 @@ Tool *Windows::buildLinker() const {
 Tool *Windows::buildAssembler() const {
   if (getTriple().getEnvironment() == llvm::Triple::MachO)
     return new tools::darwin::Assemble(*this);
-  getDriver().Diag(clang::diag::err_no_external_windows_assembler);
+  getDriver().Diag(clang::diag::err_no_external_assembler);
   return NULL;
 }
 

Modified: 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=195422&r1=195421&r2=195422&view=diff
==============================================================================
--- cfe/trunk/test/Driver/no-integrated-as-win.c (original)
+++ cfe/trunk/test/Driver/no-integrated-as-win.c Fri Nov 22 02:27:46 2013
@@ -1,5 +1,5 @@
 // RUN: %clang -target x86_64-pc-win32 -### -no-integrated-as %s -c 2>&1 | FileCheck %s
-// CHECK: there is no external assembler we can use on windows
+// CHECK: there is no external assembler that can be used on this platform
 
 // But there is for mingw.  The source file should only be mentioned once for
 // the compile step.