diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-11-26 10:24:32 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-11-26 10:24:32 +0000 |
| commit | e9a9086c4bcf404d19cec52baa5a6d27445559ec (patch) | |
| tree | ed3da015cbe34fead9b7d3391e7165ded16f3ee5 | |
| parent | ffa56211ae9b3c84897d91bbc561950f30004964 (diff) | |
| download | clang-e9a9086c4bcf404d19cec52baa5a6d27445559ec.tar.gz clang-e9a9086c4bcf404d19cec52baa5a6d27445559ec.tar.bz2 clang-e9a9086c4bcf404d19cec52baa5a6d27445559ec.tar.xz | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@195726 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticDriverKinds.td | 4 | ||||
| -rw-r--r-- | lib/Driver/WindowsToolChain.cpp | 2 | ||||
| -rw-r--r-- | test/Driver/no-integrated-as-win.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index 76d8c4aa7d..b48980778c 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/include/clang/Basic/DiagnosticDriverKinds.td @@ -35,8 +35,8 @@ def err_drv_output_argument_with_multiple_files : Error< "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< diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index db36f1eba7..2b6320ac12 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/lib/Driver/WindowsToolChain.cpp @@ -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; } diff --git a/test/Driver/no-integrated-as-win.c b/test/Driver/no-integrated-as-win.c index 1ab2480c5d..8f590a0901 100644 --- a/test/Driver/no-integrated-as-win.c +++ b/test/Driver/no-integrated-as-win.c @@ -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. |