[llvm-branch-commits] [cfe-branch] r195726 - Merging r195422:

[Bill Wendling]

Author: void
Date: Tue Nov 26 04:24:32 2013
New Revision: 195726

URL: http://llvm.org/viewvc/llvm-project?rev=195726&view=rev
Log:
Merging r195422:
------------------------------------------------------------------------
r195422 | alp | 2013-11-22 00:27:46 -0800 (Fri, 22 Nov 2013) | 5 lines

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/branches/release_34/   (props changed)
    cfe/branches/release_34/include/clang/Basic/DiagnosticDriverKinds.td
    cfe/branches/release_34/lib/Driver/WindowsToolChain.cpp
    cfe/branches/release_34/test/Driver/no-integrated-as-win.c

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 26 04:24:32 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195420,195501,195547,195556,195558,195587,195620,195687,195710
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195420,195422,195501,195547,195556,195558,195587,195620,195687,195710
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/include/clang/Basic/DiagnosticDriverKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/include/clang/Basic/DiagnosticDriverKinds.td?rev=195726&r1=195725&r2=195726&view=diff
==============================================================================
--- cfe/branches/release_34/include/clang/Basic/DiagnosticDriverKinds.td (original)
+++ cfe/branches/release_34/include/clang/Basic/DiagnosticDriverKinds.td Tue Nov 26 04:24:32 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/branches/release_34/lib/Driver/WindowsToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/WindowsToolChain.cpp?rev=195726&r1=195725&r2=195726&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/WindowsToolChain.cpp (original)
+++ cfe/branches/release_34/lib/Driver/WindowsToolChain.cpp Tue Nov 26 04:24:32 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/branches/release_34/test/Driver/no-integrated-as-win.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/test/Driver/no-integrated-as-win.c?rev=195726&r1=195725&r2=195726&view=diff
==============================================================================
--- cfe/branches/release_34/test/Driver/no-integrated-as-win.c (original)
+++ cfe/branches/release_34/test/Driver/no-integrated-as-win.c Tue Nov 26 04:24:32 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.