diff options
| -rw-r--r-- | openmp/cmake/HandleOpenMPOptions.cmake | 2 | ||||
| -rw-r--r-- | openmp/cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | openmp/runtime/test/lit.cfg | 4 | ||||
| -rw-r--r-- | openmp/tools/archer/tests/lit.cfg | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/openmp/cmake/HandleOpenMPOptions.cmake b/openmp/cmake/HandleOpenMPOptions.cmake index db3a5bf..b9faeef 100644 --- a/openmp/cmake/HandleOpenMPOptions.cmake +++ b/openmp/cmake/HandleOpenMPOptions.cmake @@ -29,4 +29,4 @@ append_if(OPENMP_HAVE_WNO_EXTRA_FLAG "-Wno-extra" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_PEDANTIC_FLAG "-Wno-pedantic" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG "-Wno-maybe-uninitialized" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) -append_if(OPENMP_HAVE_STD_CPP14_FLAG "-std=c++14" CMAKE_CXX_FLAGS) +append_if(OPENMP_HAVE_STD_CPP14_FLAG "-std=c++17" CMAKE_CXX_FLAGS) diff --git a/openmp/cmake/config-ix.cmake b/openmp/cmake/config-ix.cmake index d651523..5a76805 100644 --- a/openmp/cmake/config-ix.cmake +++ b/openmp/cmake/config-ix.cmake @@ -30,4 +30,4 @@ check_cxx_compiler_flag(-Wno-extra OPENMP_HAVE_WNO_EXTRA_FLAG) check_cxx_compiler_flag(-Wno-pedantic OPENMP_HAVE_WNO_PEDANTIC_FLAG) check_cxx_compiler_flag(-Wno-maybe-uninitialized OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG) -check_cxx_compiler_flag(-std=c++14 OPENMP_HAVE_STD_CPP14_FLAG) +check_cxx_compiler_flag(-std=c++17 OPENMP_HAVE_STD_CPP14_FLAG) diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index fe1886b..a8dfdff 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -127,9 +127,9 @@ config.substitutions.append(("%libomp-c99-compile-and-run", \ config.substitutions.append(("%libomp-cxx-compile-and-run", \ "%libomp-cxx-compile && %libomp-run")) config.substitutions.append(("%libomp-cxx-compile-c", \ - "%clangXX %openmp_flags %flags -std=c++14 -x c++ %s -o %t" + libs)) + "%clangXX %openmp_flags %flags -std=c++17 -x c++ %s -o %t" + libs)) config.substitutions.append(("%libomp-cxx-compile", \ - "%clangXX %openmp_flags %flags -std=c++14 %s -o %t" + libs)) + "%clangXX %openmp_flags %flags -std=c++17 %s -o %t" + libs)) config.substitutions.append(("%libomp-compile", \ "%clang %openmp_flags %flags %s -o %t" + libs)) config.substitutions.append(("%libomp-c99-compile", \ diff --git a/openmp/tools/archer/tests/lit.cfg b/openmp/tools/archer/tests/lit.cfg index 2dd85fb..3caa3ea 100644 --- a/openmp/tools/archer/tests/lit.cfg +++ b/openmp/tools/archer/tests/lit.cfg @@ -105,7 +105,7 @@ config.substitutions.append(("%libarcher-compile-and-run", \ config.substitutions.append(("%libarcher-cxx-compile-and-run", \ "%libarcher-cxx-compile && %libarcher-run")) config.substitutions.append(("%libarcher-cxx-compile", \ - "%clang-archerXX %openmp_flags %archer_flags %flags -std=c++14 %s -o %t" + libs)) + "%clang-archerXX %openmp_flags %archer_flags %flags -std=c++17 %s -o %t" + libs)) config.substitutions.append(("%libarcher-compile", \ "%clang-archer %openmp_flags %archer_flags %flags %s -o %t" + libs)) config.substitutions.append(("%libarcher-run-race", "%suppression %deflake %t 2>&1 | tee %t.log")) |