Merge to tag jdk-28+19

make/Init.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -151,9 +151,11 @@ main: $(INIT_TARGETS) create-make-helpers
 	    ( cd $(TOPDIR) && \
 	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	        $(SEQUENTIAL_TARGETS) )
-            # We might have cleaned away essential files, recreate them.
-	    ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
+            # Recreate essential files after cleaning, except for dist-clean.
+            ifeq ($(filter dist-clean, $(SEQUENTIAL_TARGETS)), )
+	      ( cd $(TOPDIR) && \
+	          $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
+            endif
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)

make/autoconf/jvm-features.m4

@@ -313,7 +313,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AVAILABLE=false
       fi
     elif test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
-        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
+          test "x$OPENJDK_TARGET_CPU" = "xriscv64"  || \
+          test "x$OPENJDK_TARGET_CPU" = "xs390x"; then
       if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
         AC_MSG_RESULT([yes])
       else

make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java

@@ -87,7 +87,7 @@ public class CLDRConverter {
     static final String EXEMPLAR_CITY_PREFIX = "timezone.excity.";
     static final String ZONE_NAME_PREFIX = "timezone.displayname.";
     static final String METAZONE_ID_PREFIX = "metazone.id.";
-    static final String METAZONE_DSTOFFSET_PREFIX = "metazone.dstoffset.";
+    static final String METAZONE_DSTOFFSETS = "metazone.dstoffsets";
     static final String PARENT_LOCALE_PREFIX = "parentLocale.";
     static final String LIKELY_SCRIPT_PREFIX = "likelyScript.";
     static final String META_EMPTY_ZONE_NAME = "EMPTY_ZONE";
@@ -863,10 +863,21 @@ private static Map<String, Object> extractZoneNames(Map<String, Object> map, Str
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         names.putAll(exCities);
 
-        // Explicit metazone offsets
-        if (id.equals("root")) {
-            explicitDstOffsets.forEach((k, v) ->
-                names.put(METAZONE_DSTOFFSET_PREFIX + k, v));
+        // Explicit metazone offsets. For example,
+        // "metazone.dstoffsets" -> "America/Vancouver=-07;Europe/Dublin=+01"
+        if (id.equals("root") && !explicitDstOffsets.isEmpty()) {
+            names.put(METAZONE_DSTOFFSETS,
+                explicitDstOffsets.entrySet().stream()
+                    .sorted(Map.Entry.comparingByKey())
+                    .map(e -> {
+                        String tzid = e.getKey();
+                        if (tzid.isEmpty() || tzid.indexOf('=') >= 0 || tzid.indexOf(';') >= 0) {
+                            throw new IllegalArgumentException("Invalid timezone ID: " + tzid);
+                        }
+                        ZoneOffset.of(e.getValue()); // checks if the offset is valid
+                        return tzid + "=" + e.getValue();
+                    })
+                    .collect(Collectors.joining(";")));
         }
 
         // If there's no UTC entry at this point, add an empty one

make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java

@@ -197,7 +197,7 @@ public void generateBundle(String packageName, String baseName, String localeID,
                     var escapedVal = CLDRConverter.escape(valStr);
                     if (type == BundleType.TIMEZONE &&
                         !(key.startsWith(CLDRConverter.EXEMPLAR_CITY_PREFIX) ||
-                          key.startsWith(CLDRConverter.METAZONE_DSTOFFSET_PREFIX)) ||
+                          key.startsWith(CLDRConverter.METAZONE_DSTOFFSETS)) ||
                         valStr.startsWith(META_VALUE_PREFIX)) {
                         out.printf("            { \"%s\", %s },\n", keyStr, escapedVal);
                     } else {

make/langtools/tools/previewfeature/SetupPreviewFeature.java

@@ -69,8 +69,7 @@ public static void main(String... args) throws Exception {
                         var trees = Trees.instance(task);
                         var elPath = trees.getPath(el);
                         insertPosition = (int) trees.getSourcePositions()
-                                                    .getStartPosition(elPath.getCompilationUnit(),
-                                                                      elPath.getLeaf());
+                                                    .getStartPosition(elPath.getLeaf());
                     }
                 }
             }