SAP · sapmachine-bot · Aug 20, 2026 · Aug 20, 2026 · Aug 20, 2026 · Aug 20, 2026
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,7 +60,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       # List of platforms to exclude by default
-      EXCLUDED_PLATFORMS: 'alpine-linux-x64'
+      EXCLUDED_PLATFORMS: 'alpine-linux-x64,macos-x64'
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}

diff --git a/doc/testing.html b/doc/testing.html
@@ -424,11 +424,29 @@ <h4 id="jcov">JCOV</h4>
 <p>For more fine-grained control, you can pass arbitrary filters to JCov
 using <code>--with-jcov-filters</code>, and you can specify a specific
 JDK to instrument using <code>--with-jcov-input-jdk</code>.</p>
+<p>The resulting coverage is written into
+<code>build/$BUILD/test-results/jcov-output/result.xml</code>.</p>
 <p>The JCov report is stored in
 <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory
 intensive.</p>
-<h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
+<h5 id="jcov-scales">JCov scales</h5>
+<p>JCov scales make it possible to record which tests cover each part of
+the instrumented code. To collect coverage with scales, set
+<code>JCOV_SCALES=true</code>, for example:</p>
+<pre><code>$ make jcov-test TEST=jdk_lang TEST_OPTS=&quot;JCOV_SCALES=true&quot;</code></pre>
+<p>The resulting coverage data contains the association between covered
+code and the tests that covered it. A corresponding
+<code>testlist.txt</code> file, which contains the test names, is
+generated in the same directory.</p>
+<p>The JCov report displays the names of the tests that cover each
+class.</p>
+<p>Collecting coverage scales forces jtreg tests to be run in
+<code>othervm</code> mode, which takes longer than ordinary JCov
+collection. The coverage data is also larger because it includes scale
+information, and the generated report is larger because it includes test
+names.</p>
+<h5 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h5>
 <p>While collecting code coverage with JCov, it is also possible to find
 coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a
 source revision. A textual report will be generated showing coverage of

diff --git a/doc/testing.md b/doc/testing.md
@@ -353,11 +353,33 @@ For more fine-grained control, you can pass arbitrary filters to JCov using
 `--with-jcov-filters`, and you can specify a specific JDK to instrument
 using `--with-jcov-input-jdk`.
 
+The resulting coverage is written into
+`build/$BUILD/test-results/jcov-output/result.xml`.
+
 The JCov report is stored in `build/$BUILD/test-results/jcov-output/report`.
 
 Please note that running with JCov reporting can be very memory intensive.
 
-#### JCOV_DIFF_CHANGESET
+##### JCov scales
+
+JCov scales make it possible to record which tests cover each part of the
+instrumented code. To collect coverage with scales, set `JCOV_SCALES=true`,
+for example:
+
+    $ make jcov-test TEST=jdk_lang TEST_OPTS="JCOV_SCALES=true"
+
+The resulting coverage data contains the association between covered code and
+the tests that covered it. A corresponding `testlist.txt` file, which contains
+the test names, is generated in the same directory.
+
+The JCov report displays the names of the tests that cover each class.
+
+Collecting coverage scales forces jtreg tests to be run in `othervm` mode,
+which takes longer than ordinary JCov collection. The coverage data is also
+larger because it includes scale information, and the generated report is
+larger because it includes test names.
+
+##### JCOV_DIFF_CHANGESET
 
 While collecting code coverage with JCov, it is also possible to find coverage
 for only recently changed code. JCOV_DIFF_CHANGESET specifies a source

diff --git a/make/Main.gmk b/make/Main.gmk
@@ -751,6 +751,18 @@ $(eval $(call SetupTarget, test-image-lib, \
     DEPS := build-test-lib, \
 ))
 
