From 4bdcbad8ffe2cb49391091a3ddb3a1b6f3ae1ae6 Mon Sep 17 00:00:00 2001 From: Anastasia Stulova Date: Thu, 12 Apr 2018 14:17:04 +0000 Subject: [OpenCL] Added -std/-cl-std=c++ This is std option for OpenCL C++ v1.0. Differential Revision: https://reviews.llvm.org/D45363 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@329911 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 2 +- include/clang/Basic/LangOptions.def | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include/clang/Basic') diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 0b0b103060..9c3ad98138 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -7966,7 +7966,7 @@ def err_generic_sel_multi_match : Error< // Blocks def err_blocks_disable : Error<"blocks support disabled - compile with -fblocks" - " or %select{pick a deployment target that supports them|for OpenCL 2.0 or above}0">; + " or %select{pick a deployment target that supports them|for OpenCL 2.0}0">; def err_block_returning_array_function : Error< "block cannot return %select{array|function}0 type %1">; diff --git a/include/clang/Basic/LangOptions.def b/include/clang/Basic/LangOptions.def index 0802bbefcf..c05f0dc545 100644 --- a/include/clang/Basic/LangOptions.def +++ b/include/clang/Basic/LangOptions.def @@ -188,7 +188,8 @@ ENUM_LANGOPT(DefaultCallingConv, DefaultCallingConvention, 3, DCC_None, "default LANGOPT(ShortEnums , 1, 0, "short enum types") LANGOPT(OpenCL , 1, 0, "OpenCL") -LANGOPT(OpenCLVersion , 32, 0, "OpenCL version") +LANGOPT(OpenCLVersion , 32, 0, "OpenCL C version") +LANGOPT(OpenCLCPlusPlusVersion , 32, 0, "OpenCL C++ version") LANGOPT(NativeHalfType , 1, 0, "Native half type support") LANGOPT(NativeHalfArgsAndReturns, 1, 0, "Native half args and returns") LANGOPT(HalfArgsAndReturns, 1, 0, "half args and returns") -- cgit v1.2.3