diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-08-26 15:05:12 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-08-26 15:05:12 +0000 |
| commit | f1b7ab3fd3e9dab82f01a15b2e867a4e5940991c (patch) | |
| tree | f417931c3a1e1f132aef1d2a01494b823b48b1a9 | |
| parent | 42308c2a02f29bae72439c7bb171c36e974a9064 (diff) | |
Merge 'r369779 - [OpenCL] Renamed value of std flag in C++ mode'
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_90@369913 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Frontend/LangStandards.def | 2 | ||||
| -rw-r--r-- | test/Driver/unknown-std.cl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Frontend/LangStandards.def b/include/clang/Frontend/LangStandards.def index 72ea23562e..fef7d4dd9a 100644 --- a/include/clang/Frontend/LangStandards.def +++ b/include/clang/Frontend/LangStandards.def @@ -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) diff --git a/test/Driver/unknown-std.cl b/test/Driver/unknown-std.cl index 285582ee0a..6f371bac13 100644 --- a/test/Driver/unknown-std.cl +++ b/test/Driver/unknown-std.cl @@ -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: {{^.+$}} |