SAP · SapMachine · Mar 4, 2026 · Mar 9, 2026 · Mar 11, 2026 · Mar 12, 2026
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+
+
+
+---------
+- [ ] I confirm that I make this contribution in accordance with the [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai).
diff --git a/.jcheck/conf b/.jcheck/conf
@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=17.0.19
+version=17.0.20
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.4
+JTREG_MINIMUM_VERSION=7.5.2
 GTEST_MINIMUM_VERSION=1.13.0
 
 ###############################################################################

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
@@ -360,7 +360,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
 [
   # Restore old path, except for the microsoft toolchain, which requires the
   # toolchain path to remain in place. Otherwise the compiler will not work in
-  # some siutations in later configure checks.
+  # some situations in later configure checks.
   if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
     PATH="$OLD_PATH"
   fi
@@ -369,10 +369,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
   # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
   CFLAGS="$ORG_CFLAGS"
   CXXFLAGS="$ORG_CXXFLAGS"
-
-  # filter out some unwanted additions autoconf may add to CXX; we saw this on macOS with autoconf 2.72
-  UTIL_GET_NON_MATCHING_VALUES(cxx_filtered, $CXX, -std=c++11 -std=gnu++11)
-  CXX="$cxx_filtered"
 ])
 
 # Check if a compiler is of the toolchain type we expect, and save the version

diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
@@ -26,6 +26,70 @@
 m4_include([util_paths.m4])
 
 ###############################################################################
+# Overwrite the existing version of AC_PROG_CC with our own custom variant.
+# Unlike the regular AC_PROG_CC, the compiler list must always be passed.
+AC_DEFUN([AC_PROG_CC],
+[
+  AC_LANG_PUSH(C)
+  AC_ARG_VAR([CC], [C compiler command])
+  AC_ARG_VAR([CFLAGS], [C compiler flags])
+
+  _AC_ARG_VAR_LDFLAGS()
+  _AC_ARG_VAR_LIBS()
+  _AC_ARG_VAR_CPPFLAGS()
+
+  AC_CHECK_TOOLS(CC, [$1])
+
+  test -z "$CC" && AC_MSG_FAILURE([no acceptable C compiler found in \$PATH])
+
+  # Provide some information about the compiler.
+  _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+  set X $ac_compile
+  ac_compiler=$[2]
+  for ac_option in --version -v -V -qversion -version; do
+    _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+  done
+
+  m4_expand_once([_AC_COMPILER_EXEEXT])
+  m4_expand_once([_AC_COMPILER_OBJEXT])
+
+  _AC_PROG_CC_G
+
+  AC_LANG_POP(C)
+])
+
+###############################################################################
+# Overwrite the existing version of AC_PROG_CXX with our own custom variant.
+# Unlike the regular AC_PROG_CXX, the compiler list must always be passed.
+AC_DEFUN([AC_PROG_CXX],
+[
+  AC_LANG_PUSH(C++)
+  AC_ARG_VAR([CXX], [C++ compiler command])
+  AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
+
+  _AC_ARG_VAR_LDFLAGS()
+  _AC_ARG_VAR_LIBS()
+  _AC_ARG_VAR_CPPFLAGS()
+
+  AC_CHECK_TOOLS(CXX, [$1])
+
+  # Provide some information about the compiler.
+  _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+  set X $ac_compile
+  ac_compiler=$[2]
+  for ac_option in --version -v -V -qversion; do
+    _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+  done
+
+  m4_expand_once([_AC_COMPILER_EXEEXT])
+  m4_expand_once([_AC_COMPILER_OBJEXT])
+
+  _AC_PROG_CXX_G
+
+  AC_LANG_POP(C++)
+])
+
+################################################################################
 # Create a function/macro that takes a series of named arguments. The call is
 # similar to AC_DEFUN, but the setup of the function looks like this:
 # UTIL_DEFUN_NAMED([MYFUNC], [FOO *BAR], [$@], [

diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.13.0
-JTREG_VERSION=7.4+1
+JTREG_VERSION=7.5.2+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
@@ -1153,9 +1153,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "7.4",
+            version: "7.5.2",
             build_number: "1",
-            file: "bundles/jtreg-7.4+1.zip",
+            file: "bundles/jtreg-7.5.2+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

diff --git a/make/conf/version-numbers.conf b/make/conf/version-numbers.conf
@@ -28,15 +28,15 @@
 
 DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=19
+DEFAULT_VERSION_UPDATE=20
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2026-04-21
+DEFAULT_VERSION_DATE=2026-07-21
 DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=17
-DEFAULT_PROMOTED_VERSION_PRE=
+DEFAULT_PROMOTED_VERSION_PRE=ea
diff --git a/make/data/lsrdata/language-subtag-registry.txt b/make/data/lsrdata/language-subtag-registry.txt
@@ -1,4 +1,4 @@
-File-Date: 2025-05-15
+File-Date: 2025-08-25
 %%
 Type: language
 Subtag: aa
@@ -3102,6 +3102,7 @@ Added: 2009-07-29
 Type: language
 Subtag: asb
 Description: Assiniboine
+Description: Nakoda Assiniboine
 Added: 2009-07-29
 %%
 Type: language