+$(eval $(call SetupTarget, build-hotspot-compiler-testlibrary, \
+    MAKEFILE := hotspot/test/BuildCompilerTestlibrary, \
+    TARGET := build-hotspot-compiler-testlibrary, \
+    DEPS := exploded-image build-test-lib, \
+))
+
+$(eval $(call SetupTarget, test-image-hotspot-compiler-testlibrary, \
+    MAKEFILE := hotspot/test/BuildCompilerTestlibrary, \
+    TARGET := test-image-hotspot-compiler-testlibrary, \
+    DEPS := build-hotspot-compiler-testlibrary, \
+))
+
 $(eval $(call SetupTarget, build-test-setup-aot, \
     MAKEFILE := test/BuildTestSetupAOT, \
     DEPS := interim-langtools exploded-image, \
@@ -1303,7 +1315,7 @@ all-docs-bundles: docs-jdk-bundles docs-javase-bundles docs-reference-bundles
 test-image: prepare-test-image test-image-jdk-jtreg-native \
     test-image-demos-jdk test-image-libtest-jtreg-native \
     test-image-lib test-image-lib-native \
-    test-image-setup-aot
+    test-image-setup-aot test-image-hotspot-compiler-testlibrary
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
@@ -45,7 +45,7 @@ ifneq ($(TEST_VM_OPTS), )
 endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
-    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV JCOV_DIFF_CHANGESET AOT_JDK, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV JCOV_DIFF_CHANGESET JCOV_SCALES AOT_JDK, \
     STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
@@ -121,9 +121,21 @@ ifeq ($(TEST_OPTS_JCOV), true)
   JCOV_SUPPORT_DIR := $(TEST_SUPPORT_DIR)/jcov-support
   JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
   JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
+  JCOV_TESTLIST := $(JCOV_OUTPUT_DIR)/testlist.txt
   JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
+  JCOV_GRABBER_OPTIONS ?=
+  JCOV_REPGEN_OPTIONS ?=
+  TEST_OPTS_JCOV_SCALES ?= false
   JCOV_MEM_OPTIONS := -Xms64m -Xmx4g
 
+  ifeq ($(TEST_OPTS_JCOV_SCALES), true)
+    JCOV_GRABBER_OPTIONS += -scale -mergebyname -outTestList $(JCOV_TESTLIST)
+    TEST_JOBS := 1
+    JTREG_TEST_MODE := othervm
+    JTREG_VM_OPTIONS += -Djcov.extension=com.sun.tdk.jcov.runtime.TestNameDecorator
+    JCOV_REPGEN_OPTIONS += -tests $(JCOV_TESTLIST)
+  endif
+
   # Replace our normal test JDK with the JCov image.
   JDK_UNDER_TEST := $(JCOV_IMAGE_DIR)
 
@@ -1414,6 +1426,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
 	fi
 	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
 	    $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
+	    $(JCOV_GRABBER_OPTIONS) \
 	    1>$(JCOV_GRABBER_LOG) 2>&1 &
 
   jcov-start-grabber: jcov-do-start-grabber
@@ -1441,6 +1454,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
 	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
 	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
 	    -mainReportTitle "$(JCOV_REPORT_TITLE)" \
+	    $(JCOV_REPGEN_OPTIONS) \
 	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE))
 
   TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -213,6 +213,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ADDITIONAL=""
       WARNINGS_ENABLE_ADDITIONAL_CXX=""
       WARNINGS_ENABLE_ADDITIONAL_JVM=""
+      WARNINGS_ENABLE_ADDITIONAL_JDK="-w34189"
       DISABLED_WARNINGS="4800 5105"
       CFLAGS_CONVERSION_WARNINGS=
       ;;
@@ -623,8 +624,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   ADLC_LANGSTD_CXXFLAGS="$LANGSTD_CXXFLAGS"
 
   # CFLAGS WARNINGS STUFF
-  WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL"
-  WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXX"
+  WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL $WARNINGS_ENABLE_ADDITIONAL_JDK"
+  WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXX $WARNINGS_ENABLE_ADDITIONAL_JDK"
   WARNING_CFLAGS_JVM="$WARNINGS_ENABLE_ALL_JVM"
 
   # Set some additional per-OS defines.

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
@@ -829,9 +829,18 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOOPS],
 
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_PREVIEW],
 [
-  UTIL_ARG_ENABLE(NAME: cds-archive-preview, DEFAULT: true, RESULT: BUILD_CDS_ARCHIVE_PREVIEW,
+  UTIL_ARG_ENABLE(NAME: cds-archive-preview, DEFAULT: auto, RESULT: BUILD_CDS_ARCHIVE_PREVIEW,
       DESC: [enable generation of preview CDS archives (requires --enable-cds-archive)],
-      CHECKING_MSG: [if default CDS archives for preview should be generated])
+      CHECKING_MSG: [if default CDS archives for preview should be generated],
+      CHECK_AVAILABLE: [
+        AC_MSG_CHECKING([if value objects are supported])
+        if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
+          AC_MSG_RESULT([yes])
+        else
+          AC_MSG_RESULT([no (64-bit only)])
+          AVAILABLE=false
+        fi
+      ])
   AC_SUBST(BUILD_CDS_ARCHIVE_PREVIEW)
 ])
 

diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
@@ -660,7 +660,19 @@ AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
 [
   AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
       [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
-  # There are no deprecated ports. Implement the deprecation warnings here.
+  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+    # Unfortunately, variants have not been parsed yet, so we have to check the configure option
+    # directly. Allow only the directly specified Zero variant, treat any other mix as containing
+    # something non-Zero.
+    if test "x$with_jvm_variants" != xzero; then
+      if test "x$enable_deprecated_ports" = "xyes"; then
+        AC_MSG_WARN([The macOS/x64 port is deprecated and may be removed in a future release.])
+      else
+        AC_MSG_ERROR(m4_normalize([The macOS/x64 port is deprecated and may be removed in a future release.
+          Use --enable-deprecated-ports to suppress this error.]))
+      fi
+    fi
+  fi
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],

diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2026, 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
@@ -118,6 +118,7 @@ define SetupTestFilesCompilationBody
         DISABLED_WARNINGS_clang := format-nonliteral \
             missing-field-initializers sometimes-uninitialized undef \
             unused-but-set-variable unused-function unused-variable, \
+        DISABLED_WARNINGS_microsoft := 4189, \
         DEFAULT_LIBCXX := false, \
         JDK_LIBS := $$($1_JDK_LIBS_$$(name)), \
         LIBS := $$($1_LIBS) $$($1_LIBS_$$(name)), \

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
@@ -416,6 +416,7 @@ var getJibProfilesProfiles = function (input, common, data) {
                 "--with-zlib=system",
                 "--with-macosx-version-max=11.00.00",
                 "--enable-compatible-cds-alignment",
+                "--enable-deprecated-ports",
                 // Use system SetFile instead of the one in the devkit as the
                 // devkit one may not work on Catalina.
                 "SETFILE=/usr/bin/SetFile"
@@ -1192,8 +1193,8 @@ var getJibProfilesDependencies = function (input, common) {
             server: "jpg",
             product: "jcov",
             version: "3.0",
-            build_number: "6",
-            file: "bundles/jcov-3.0+6.zip",
+            build_number: "9",
+            file: "bundles/jcov-3.0+9.zip",
             environment_name: "JCOV_HOME",
         },
 

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
@@ -285,13 +285,6 @@ ifeq ($(call isTargetOs, windows), true)
   $(BUILD_LIBJVM_TARGET): $(WIN_EXPORT_FILE)
 endif
 
-# Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
-# that the internal vm version is updated as it relies on __DATE__ and __TIME__
-# macros.
-ABSTRACT_VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/abstract_vm_version$(OBJ_SUFFIX)
-$(ABSTRACT_VM_VERSION_OBJ): $(filter-out $(ABSTRACT_VM_VERSION_OBJ), \
-    $(BUILD_LIBJVM_TARGET_DEPS))
-
 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
   ifeq ($(call isTargetOs, windows), true)
     # It doesn't matter which jvm.lib file gets exported, but we need

diff --git a/make/hotspot/test/BuildCompilerTestlibrary.gmk b/make/hotspot/test/BuildCompilerTestlibrary.gmk
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2026, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include MakeFileStart.gmk
+
+################################################################################
+# This file builds the Hotspot compiler testlibrary.
+################################################################################
+
+include CopyFiles.gmk
+include JavaCompilation.gmk
+
+###############################################################################
+
+COMPILER_TESTLIBRARY_BASEDIR := $(TOPDIR)/test/hotspot/jtreg/compiler/lib
+COMPILER_TESTLIBRARY_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/compiler-testlibrary
+COMPILER_TESTLIBRARY_JAR := $(COMPILER_TESTLIBRARY_SUPPORT)/compiler-testlibrary.jar
+TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
+WB_CP := $(TEST_LIB_SUPPORT)/wb_classes
+TEST_LIB_CP := $(TEST_LIB_SUPPORT)/test-lib_classes
+
+$(eval $(call SetupJavaCompilation, BUILD_COMPILER_TESTLIBRARY, \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
+    SRC := $(COMPILER_TESTLIBRARY_BASEDIR), \
+    BIN := $(COMPILER_TESTLIBRARY_SUPPORT)/classes, \
+    JAR := $(COMPILER_TESTLIBRARY_JAR), \
+    JAVAC_FLAGS := -cp $(WB_CP) \
+        -cp $(TEST_LIB_CP) \
+        --add-exports java.base/jdk.internal.math=ALL-UNNAMED, \
+))
+
+TARGETS += $(BUILD_COMPILER_TESTLIBRARY)
+
+build-hotspot-compiler-testlibrary: $(TARGETS)
+
+################################################################################
+# Targets for building test-image.
+################################################################################
+
+# Copy to hotspot jtreg test image
+$(eval $(call SetupCopyFiles, COPY_COMPILER_TESTLIBRARY, \
+    DEST := $(TEST_IMAGE_DIR)/compiler-testlibrary, \
+    FILES := $(COMPILER_TESTLIBRARY_JAR), \
+))
+
+IMAGE_TARGETS += $(COPY_COMPILER_TESTLIBRARY)
+
+test-image-hotspot-compiler-testlibrary: $(IMAGE_TARGETS)
+
+.PHONY: build-hotspot-compiler-testlibrary test-image-hotspot-compiler-testlibrary
+
+################################################################################
+
+include MakeFileEnd.gmk
diff --git a/make/modules/java.base/gensrc/GensrcMisc.gmk b/make/modules/java.base/gensrc/GensrcMisc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, 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
@@ -72,7 +72,7 @@ else
   OPENJDK_TARGET_OS_CANONICAL := $(OPENJDK_TARGET_OS)
 endif
 
-$(eval $(call SetupTextFileProcessing, BUILD_PLATFORMPROPERTIES_JAVA, \
+$(eval $(call SetupTextFileProcessing, BUILD_PLATFORMPROPERTIES_JAVA_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU), \
     SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template, \
     OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/PlatformProps.java, \
     REPLACEMENTS := \
@@ -82,7 +82,8 @@ $(eval $(call SetupTextFileProcessing, BUILD_PLATFORMPROPERTIES_JAVA, \
         @@OPENJDK_TARGET_CPU_BITS@@ => $(OPENJDK_TARGET_CPU_BITS), \
 ))
 
-TARGETS += $(BUILD_VERSION_JAVA) $(BUILD_PLATFORMPROPERTIES_JAVA)
+TARGETS += $(BUILD_VERSION_JAVA) \
+    $(BUILD_PLATFORMPROPERTIES_JAVA_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU))
 ################################################################################
 
 ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )

diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk
@@ -64,10 +64,8 @@ ifeq ($(ENABLE_JSOUND), true)
         EXTRA_HEADER_DIRS := java.base:libjava, \
         CFLAGS := $(LIBJSOUND_CFLAGS), \
         CXXFLAGS := $(LIBJSOUND_CFLAGS), \
-        DISABLED_WARNINGS_gcc := undef unused-variable, \
-        DISABLED_WARNINGS_clang := undef unused-variable, \
-        DISABLED_WARNINGS_clang_PLATFORM_API_MacOSX_MidiUtils.c := \
-            unused-but-set-variable, \
+        DISABLED_WARNINGS_gcc := undef, \
+        DISABLED_WARNINGS_clang := undef, \
         DISABLED_WARNINGS_clang_DirectAudioDevice.c := unused-function, \
         LIBS_linux := $(ALSA_LIBS), \
         LIBS_macosx := \

diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -134,7 +134,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     DISABLED_WARNINGS_clang_debug_trace.c := format-nonliteral, \
     DISABLED_WARNINGS_clang_Trace.c := format-nonliteral, \
     DISABLED_WARNINGS_clang_TransformHelper.c := sign-compare, \
-    DISABLED_WARNINGS_microsoft := 4244 4996, \
+    DISABLED_WARNINGS_microsoft := 4244 4996 4189, \
     DISABLED_WARNINGS_microsoft_awt_Toolkit.cpp := 4267, \
     LDFLAGS_windows := -delayload:comctl32.dll -delayload:comdlg32.dll \
         -delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -343,7 +343,7 @@ else
       expansion-to-defined dangling-reference maybe-uninitialized
   HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers \
       range-loop-analysis unused-variable
-  HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244
+  HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244 4189
 
   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
 endif