Author: Justas Janickas Date: 2021-08-02T14:10:15+01:00 New Revision: b13fc7311eabca27b3baea99b7be6edef0213406
URL: https://github.com/llvm/llvm-project/commit/b13fc7311eabca27b3baea99b7be6edef0213406 DIFF: https://github.com/llvm/llvm-project/commit/b13fc7311eabca27b3baea99b7be6edef0213406.diff LOG: [OpenCL] __cpp_threadsafe_static_init is by default undefined in OpenCL mode. Definition of `__cpp_threadsafe_static_init` macro is controlled by language option Opts.ThreadsafeStatics. This patch sets language option to false by default in OpenCL mode, resulting in macro `__cpp_threadsafe_static_init` being undefined. Default value can be overridden using command line option -fthreadsafe-statics. Change is supposed to address portability because not all OpenCL vendors support thread safe implementation of static initialization. Fixes llvm.org/PR48012 Differential Revision: https://reviews.llvm.org/D107163 Added: clang/test/Driver/threadsafe-statics.clcpp Modified: clang/lib/Driver/ToolChains/Clang.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index e13302528cbd1..7042bf5fc9e2a 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -6192,7 +6192,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // than 19. if (!Args.hasFlag(options::OPT_fthreadsafe_statics, options::OPT_fno_threadsafe_statics, - !IsWindowsMSVC || IsMSVC2015Compatible)) + !types::isOpenCL(InputType) && + (!IsWindowsMSVC || IsMSVC2015Compatible))) CmdArgs.push_back("-fno-threadsafe-statics"); // -fno-delayed-template-parsing is default, except when targeting MSVC. diff --git a/clang/test/Driver/threadsafe-statics.clcpp b/clang/test/Driver/threadsafe-statics.clcpp new file mode 100644 index 0000000000000..3e71293e7ce7e --- /dev/null +++ b/clang/test/Driver/threadsafe-statics.clcpp @@ -0,0 +1,11 @@ +// RUN: %clang -### -c -DNO_THREADSAFE_STATICS %s 2>&1 | FileCheck --check-prefix=CHECK-NO-THREADSAFE-STATICS %s +// RUN: %clang -### -fno-threadsafe-statics -DNO_THREADSAFE_STATICS -c %s 2>&1 | FileCheck --check-prefix=CHECK-NO-THREADSAFE-STATICS %s + +// CHECK-NO-THREADSAFE-STATICS: "-cc1" +// CHECK-NO-THREADSAFE-STATICS: "-fno-threadsafe-statics" +// CHECK-NO-THREADSAFE-STATICS-NOT: "-fthreadsafe-statics" + +// RUN: %clang -### -fthreadsafe-statics -DTHREADSAFE_STATICS -c %s 2>&1 | FileCheck --check-prefix=CHECK-THREADSAFE-STATICS %s + +// CHECK-THREADSAFE-STATICS: "-cc1" +// CHECK-THREADSAFE-STATICS-NOT: "-fno-threadsafe-statics" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
