summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnastasia Stulova <anastasia.stulova@arm.com>2019-08-23 17:10:33 +0000
committerAnastasia Stulova <anastasia.stulova@arm.com>2019-08-23 17:10:33 +0000
commitad5047d23dda864b61527ea95154152b93bd8448 (patch)
tree4519b7ddfd54094a4e9a704e35cba372d7f88934
parent0ae549814693eb201d7e7a0a77856e55a98e19ee (diff)
downloadbcm5719-llvm-ad5047d23dda864b61527ea95154152b93bd8448.tar.gz
bcm5719-llvm-ad5047d23dda864b61527ea95154152b93bd8448.zip
[OpenCL] Renamed value of std flag in C++ mode.
Clang should accept -std=clc++ (not -std=c++!) for OpenCL. This was forgotten in r367008. llvm-svn: 369779
-rw-r--r--clang/include/clang/Basic/LangStandards.def2
-rw-r--r--clang/test/Driver/unknown-std.cl2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/LangStandards.def b/clang/include/clang/Basic/LangStandards.def
index 537ab2c7939..427691fb71e 100644
--- a/clang/include/clang/Basic/LangStandards.def
+++ b/clang/include/clang/Basic/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/clang/test/Driver/unknown-std.cl b/clang/test/Driver/unknown-std.cl
index 285582ee0af..6f371bac13a 100644
--- a/clang/test/Driver/unknown-std.cl
+++ b/clang/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: {{^.+$}}
OpenPOWER on IntegriCloud