[llvm-branch-commits] [cfe-branch] r369913 - Merge 'r369779 - [OpenCL] Renamed value of std flag in C++ mode'

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug 26 08:05:12 2019
New Revision: 369913

URL: http://llvm.org/viewvc/llvm-project?rev=369913&view=rev
Log:
Merge 'r369779 - [OpenCL] Renamed value of std flag in C++ mode'

Modified:
    cfe/branches/release_90/include/clang/Frontend/LangStandards.def
    cfe/branches/release_90/test/Driver/unknown-std.cl

Modified: cfe/branches/release_90/include/clang/Frontend/LangStandards.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/include/clang/Frontend/LangStandards.def?rev=369913&r1=369912&r2=369913&view=diff
==============================================================================
--- cfe/branches/release_90/include/clang/Frontend/LangStandards.def (original)
+++ cfe/branches/release_90/include/clang/Frontend/LangStandards.def Mon Aug 26 08:05:12 2019
@@ -165,7 +165,7 @@ LANGSTANDARD(opencl12, "cl1.2",
 LANGSTANDARD(opencl20, "cl2.0",
              OpenCL, "OpenCL 2.0",
              LineComment | C99 | Digraphs | HexFloat | OpenCL)
-LANGSTANDARD(openclcpp, "c++",
+LANGSTANDARD(openclcpp, "clc++",
              OpenCL, "C++ for OpenCL",
              LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | CPlusPlus17 |
              Digraphs | HexFloat | OpenCL)

Modified: cfe/branches/release_90/test/Driver/unknown-std.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Driver/unknown-std.cl?rev=369913&r1=369912&r2=369913&view=diff
==============================================================================
--- cfe/branches/release_90/test/Driver/unknown-std.cl (original)
+++ cfe/branches/release_90/test/Driver/unknown-std.cl Mon Aug 26 08:05:12 2019
@@ -10,7 +10,7 @@
 // CHECK-NEXT: note: use 'cl1.1' for 'OpenCL 1.1' standard
 // CHECK-NEXT: note: use 'cl1.2' for 'OpenCL 1.2' standard
 // CHECK-NEXT: note: use 'cl2.0' for 'OpenCL 2.0' standard
-// CHECK-NEXT: note: use 'c++' for 'C++ for OpenCL' standard
+// CHECK-NEXT: note: use 'clc++' for 'C++ for OpenCL' standard
 
 // Make sure that no other output is present.
 // CHECK-NOT: {{^.+$}}