Skip to content

Commit 1ebe949

Browse files
author
Kim Barrett
committed
8314488: Compiling the JDK with C++17
Reviewed-by: dholmes, stefank, ayang, kvn, iwalulya, jsjolen, ihse
1 parent b674a42 commit 1ebe949

File tree

7 files changed

+1151
-88
lines changed

7 files changed

+1151
-88
lines changed

doc/hotspot-style.html

Lines changed: 571 additions & 46 deletions
Large diffs are not rendered by default.

doc/hotspot-style.md

Lines changed: 573 additions & 35 deletions
Large diffs are not rendered by default.

make/autoconf/flags-cflags.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,11 +597,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
597597
598598
# CXXFLAGS C++ language level for all of JDK, including Hotspot.
599599
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
600-
LANGSTD_CXXFLAGS="-std=c++14"
600+
LANGSTD_CXXFLAGS="-std=c++17"
601601
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
602-
LANGSTD_CXXFLAGS="-std:c++14"
602+
LANGSTD_CXXFLAGS="-std:c++17"
603603
else
604-
AC_MSG_ERROR([Cannot enable C++14 for this toolchain])
604+
AC_MSG_ERROR([Cannot enable C++17 for this toolchain])
605605
fi
606606
TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
607607
TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"

make/ide/vscode/hotspot/indexers/ccls-settings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Configure cpptools IntelliSense
22
"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
33
"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
4-
"C_Cpp.default.cppStandard": "c++14",
4+
"C_Cpp.default.cppStandard": "c++17",
55
"C_Cpp.default.compilerPath": "{{COMPILER}}",
66

77
// Configure ccls

make/ide/vscode/hotspot/indexers/clangd-settings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Configure cpptools IntelliSense
22
"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
33
"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
4-
"C_Cpp.default.cppStandard": "c++14",
4+
"C_Cpp.default.cppStandard": "c++17",
55
"C_Cpp.default.compilerPath": "{{COMPILER}}",
66

77
// Configure clangd
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Configure cpptools IntelliSense
22
"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
33
"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
4-
"C_Cpp.default.cppStandard": "c++14",
4+
"C_Cpp.default.cppStandard": "c++17",
55
"C_Cpp.default.compilerPath": "{{COMPILER}}",

make/ide/vscode/hotspot/indexers/rtags-settings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Configure cpptools IntelliSense
22
"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
33
"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
4-
"C_Cpp.default.cppStandard": "c++14",
4+
"C_Cpp.default.cppStandard": "c++17",
55
"C_Cpp.default.compilerPath": "{{COMPILER}}",
66

77
// Configure RTags

0 commit comments

Comments
 (0)