@@ -3269,6 +3270,7 @@ Added: 2009-07-29
 Type: language
 Subtag: atj
 Description: Atikamekw
+Description: Nehirowimowin
 Added: 2009-07-29
 %%
 Type: language
@@ -7981,6 +7983,7 @@ Added: 2009-07-29
 Type: language
 Subtag: clc
 Description: Chilcotin
+Description: Tsilhqot’in
 Added: 2009-07-29
 %%
 Type: language
@@ -8021,6 +8024,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: clm
+Description: Klallam
 Description: Clallam
 Added: 2009-07-29
 %%
@@ -13509,7 +13513,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: haa
-Description: Han
+Description: Hän
 Added: 2009-07-29
 %%
 Type: language
@@ -19022,6 +19026,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kwk
+Description: Kwak'wala
 Description: Kwakiutl
 Added: 2009-07-29
 %%
@@ -22262,7 +22267,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mhn
-Description: Mócheno
+Description: Mòcheno
 Added: 2009-07-29
 %%
 Type: language
@@ -31655,6 +31660,7 @@ Added: 2009-07-29
 Type: language
 Subtag: sec
 Description: Sechelt
+Description: She shashishalhem
 Added: 2009-07-29
 %%
 Type: language
@@ -32003,6 +32009,7 @@ Added: 2009-07-29
 Type: language
 Subtag: shs
 Description: Shuswap
+Description: Secwepemctsín
 Added: 2009-07-29
 %%
 Type: language
@@ -33014,6 +33021,7 @@ Added: 2009-07-29
 Type: language
 Subtag: squ
 Description: Squamish
+Description: Sḵwx̱wú7mesh sníchim
 Added: 2009-07-29
 %%
 Type: language
@@ -34664,6 +34672,8 @@ Added: 2009-07-29
 Type: language
 Subtag: thp
 Description: Thompson
+Description: Nłeʔkepmxcín
+Description: Thompson River Salish
 Added: 2009-07-29
 %%
 Type: language
@@ -34684,6 +34694,7 @@ Added: 2009-07-29
 Type: language
 Subtag: tht
 Description: Tahltan
+Description: Tāłtān
 Added: 2009-07-29
 %%
 Type: language
@@ -42419,7 +42430,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: zmp
-Description: Mpuono
+Description: Mbuun
 Added: 2009-07-29
 %%
 Type: language
@@ -47639,6 +47650,12 @@ Comments: Denotes conventions established by the Academia Brasileira de
   Letras in 1943 and generally used in Brazil until 2009
 %%
 Type: variant
+Subtag: akhmimic
+Description: Akhmimic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: akuapem
 Description: Akuapem Twi
 Added: 2017-06-05
@@ -47814,6 +47831,12 @@ Comments: Black American Sign Language (BASL) or Black Sign Variation
   (BSV) is a dialect of American Sign Language (ASL)
 %%
 Type: variant
+Subtag: bohairic
+Description: Bohairic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: bohoric
 Description: Slovene in Bohorič alphabet
 Added: 2012-06-27
@@ -47898,6 +47921,12 @@ Comments: Represents the standard written form of Ladin in Fascia which
   unified the three subvarieties Cazet, Brach and Moenat
 %%
 Type: variant
+Subtag: fayyumic
+Description: Fayyumic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: fodom
 Description: Fodom standard of Ladin
 Added: 2024-03-04
@@ -48167,6 +48196,12 @@ Comments: Russian orthography as established by the 1917/1918
   orthographic reforms
 %%
 Type: variant
+Subtag: lycopol
+Description: Lycopolitan alias Subakhmimic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: mdcegyp
 Description: Ancient Egyptian hieroglyphs encoded in Manuel de Codage
 Added: 2025-02-06
@@ -48180,6 +48215,12 @@ Added: 2025-02-06
 Prefix: egy
 %%
 Type: variant
+Subtag: mesokem
+Description: Mesokemic alias Oxyrhynchite dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: metelko
 Description: Slovene in Metelko alphabet
 Added: 2012-06-27
@@ -48367,6 +48408,12 @@ Prefix: rm
 Comments: Supraregional Romansh written standard
 %%
 Type: variant
+Subtag: sahidic
+Description: Sahidic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: saigon
 Description: The Sài Gòn variant of Vietnamese
 Added: 2025-03-10
@@ -48555,6 +48602,12 @@ Comments: The subtag represents the old orthography of the Latvian
   language used during c. 1600s–1920s.
 %%
 Type: variant
+Subtag: viennese
+Description: The Viennese dialect of German
+Added: 2025-06-22
+Prefix: de
+%%
+Type: variant
 Subtag: vivaraup
 Description: Vivaro-Alpine
 Added: 2018-04-22

diff --git a/make/data/publicsuffixlist/VERSION b/make/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat
-Date: 2024-05-07
+Github: https://raw.githubusercontent.com/publicsuffix/list/823beb1425def931c8b0b170a6bc33b424c3f9b0/public_suffix_list.dat
+Date: 2025-05-12
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@



		---------
		- [ ] I confirm that I make this contribution in accordance with the [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai).