diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml
index 7351a120ac4..4082aad0c1a 100644
--- a/.github/actions/get-msys2/action.yml
+++ b/.github/actions/get-msys2/action.yml
@@ -25,20 +25,49 @@
name: 'Get MSYS2'
description: 'Download MSYS2 and prepare a Windows host'
+inputs:
+ architecture:
+ description: 'Architecture'
+ required: true
runs:
using: composite
steps:
- - name: 'Install MSYS2'
- id: msys2
+ - name: 'Install MSYS2 on x86.x64'
+ id: msys2-x64
uses: msys2/setup-msys2@v2.31.0
with:
install: 'autoconf tar unzip zip make'
path-type: minimal
release: false
+ if: ${{ inputs.architecture == 'x86.x64' }}
+
+ - name: 'Install MSYS2 on ARM64'
+ id: msys2-arm64
+ uses: msys2/setup-msys2@v2.31.0
+ with:
+ install: 'autoconf tar unzip zip make'
+ path-type: minimal
+ release: true
+ location: ${{ runner.tool_cache }}/msys2
+ if: ${{ inputs.architecture == 'ARM64' }}
# We can't run bash until this is completed, so stick with pwsh
- - name: 'Set MSYS2 path'
+ - name: 'Set MSYS2 path for x64'
run: |
- echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
+ echo "${{ steps.msys2-x64.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
shell: pwsh
+ if: ${{ inputs.architecture == 'x86.x64' }}
+
+ - name: 'Set MSYS2 path for ARM64'
+ run: |
+ echo "${{ steps.msys2-arm64.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
+ shell: pwsh
+ if: ${{ inputs.architecture == 'ARM64' }}
+
+ # Remove the default config.site file provided by MSYS2 to ensure config.guess accurately detects the host system.
+ - name: 'Remove default config.site'
+ run: |
+ echo "Removing default config.site"
+ rm -f /etc/config.site
+ shell: env /usr/bin/bash --login -eo pipefail {0}
diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml
index 99b6c40606c..c80f676864e 100644
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -54,18 +54,11 @@ jobs:
fail-fast: false
matrix:
target-cpu:
- - aarch64
- arm
- s390x
- ppc64le
- riscv64
include:
- - target-cpu: aarch64
- gnu-arch: aarch64
- debian-arch: arm64
- debian-repository: https://httpredir.debian.org/debian/
- debian-version: trixie
- tolerate-sysroot-errors: false
- target-cpu: arm
gnu-arch: arm
debian-arch: armhf
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index c501670439e..a77ebece7e2 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -31,6 +31,14 @@ on:
platform:
required: true
type: string
+ runs-on:
+ required: false
+ type: string
+ default: 'ubuntu-24.04'
+ bootjdk-platform:
+ required: false
+ type: string
+ default: 'linux-x64'
extra-conf-options:
required: false
type: string
@@ -75,7 +83,7 @@ on:
jobs:
build-linux:
name: build
- runs-on: ubuntu-24.04
+ runs-on: ${{ inputs.runs-on }}
strategy:
fail-fast: false
@@ -90,7 +98,7 @@ jobs:
id: bootjdk
uses: ./.github/actions/get-bootjdk
with:
- platform: linux-x64
+ platform: ${{ inputs.bootjdk-platform }}
- name: 'Get JTReg'
id: jtreg
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 3bb50a137ec..002cbe7cd56 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -31,6 +31,9 @@ on:
platform:
required: true
type: string
+ runs-on:
+ required: true
+ type: string
extra-conf-options:
required: false
type: string
@@ -45,7 +48,7 @@ on:
msvc-toolset-version:
required: true
type: string
- msvc-toolset-architecture:
+ architecture:
required: true
type: string
configure-arguments:
@@ -67,7 +70,7 @@ env:
jobs:
build-windows:
name: build
- runs-on: windows-2025
+ runs-on: ${{ inputs.runs-on }}
defaults:
run:
shell: bash
@@ -87,12 +90,14 @@ jobs:
- name: 'Get MSYS2'
uses: ./.github/actions/get-msys2
+ with:
+ architecture: ${{ inputs.architecture }}
- name: 'Get the BootJDK'
id: bootjdk
uses: ./.github/actions/get-bootjdk
with:
- platform: windows-x64
+ platform: ${{ inputs.platform }}
- name: 'Get JTReg'
id: jtreg
@@ -102,26 +107,49 @@ jobs:
id: gtest
uses: ./.github/actions/get-gtest
- - name: 'Check toolchain installed'
- id: toolchain-check
+ - name: 'Check toolchain installed for x64'
+ id: toolchain-check-x64
run: |
set +e
'/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
if [ $? -eq 0 ]; then
- echo "Toolchain is already installed"
+ echo "Toolchain is already installed for x64"
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
else
- echo "Toolchain is not yet installed"
+ echo "Toolchain is not yet installed for x64"
echo "toolchain-installed=false" >> $GITHUB_OUTPUT
fi
+ if: ${{ inputs.architecture == 'x86.x64' }}
- - name: 'Install toolchain and dependencies'
+ - name: 'Check toolchain installed for ARM64'
+ id: toolchain-check-arm64
+ run: |
+ set +e
+ "/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvarsarm64.bat" -vcvars_ver=${{ inputs.msvc-toolset-version }}
+ if [ $? -eq 0 ]; then
+ echo "Toolchain is already installed for ARM64"
+ echo "toolchain-installed=true" >> $GITHUB_OUTPUT
+ else
+ echo "Toolchain is not yet installed for ARM64"
+ echo "toolchain-installed=false" >> $GITHUB_OUTPUT
+ fi
+ if: ${{ inputs.architecture == 'ARM64' }}
+
+ - name: 'Install toolchain and dependencies for x64'
run: |
# Run Visual Studio Installer
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
- --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
- if: steps.toolchain-check.outputs.toolchain-installed != 'true'
+ --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.x86.x64
+ if: ${{ (inputs.architecture == 'x86.x64') && (steps.toolchain-check-x64.outputs.toolchain-installed != 'true') }}
+
+ - name: 'Install toolchain and dependencies for ARM64'
+ run: |
+ # Run Visual Studio Installer
+ '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
+ modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
+ --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.ARM64
+ if: ${{ ( inputs.architecture == 'ARM64') && (steps.toolchain-check-arm64.outputs.toolchain-installed != 'true') }}
- name: 'Configure'
run: >
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20be196b128..bcb9ea6e0b8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -34,7 +34,7 @@ on:
platforms:
description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
required: true
- default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+ default: 'linux-x64, linux-x64-variants, linux-aarch64, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
configure-arguments:
description: 'Additional configure arguments'
required: false
@@ -64,6 +64,7 @@ jobs:
outputs:
linux-x64: ${{ steps.include.outputs.linux-x64 }}
linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
+ linux-aarch64: ${{ steps.include.outputs.linux-aarch64 }}
linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
alpine-linux-x64: ${{ steps.include.outputs.alpine-linux-x64 }}
macos-x64: ${{ steps.include.outputs.macos-x64 }}
@@ -176,6 +177,7 @@ jobs:
echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
+ echo "linux-aarch64=$(check_platform linux-aarch64 linux aarch64)" >> $GITHUB_OUTPUT
echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
echo "alpine-linux-x64=$(check_platform alpine-linux-x64 alpine-linux x64)" >> $GITHUB_OUTPUT
echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
@@ -201,6 +203,20 @@ jobs:
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
if: needs.prepare.outputs.linux-x64 == 'true'
+ build-linux-aarch64:
+ name: linux-aarch64
+ needs: prepare
+ uses: ./.github/workflows/build-linux.yml
+ with:
+ platform: linux-aarch64
+ runs-on: 'ubuntu-24.04-arm'
+ bootjdk-platform: linux-aarch64
+ gcc-major-version: '14'
+ configure-arguments: ${{ github.event.inputs.configure-arguments }}
+ make-arguments: ${{ github.event.inputs.make-arguments }}
+ dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
+ if: needs.prepare.outputs.linux-aarch64 == 'true'
+
build-linux-x64-hs-nopch:
name: linux-x64-hs-nopch
needs: prepare
@@ -295,7 +311,7 @@ jobs:
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
# Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
# This bundle is not used by testing jobs, but downstreams use it to check that
- # dependent projects, e.g. libgraal, builds fine.
+ # dependent projects build fine.
bundle-suffix: "-static-libs"
if: needs.prepare.outputs.linux-x64-variants == 'true'
@@ -353,8 +369,9 @@ jobs:
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-x64
+ runs-on: windows-2022
+ architecture: 'x86.x64'
msvc-toolset-version: '14.44'
- msvc-toolset-architecture: 'x86.x64'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -366,10 +383,9 @@ jobs:
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-aarch64
+ runs-on: windows-11-arm
+ architecture: 'ARM64'
msvc-toolset-version: '14.44'
- msvc-toolset-architecture: 'arm64'
- make-target: 'hotspot'
- extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -423,6 +439,19 @@ jobs:
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
static-suffix: "-static"
+ test-linux-aarch64:
+ name: linux-aarch64
+ needs:
+ - prepare
+ - build-linux-aarch64
+ uses: ./.github/workflows/test.yml
+ with:
+ platform: linux-aarch64
+ bootjdk-platform: linux-aarch64
+ runs-on: ubuntu-24.04-arm
+ dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
+ debug-suffix: -debug
+
test-macos-aarch64:
name: macos-aarch64
needs:
@@ -446,6 +475,21 @@ jobs:
with:
platform: windows-x64
bootjdk-platform: windows-x64
- runs-on: windows-2025
+ architecture: 'x86.x64'
+ runs-on: windows-2022
+ dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
+ debug-suffix: -debug
+
+ test-windows-aarch64:
+ name: windows-aarch64
+ needs:
+ - prepare
+ - build-windows-aarch64
+ uses: ./.github/workflows/test.yml
+ with:
+ platform: windows-aarch64
+ bootjdk-platform: windows-aarch64
+ architecture: 'ARM64'
+ runs-on: windows-11-arm
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
debug-suffix: -debug
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b240b42fb97..6270e44d746 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,9 @@ on:
runs-on:
required: true
type: string
+ architecture:
+ required: false
+ type: string
xcode-toolset-version:
required: false
type: string
@@ -132,6 +135,8 @@ jobs:
- name: 'Get MSYS2'
uses: ./.github/actions/get-msys2
+ with:
+ architecture: ${{ inputs.architecture }}
if: runner.os == 'Windows'
- name: 'Get the BootJDK'
diff --git a/doc/building.html b/doc/building.html
index 534888ef667..86ee3390ead 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -545,7 +545,7 @@ earlier versions may also work.
no longer comes bundled with Xcode, so it needs to be installed
separately. This can either be done via the Xcode's Settings/Components
UI, or in the command line calling
-xcodebuild -downloadComponent metalToolchain.
+xcodebuild -downloadComponent MetalToolchain.
The standard macOS environment contains the basic tooling needed to
build, but for external libraries a package manager is recommended. The
JDK uses homebrew in the examples, but
diff --git a/doc/building.md b/doc/building.md
index d653d36eb55..93ab386ee8e 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -355,7 +355,7 @@ earlier versions may also work.
Starting with Xcode 26, introduced in macOS 26, the Metal toolchain no longer
comes bundled with Xcode, so it needs to be installed separately. This can
either be done via the Xcode's Settings/Components UI, or in the command line
-calling `xcodebuild -downloadComponent metalToolchain`.
+calling `xcodebuild -downloadComponent MetalToolchain`.
The standard macOS environment contains the basic tooling needed to build, but
for external libraries a package manager is recommended. The JDK uses
diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 0b324e7e3f3..925149d4cc7 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -410,27 +410,6 @@ endif
################################################################################
-ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
- STATIC_LIBS_GRAAL_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_GRAAL_IMAGE_DIR))
-
- ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
- STATIC_LIBS_GRAAL_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home
- else
- STATIC_LIBS_GRAAL_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)
- endif
-
- $(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_GRAAL_BUNDLE, \
- BUNDLE_NAME := $(STATIC_LIBS_GRAAL_BUNDLE_NAME), \
- FILES := $(STATIC_LIBS_GRAAL_BUNDLE_FILES), \
- BASE_DIRS := $(STATIC_LIBS_GRAAL_IMAGE_DIR), \
- SUBDIR := $(STATIC_LIBS_GRAAL_BUNDLE_SUBDIR), \
- ))
-
- STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
-endif
-
-#################################################################################
-
ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
@@ -453,13 +432,12 @@ docs-jdk-bundles: $(DOCS_JDK_TARGETS)
docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
static-libs-bundles: $(STATIC_LIBS_TARGETS)
-static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
static-jdk-bundles: $(STATIC_JDK_TARGETS)
jcov-bundles: $(JCOV_TARGETS)
.PHONY: product-bundles test-bundles \
docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
- static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
+ static-libs-bundles static-jdk-bundles jcov-bundles
################################################################################
diff --git a/make/GraalBuilderImage.gmk b/make/GraalBuilderImage.gmk
deleted file mode 100644
index d707e067a55..00000000000
--- a/make/GraalBuilderImage.gmk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2020, Red Hat Inc.
-# 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 makefile creates a jdk image overlaid with statically linked core
-# libraries.
-################################################################################
-
-include CopyFiles.gmk
-
-$(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
- SRC := $(JDK_IMAGE_DIR)/, \
- DEST := $(GRAAL_BUILDER_IMAGE_DIR)/, \
- FILES := $(call FindFiles, $(JDK_IMAGE_DIR)/), \
-))
-TARGETS += $(COPY_JDK_IMG)
-
-$(eval $(call SetupCopyFiles, COPY_STATIC_LIBS, \
- SRC := $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib, \
- DEST := $(GRAAL_BUILDER_IMAGE_DIR)/lib, \
- FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
- $(call FindFiles, $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib)), \
-))
-TARGETS += $(COPY_STATIC_LIBS)
-
-################################################################################
-
-include MakeFileEnd.gmk
diff --git a/make/Images.gmk b/make/Images.gmk
index 89c0a834477..8008cfa6779 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -137,16 +137,16 @@ CDS_DUMP_FLAGS = -Xmx128M -Xms128M
# Helper function for creating the CDS archives for the JDK and JRE
#
# Param1 - VM variant (e.g., server, client, zero, ...)
-# Param2 - _nocoops, _coh, _nocoops_coh, or empty
+# Param2 - _nocoops, _nocoh, _nocoops_nocoh, or empty
define CreateCDSArchive
$1_$2_COOPS_OPTION := $(if $(findstring _nocoops, $2),-XX:-UseCompressedOops)
# enable and also explicitly disable coh as needed.
ifeq ($(call isTargetCpuBits, 64), true)
- $1_$2_COH_OPTION := -XX:+UnlockExperimentalVMOptions \
- $(if $(findstring _coh, $2),-XX:+UseCompactObjectHeaders,-XX:-UseCompactObjectHeaders)
+ $1_$2_NOCOH_OPTION := -XX:+UnlockExperimentalVMOptions \
+ $(if $(findstring _nocoh, $2),-XX:-UseCompactObjectHeaders,-XX:+UseCompactObjectHeaders)
endif
- $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
- $1_$2_DUMP_TYPE := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
+ $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_NOCOH_OPTION)
+ $1_$2_DUMP_TYPE := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _nocoh, $2),-NOCOH,)
$1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
@@ -200,12 +200,12 @@ ifeq ($(BUILD_CDS_ARCHIVE), true)
$(foreach v, $(JVM_VARIANTS), \
$(eval $(call CreateCDSArchive,$v,_nocoops)) \
)
- ifeq ($(BUILD_CDS_ARCHIVE_COH), true)
+ ifeq ($(BUILD_CDS_ARCHIVE_NOCOH), true)
$(foreach v, $(JVM_VARIANTS), \
- $(eval $(call CreateCDSArchive,$v,_coh)) \
+ $(eval $(call CreateCDSArchive,$v,_nocoh)) \
)
$(foreach v, $(JVM_VARIANTS), \
- $(eval $(call CreateCDSArchive,$v,_nocoops_coh)) \
+ $(eval $(call CreateCDSArchive,$v,_nocoops_nocoh)) \
)
endif
endif
diff --git a/make/Main.gmk b/make/Main.gmk
index 22302cdea46..172cee697ad 100644
--- a/make/Main.gmk
+++ b/make/Main.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
@@ -478,11 +478,6 @@ $(eval $(call SetupTarget, static-libs-image, \
TARGET := static-libs-image, \
))
-$(eval $(call SetupTarget, static-libs-graal-image, \
- MAKEFILE := StaticLibsImage, \
- TARGET := static-libs-graal-image, \
-))
-
$(eval $(call SetupTarget, mac-jdk-bundle, \
MAKEFILE := MacBundles, \
TARGET := jdk-bundle, \
@@ -506,11 +501,6 @@ $(eval $(call SetupTarget, exploded-image-optimize, \
buildtools-modules, \
))
-$(eval $(call SetupTarget, graal-builder-image, \
- MAKEFILE := GraalBuilderImage, \
- DEPS := jdk-image static-libs-graal-image, \
-))
-
ifeq ($(JCOV_ENABLED), true)
$(eval $(call SetupTarget, jcov-image, \
MAKEFILE := Coverage, \
@@ -877,12 +867,6 @@ $(eval $(call SetupTarget, static-libs-bundles, \
DEPS := static-libs-image, \
))
-$(eval $(call SetupTarget, static-libs-graal-bundles, \
- MAKEFILE := Bundles, \
- TARGET := static-libs-graal-bundles, \
- DEPS := static-libs-graal-image, \
-))
-
$(eval $(call SetupTarget, static-jdk-bundles, \
MAKEFILE := Bundles, \
TARGET := static-jdk-bundles, \
@@ -1124,8 +1108,6 @@ else
static-libs-image: hotspot-static-libs static-libs
- static-libs-graal-image: static-libs
-
bootcycle-images: jdk-image
docs-jdk-api-javadoc: $(GENSRC_TARGETS)
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index d4be5936c41..1eb81499505 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -972,11 +972,6 @@ define SetupRunJtregTestBody
JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
endif
- ifneq ($$(findstring -XX:+UseCompactObjectHeaders, $$(JTREG_ALL_OPTIONS)), )
- JTREG_AUTO_PROBLEM_LISTS += ProblemList-coh.txt
- endif
-
-
ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
# Accept both absolute paths as well as relative to the current test root.
$1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index 5fe559eafad..568f69da5a5 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -64,7 +64,7 @@ TEST_JOBS ?= 0
# Use hard-coded values for java flags (one size, fits all!)
JAVA_FLAGS := -Duser.language=en -Duser.country=US
JAVA_FLAGS_BIG := -Xms64M -Xmx2048M
-JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
+JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG)
diff --git a/make/StaticLibsImage.gmk b/make/StaticLibsImage.gmk
index 1f50c5b7f1b..6e00a39977b 100644
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -39,8 +39,6 @@ ALL_MODULES = $(call FindAllModules)
ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
IMAGE_DEST_DIR = $(STATIC_LIBS_IMAGE_DIR)/lib
-else ifneq ($(filter static-libs-graal-image, $(MAKECMDGOALS)), )
- IMAGE_DEST_DIR = $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib
endif
# Copy JDK static libs to the image.
@@ -70,7 +68,6 @@ ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
endif
static-libs-image: $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS) $(STATIC_LIBS_TARGETS)
-static-libs-graal-image: $(STATIC_LIBS_TARGETS)
################################################################################
diff --git a/make/UpdateSleefSource.gmk b/make/UpdateSleefSource.gmk
index d7b8f8e141b..38483f0ec68 100644
--- a/make/UpdateSleefSource.gmk
+++ b/make/UpdateSleefSource.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 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
@@ -48,7 +48,7 @@ ifneq ($(OPENJDK_BUILD_OS), linux)
endif
SLEEF_SUPPORT_DIR := $(MAKESUPPORT_OUTPUTDIR)/sleef
-SLEEF_SOURCE_BASE_DIR := $(TOPDIR)/src/jdk.incubator.vector/linux/native/libsleef
+SLEEF_SOURCE_BASE_DIR := $(TOPDIR)/src/jdk.incubator.vector/unix/native/libsleef
SLEEF_SOURCE_DIR := $(SLEEF_SOURCE_BASE_DIR)/upstream
SLEEF_TARGET_DIR := $(SLEEF_SOURCE_BASE_DIR)/generated
SLEEF_NATIVE_BUILD_DIR := $(SLEEF_SUPPORT_DIR)/native
@@ -82,7 +82,12 @@ $(eval $(call SetupExecute, sleef_native_config, \
INFO := Configuring native sleef build, \
OUTPUT_DIR := $(SLEEF_NATIVE_BUILD_DIR), \
WORKING_DIR := $(SLEEF_SOURCE_DIR), \
- COMMAND := $(CMAKE) -S . -B $(SLEEF_NATIVE_BUILD_DIR), \
+ COMMAND := $(CMAKE) -S . -B $(SLEEF_NATIVE_BUILD_DIR) \
+ -DCMAKE_INSTALL_PREFIX=$(SLEEF_NATIVE_BUILD_DIR) \
+ -DSLEEF_BUILD_TESTS=OFF \
+ -DSLEEF_DISABLE_SSL=ON \
+ -DSLEEF_ENABLE_TLFLOAT=OFF \
+ -DSLEEF_ENABLE_TESTER4=OFF, \
))
TARGETS := $(sleef_native_config)
@@ -106,6 +111,11 @@ $(eval $(call SetupExecute, sleef_cross_config, \
-DCMAKE_C_COMPILER=$(CC) \
-DCMAKE_TOOLCHAIN_FILE=$(SLEEF_CMAKE_FILE) \
-DNATIVE_BUILD_DIR=$(SLEEF_NATIVE_BUILD_DIR) \
+ -DCMAKE_INSTALL_PREFIX=$(SLEEF_CROSS_BUILD_DIR) \
+ -DSLEEF_BUILD_TESTS=OFF \
+ -DSLEEF_DISABLE_SSL=ON \
+ -DSLEEF_ENABLE_TLFLOAT=OFF \
+ -DSLEEF_ENABLE_TESTER4=OFF \
-DSLEEF_BUILD_INLINE_HEADERS=TRUE \
$(EXTRA_CROSS_OPTIONS), \
))
@@ -139,7 +149,7 @@ $(eval $(call SetupCopyFiles, copy_generated_sleef_source, \
DEST := $(SLEEF_TARGET_DIR), \
))
-TARGETS := $(copy_generated_sleef_source)
+TARGETS := $(copy_static_sleef_source) $(copy_generated_sleef_source)
################################################################################
diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
index b3dbc292919..4468a9acf27 100644
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
@@ -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
@@ -481,8 +481,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
AC_MSG_CHECKING([flags for boot jdk java command for small workloads])
- # Use serial gc for small short lived tools if possible
- UTIL_ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA])
UTIL_ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA])
UTIL_ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA])
UTIL_ADD_JVM_ARG_IF_OK([-XX:TieredStopAtLevel=1],boot_jdk_jvmargs_small,[$JAVA])
@@ -492,8 +490,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
AC_SUBST(JAVA_FLAGS_SMALL)
- # Don't presuppose SerialGC is present in the buildjdk. Also, we cannot test
- # the buildjdk, but on the other hand we know what it will support.
BUILD_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
AC_SUBST(BUILD_JAVA_FLAGS_SMALL)
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 2e608f893d6..6d65ad93c40 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -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
@@ -260,7 +260,7 @@ LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY
JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
JDKOPT_EXCLUDE_TRANSLATIONS
JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
-JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH
+JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOH
JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
JDKOPT_SETUP_MACOSX_SIGNING
JDKOPT_SETUP_SIGNING_HOOK
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 5b1e4c3d7f7..465e06ab39d 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -786,14 +786,14 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
#
# Enable or disable the default CDS archive generation for Compact Object Headers
#
-AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH],
+AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOH],
[
- UTIL_ARG_ENABLE(NAME: cds-archive-coh, DEFAULT: auto, RESULT: BUILD_CDS_ARCHIVE_COH,
- DESC: [enable generation of default CDS archives for compact object headers (requires --enable-cds-archive)],
+ UTIL_ARG_ENABLE(NAME: cds-archive-nocoh, DEFAULT: auto, RESULT: BUILD_CDS_ARCHIVE_NOCOH,
+ DESC: [enable generation of default CDS archives for no compact object headers (requires --enable-cds-archive)],
DEFAULT_DESC: [auto],
- CHECKING_MSG: [if default CDS archives for compact object headers should be generated],
+ CHECKING_MSG: [if default CDS archives for no compact object headers should be generated],
CHECK_AVAILABLE: [
- AC_MSG_CHECKING([if CDS archive with compact object headers is available])
+ AC_MSG_CHECKING([if CDS archive with no compact object headers is available])
if test "x$BUILD_CDS_ARCHIVE" = "xfalse"; then
AC_MSG_RESULT([no (CDS default archive generation is disabled)])
AVAILABLE=false
@@ -810,7 +810,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH],
AVAILABLE=true
fi
])
- AC_SUBST(BUILD_CDS_ARCHIVE_COH)
+ AC_SUBST(BUILD_CDS_ARCHIVE_NOCOH)
])
################################################################################
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index 234d7b74268..0696c4f1199 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -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
@@ -45,7 +45,7 @@ m4_define(jvm_features_valid, m4_normalize( \
ifdef([custom_jvm_features_valid], custom_jvm_features_valid) \
\
cds compiler1 compiler2 dtrace epsilongc g1gc jfr jni-check \
- jvmci jvmti link-time-opt management minimal opt-size parallelgc \
+ jvmti link-time-opt management minimal opt-size parallelgc \
serialgc services shenandoahgc vm-structs zero zgc \
))
@@ -62,7 +62,6 @@ m4_define(jvm_feature_desc_epsilongc, [include the epsilon (no-op) garbage colle
m4_define(jvm_feature_desc_g1gc, [include the G1 garbage collector])
m4_define(jvm_feature_desc_jfr, [enable JDK Flight Recorder (JFR)])
m4_define(jvm_feature_desc_jni_check, [enable -Xcheck:jni support])
-m4_define(jvm_feature_desc_jvmci, [enable JVM Compiler Interface (JVMCI)])
m4_define(jvm_feature_desc_jvmti, [enable Java Virtual Machine Tool Interface (JVM TI)])
m4_define(jvm_feature_desc_link_time_opt, [enable link time optimization])
m4_define(jvm_feature_desc_management, [enable java.lang.management API support])
@@ -269,26 +268,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
])
])
-################################################################################
-# Check if the feature 'jvmci' is available on this platform.
-#
-AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JVMCI],
-[
- JVM_FEATURES_CHECK_AVAILABILITY(jvmci, [
- AC_MSG_CHECKING([if platform is supported by JVMCI])
- if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
- AC_MSG_RESULT([yes])
- elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
- AC_MSG_RESULT([yes])
- elif test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
- AVAILABLE=false
- fi
- ])
-])
-
################################################################################
# Check if the feature 'shenandoahgc' is available on this platform.
#
@@ -376,7 +355,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_PREPARE_PLATFORM],
JVM_FEATURES_CHECK_CDS
JVM_FEATURES_CHECK_DTRACE
- JVM_FEATURES_CHECK_JVMCI
JVM_FEATURES_CHECK_SHENANDOAHGC
JVM_FEATURES_CHECK_ZGC
@@ -401,17 +379,17 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
JVM_FEATURES_VARIANT_UNAVAILABLE="cds minimal zero"
elif test "x$variant" = "xzero"; then
JVM_FEATURES_VARIANT_UNAVAILABLE="compiler1 compiler2 \
- jvmci minimal zgc"
+ minimal zgc"
else
JVM_FEATURES_VARIANT_UNAVAILABLE="minimal zero"
fi
# Check which features should be off by default for this JVM variant.
if test "x$variant" = "xclient"; then
- JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size"
+ JVM_FEATURES_VARIANT_FILTER="compiler2 link-time-opt opt-size"
elif test "x$variant" = "xminimal"; then
JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \
- jfr jni-check jvmci jvmti management parallelgc services \
+ jfr jni-check jvmti management parallelgc services \
shenandoahgc vm-structs zgc"
if test "x$OPENJDK_TARGET_CPU" = xarm ; then
JVM_FEATURES_VARIANT_FILTER="$JVM_FEATURES_VARIANT_FILTER opt-size"
@@ -421,7 +399,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
link-time-opt"
fi
elif test "x$variant" = "xcore"; then
- JVM_FEATURES_VARIANT_FILTER="compiler1 compiler2 jvmci \
+ JVM_FEATURES_VARIANT_FILTER="compiler1 compiler2 \
link-time-opt opt-size"
elif test "x$variant" = "xzero"; then
JVM_FEATURES_VARIANT_FILTER="jfr link-time-opt opt-size"
@@ -517,11 +495,6 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
AC_MSG_ERROR([Specified JVM feature 'jfr' requires feature 'services' for variant '$variant'])
fi
- if JVM_FEATURES_IS_ACTIVE(jvmci) && ! (JVM_FEATURES_IS_ACTIVE(compiler1) || \
- JVM_FEATURES_IS_ACTIVE(compiler2)); then
- AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1' for variant '$variant'])
- fi
-
if JVM_FEATURES_IS_ACTIVE(jvmti) && ! JVM_FEATURES_IS_ACTIVE(services); then
AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services' for variant '$variant'])
fi
@@ -531,9 +504,6 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
if ! JVM_FEATURES_IS_ACTIVE(cds); then
ENABLE_CDS="false"
fi
- if ! JVM_FEATURES_IS_ACTIVE(jvmci); then
- INCLUDE_JVMCI="false"
- fi
if JVM_FEATURES_IS_ACTIVE(compiler2); then
INCLUDE_COMPILER2="true"
fi
@@ -559,7 +529,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
# and disable them in JVM_FEATURES_VERIFY if a variant is found that are
# missing any of them.
ENABLE_CDS="true"
- INCLUDE_JVMCI="true"
INCLUDE_COMPILER2="false"
for variant in $JVM_VARIANTS; do
@@ -599,7 +568,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
AC_SUBST(JVM_FEATURES_zero)
AC_SUBST(JVM_FEATURES_custom)
- AC_SUBST(INCLUDE_JVMCI)
AC_SUBST(INCLUDE_COMPILER2)
])
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 7de5056cb83..ecfd5dd0a92 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -369,7 +369,7 @@ ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
-BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@
+BUILD_CDS_ARCHIVE_NOCOH := @BUILD_CDS_ARCHIVE_NOCOH@
ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
@@ -844,7 +844,6 @@ PNG_CFLAGS := @PNG_CFLAGS@
# Misc
INCLUDE_SA := @INCLUDE_SA@
-INCLUDE_JVMCI := @INCLUDE_JVMCI@
INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
@@ -892,14 +891,6 @@ DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
STATIC_LIBS_IMAGE_SUBDIR := static-libs
STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
-# Graal static libs image
-STATIC_LIBS_GRAAL_IMAGE_SUBDIR := static-libs-graal
-STATIC_LIBS_GRAAL_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_GRAAL_IMAGE_SUBDIR)
-
-# Graal builder image
-GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
-GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
-
# Macosx bundles directory definitions
JDK_MACOSX_BUNDLE_SUBDIR := jdk-bundle
JRE_MACOSX_BUNDLE_SUBDIR := jre-bundle
@@ -944,7 +935,6 @@ DOCS_JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
-STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_PART).tar.gz
STATIC_JDK_BUNDLE_NAME := static-jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index c882deb10a7..8a08e86d53f 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -692,6 +692,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
AC_MSG_NOTICE([A full XCode is required to build the JDK (not only command line tools)])
AC_MSG_NOTICE([If you have XCode installed, you might need to reset the Xcode active developer directory])
AC_MSG_NOTICE([using 'sudo xcode-select -r'])
+ AC_MSG_NOTICE([Starting with Xcode 26, the Metal toolchain is no longer bundled with Xcode.])
+ AC_MSG_NOTICE([Try installing it with 'xcodebuild -downloadComponent MetalToolchain'])
AC_MSG_ERROR([XCode tool 'metal' neither found in path nor with xcrun])
else
AC_MSG_RESULT([yes, will be using '$METAL'])
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 2880504676a..1ec7bef6f98 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -54,13 +54,6 @@ ifeq ($(INCLUDE_SA), false)
MODULES_FILTER += jdk.hotspot.agent
endif
-# Filter out jvmci specific modules if jvmci is disabled
-ifeq ($(INCLUDE_JVMCI), false)
- MODULES_FILTER += jdk.internal.vm.ci
- MODULES_FILTER += jdk.graal.compiler
- MODULES_FILTER += jdk.graal.compiler.management
-endif
-
# jpackage is only on windows, macosx, and linux
ifeq ($(call isTargetOs, windows macosx linux), false)
MODULES_FILTER += jdk.jpackage
diff --git a/make/conf/build-module-sets.conf b/make/conf/build-module-sets.conf
index 06c879659d1..b7608279553 100644
--- a/make/conf/build-module-sets.conf
+++ b/make/conf/build-module-sets.conf
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -45,5 +45,4 @@ LANGTOOLS_MODULES= \
# These models require buildtools-hotspot to process for gensrc
HOTSPOT_MODULES= \
jdk.hotspot.agent \
- jdk.internal.vm.ci \
#
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index 6771e8923dc..9aee8e87e3c 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -32,6 +32,10 @@ LINUX_X64_BOOT_JDK_EXT=tar.gz
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/35/GPL/openjdk-26_linux-x64_bin.tar.gz
LINUX_X64_BOOT_JDK_SHA256=83c78367f8c81257beef72aca4bbbf8e6dac8ca2b3a4546a85879a09e6e4e128
+LINUX_AARCH64_BOOT_JDK_EXT=tar.gz
+LINUX_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/35/GPL/openjdk-26_linux-aarch64_bin.tar.gz
+LINUX_AARCH64_BOOT_JDK_SHA256=403ccf451e88d0be9e1dec129fcb9318de9752121e0eb92dfa9a8cf06f249007
+
ALPINE_LINUX_X64_BOOT_JDK_EXT=tar.gz
ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26%2B35/OpenJDK26U-jdk_x64_alpine-linux_hotspot_26_35.tar.gz
ALPINE_LINUX_X64_BOOT_JDK_SHA256=c105e581fdccb4e7120d889235d1ad8d5b2bed0af4972bc881e0a8ba687c94a4
@@ -47,3 +51,7 @@ MACOS_X64_BOOT_JDK_SHA256=8642b89d889c14ede2c446fd5bbe3621c8a3082e3df02013fd1658
WINDOWS_X64_BOOT_JDK_EXT=zip
WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/35/GPL/openjdk-26_windows-x64_bin.zip
WINDOWS_X64_BOOT_JDK_SHA256=2dd2d92c9374cd49a120fe9d916732840bf6bb9f0e0cc29794917a3c08b99c5f
+
+WINDOWS_AARCH64_BOOT_JDK_EXT=zip
+WINDOWS_AARCH64_BOOT_JDK_URL=https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26%2B35-ea-beta/OpenJDK26U-jdk_aarch64_windows_hotspot_26_35-ea.zip
+WINDOWS_AARCH64_BOOT_JDK_SHA256=4892cd9714e222947de1a7415a696f43adf691560522dc5858c0a8af070912c0
diff --git a/make/conf/module-loader-map.conf b/make/conf/module-loader-map.conf
index 65101af2b8a..35b9345ed8f 100644
--- a/make/conf/module-loader-map.conf
+++ b/make/conf/module-loader-map.conf
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -44,7 +44,6 @@ BOOT_MODULES= \
java.security.sasl \
java.xml \
jdk.incubator.vector \
- jdk.internal.vm.ci \
jdk.jfr \
jdk.management \
jdk.management.jfr \
@@ -60,8 +59,6 @@ BOOT_MODULES= \
# should carefully be considered if it should be upgradeable or not.
UPGRADEABLE_PLATFORM_MODULES= \
java.compiler \
- jdk.graal.compiler \
- jdk.graal.compiler.management \
#
PLATFORM_MODULES= \
@@ -107,7 +104,6 @@ NATIVE_ACCESS_MODULES= \
jdk.crypto.mscapi \
jdk.hotspot.agent \
jdk.internal.le \
- jdk.internal.vm.ci \
jdk.jdi \
jdk.jfr \
jdk.jpackage \
diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd
index aebedd33a43..b4247f2d924 100644
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@@ -1,5 +1,5 @@
-
+
@@ -493,6 +493,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
+
+
+
+
+
+
+
+
+
+
diff --git a/make/data/cldr/common/main/aa.xml b/make/data/cldr/common/main/aa.xml
index 3ff6fb6dd06..791c3009658 100644
--- a/make/data/cldr/common/main/aa.xml
+++ b/make/data/cldr/common/main/aa.xml
@@ -1,6 +1,6 @@
-
@@ -1027,6 +1027,7 @@ For terms of use, see http://www.unicode.org/copyright.html
+
diff --git a/make/data/cldr/common/supplemental/likelySubtags.xml b/make/data/cldr/common/supplemental/likelySubtags.xml
index 76e215255fd..a73b8a8c95b 100644
--- a/make/data/cldr/common/supplemental/likelySubtags.xml
+++ b/make/data/cldr/common/supplemental/likelySubtags.xml
@@ -1,7 +1,7 @@
-
+
@@ -1343,7 +1343,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
-
+
diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml
index 710934fef81..610921a8f6d 100644
--- a/make/data/cldr/common/supplemental/metaZones.xml
+++ b/make/data/cldr/common/supplemental/metaZones.xml
@@ -735,7 +735,7 @@ For terms of use, see http://www.unicode.org/copyright.html
-
+
diff --git a/make/data/cldr/common/supplemental/supplementalData.xml b/make/data/cldr/common/supplemental/supplementalData.xml
index 25684d36c6e..cbfe2c5e875 100644
--- a/make/data/cldr/common/supplemental/supplementalData.xml
+++ b/make/data/cldr/common/supplemental/supplementalData.xml
@@ -1,7 +1,7 @@
@@ -57,7 +57,7 @@ For terms of use, see https://www.unicode.org/copyright.html
-
+
@@ -3147,7 +3147,7 @@ XXX Code for transations where no currency is involved
-
+
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index e8db4888d3a..66ba18f2775 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -204,7 +204,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
DISABLED_WARNINGS_gcc_jfrChunkWriter.cpp := unused-const-variable, \
DISABLED_WARNINGS_gcc_jfrMemorySizer.cpp := unused-const-variable, \
DISABLED_WARNINGS_gcc_jfrTraceIdKlassQueue.cpp := unused-const-variable, \
- DISABLED_WARNINGS_gcc_jvmciCodeInstaller.cpp := stringop-overflow, \
DISABLED_WARNINGS_gcc_jvmFlag.cpp := unused-const-variable, \
DISABLED_WARNINGS_gcc_jvmtiTagMap.cpp := stringop-overflow, \
DISABLED_WARNINGS_gcc_macroAssembler_ppc_sha.cpp := unused-const-variable, \
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 90ea8a985e3..9477b0925d2 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -96,12 +96,6 @@ ifneq ($(call check-jvm-feature, jvmti), true)
jvmtiAgentList.cpp jfrJvmtiAgent.cpp
endif
-ifneq ($(call check-jvm-feature, jvmci), true)
- JVM_CFLAGS_FEATURES += -DINCLUDE_JVMCI=0
- JVM_EXCLUDES += jvmci
- JVM_EXCLUDE_FILES += jvmciCodeInstaller_$(HOTSPOT_TARGET_CPU_ARCH).cpp
-endif
-
ifneq ($(call check-jvm-feature, vm-structs), true)
JVM_CFLAGS_FEATURES += -DINCLUDE_VM_STRUCTS=0
JVM_EXCLUDE_FILES += vmStructs.cpp
diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index 3eedb64a597..80f3582043c 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -33,8 +33,6 @@ ifeq ($(INCLUDE), true)
ifeq ($(TOOLCHAIN_TYPE), gcc)
BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
- BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
- BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
ifeq ($(DEBUG_LEVEL), release)
# Need extra inlining to collapse shared marking code into the hot marking loop
BUILD_LIBJVM_shenandoahMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
@@ -104,7 +102,6 @@ else ifeq ($(call isTargetOs, macosx), true)
sharedRuntimeTrig.cpp \
sharedRuntimeTrans.cpp \
loopTransform.cpp \
- jvmciCompilerToVM.cpp \
$(OPT_SPEED_SRC) \
#
endif
@@ -140,13 +137,9 @@ else ifeq ($(call isTargetOs, windows), true)
os_windows.cpp \
os_windows_x86.cpp \
osThread_windows.cpp \
- jvmciCompilerToVMInit.cpp \
$(OPT_SPEED_SRC) \
#
- # Workaround for jvmciCompilerToVM.cpp long compilation time
- BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
-
endif
################################################################################
diff --git a/make/ide/visualstudio/hotspot/CreateVSProject.gmk b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
index b2afbe2b9bc..8cf26d9cab8 100644
--- a/make/ide/visualstudio/hotspot/CreateVSProject.gmk
+++ b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -111,7 +111,6 @@ ifeq ($(call isTargetOs, windows), true)
-hidePath .hg \
-hidePath .jcheck \
-hidePath jdk.hotspot.agent \
- -hidePath jdk.internal.vm.ci \
-hidePath jdk.jfr \
-compiler VC10 \
-jdkTargetRoot $(call FixPath, $(JDK_OUTPUTDIR)) \
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 18ce0c334fb..b7754326c97 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -815,6 +815,13 @@ public class CLDRConverter {
data = map.get(TIMEZONE_ID_PREFIX + tzLink);
}
+ String meta = handlerMetaZones.get(tzKey);
+ if (meta == null && tzLink != null) {
+ // Check for tzLink
+ meta = handlerMetaZones.get(tzLink);
+ }
+ String metaKey = meta != null ? METAZONE_ID_PREFIX + meta : null;
+
if (data instanceof String[] tznames) {
// Hack for UTC. UTC is an alias to Etc/UTC in CLDR
if (tzid.equals("Etc/UTC") && !map.containsKey(TIMEZONE_ID_PREFIX + "UTC")) {
@@ -826,24 +833,14 @@ public class CLDRConverter {
tznames = Arrays.copyOf(tznames, tznames.length);
fillTZDBShortNames(tzKey, tznames);
names.put(tzid, tznames);
+ if (meta != null && map.get(metaKey) instanceof String[] metaNames) {
+ recordMetazone(names, meta, tzKey, metaNames);
+ }
}
} else {
- String meta = handlerMetaZones.get(tzKey);
- if (meta == null && tzLink != null) {
- // Check for tzLink
- meta = handlerMetaZones.get(tzLink);
- }
if (meta != null) {
- String metaKey = METAZONE_ID_PREFIX + meta;
- data = map.get(metaKey);
- if (data instanceof String[] tznames) {
- if (isDefaultZone(meta, tzKey)) {
- // Record the metazone names only from the default
- // (001) zone, with short names filled from TZDB
- tznames = Arrays.copyOf(tznames, tznames.length);
- fillTZDBShortNames(tzKey, tznames);
- names.put(metaKey, tznames);
- }
+ if (map.get(metaKey) instanceof String[] metaNames) {
+ recordMetazone(names, meta, tzKey, metaNames);
names.put(tzid, meta);
if (tzLink != null && availableIds.contains(tzLink)) {
names.put(tzLink, meta);
@@ -1231,7 +1228,7 @@ public class CLDRConverter {
String zone001 = handlerMetaZones.zidMap().get(meta);
return zone001 == null ? "" :
String.format(" \"%s\", \"%s\", \"%s\",",
- id, meta, zone001);
+ escape(id), escape(meta), escape(zone001));
})
.filter(s -> !s.isEmpty())
.sorted();
@@ -1508,11 +1505,18 @@ public class CLDRConverter {
}
}
- private static boolean isDefaultZone(String meta, String tzid) {
+ private static void recordMetazone(Map names, String meta, String tzid, String[] tznames) {
String zone001 = handlerMetaZones.zidMap().get(meta);
var tzLink = getTZDBLink(tzid);
- return canonicalTZMap.getOrDefault(tzid, tzid).equals(zone001) ||
- tzLink != null && canonicalTZMap.getOrDefault(tzLink, tzLink).equals(zone001);
+
+ // Record the metazone names only from the default
+ // (001) zone, with short names filled from TZDB
+ if (canonicalTZMap.getOrDefault(tzid, tzid).equals(zone001) ||
+ tzLink != null && canonicalTZMap.getOrDefault(tzLink, tzLink).equals(zone001)) {
+ tznames = Arrays.copyOf(tznames, tznames.length);
+ fillTZDBShortNames(tzid, tznames);
+ names.put(METAZONE_ID_PREFIX + meta, tznames);
+ }
}
private static String getTZDBLink(String tzid) {
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
index 45de46d2476..9d699cc8a74 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
@@ -102,9 +102,9 @@ class MetaZonesParseHandler extends AbstractLDMLHandler {
zones.put(attributes.getValue("other"), attributes.getValue("type"));
} else {
mzoneMapEntryList.add(String.format(" \"%s\", \"%s\", \"%s\",",
- attributes.getValue("other"),
- territory,
- attributes.getValue("type")));
+ CLDRConverter.escape(attributes.getValue("other")),
+ CLDRConverter.escape(territory),
+ CLDRConverter.escape(attributes.getValue("type"))));
}
pushIgnoredContainer(qName);
break;
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
index 0bc5a2bdb0d..84657ae94f0 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
@@ -103,14 +103,14 @@ class ResourceBundleGenerator implements BundleGenerator {
for (String key : map.keySet()) {
if (key.startsWith(CLDRConverter.METAZONE_ID_PREFIX)) {
String meta = key.substring(CLDRConverter.METAZONE_ID_PREFIX.length());
- String[] value;
- value = (String[]) map.get(key);
- fmt.format(" final String[] %s = new String[] {\n", meta);
- for (String s : value) {
- fmt.format(" \"%s\",\n", CLDRConverter.escape(s));
+ if (map.get(key) instanceof String[] value) {
+ fmt.format(" final String[] %s = new String[] {\n", CLDRConverter.escape(meta));
+ for (String s : value) {
+ fmt.format(" \"%s\",\n", CLDRConverter.escape(s));
+ }
+ fmt.format(" };\n");
+ metaKeys.add(key);
}
- fmt.format(" };\n");
- metaKeys.add(key);
}
}
for (String key : metaKeys) {
@@ -143,15 +143,15 @@ class ResourceBundleGenerator implements BundleGenerator {
if (fmt == null) {
fmt = new Formatter();
}
- String metaVal = oldEntry.metaKey();
+ String metaVal = CLDRConverter.escape(oldEntry.metaKey());
if (val instanceof String[] values) {
fmt.format(" final String[] %s = new String[] {\n", metaVal);
for (String s : values) {
fmt.format(" \"%s\",\n", CLDRConverter.escape(s));
}
fmt.format(" };\n");
- } else {
- fmt.format(" final String %s = \"%s\";\n", metaVal, CLDRConverter.escape((String)val));
+ } else if (val instanceof String str) {
+ fmt.format(" final String %s = \"%s\";\n", metaVal, CLDRConverter.escape(str));
}
newMap.put(oldEntry.key, oldEntry.metaKey());
}
@@ -178,21 +178,21 @@ class ResourceBundleGenerator implements BundleGenerator {
out.println(" final Object[][] data = new Object[][] {");
for (String key : map.keySet()) {
Object value = map.get(key);
+ var keyStr = CLDRConverter.escape(key);
if (value == null) {
CLDRConverter.warning("null value for " + key);
- } else if (value instanceof String) {
- String valStr = (String)value;
+ } else if (value instanceof String valStr) {
+ var escapedVal = CLDRConverter.escape(valStr);
if (type == BundleType.TIMEZONE &&
!(key.startsWith(CLDRConverter.EXEMPLAR_CITY_PREFIX) ||
key.startsWith(CLDRConverter.METAZONE_DSTOFFSET_PREFIX)) ||
valStr.startsWith(META_VALUE_PREFIX)) {
- out.printf(" { \"%s\", %s },\n", key, CLDRConverter.escape(valStr));
+ out.printf(" { \"%s\", %s },\n", keyStr, escapedVal);
} else {
- out.printf(" { \"%s\", \"%s\" },\n", key, CLDRConverter.escape(valStr));
+ out.printf(" { \"%s\", \"%s\" },\n", keyStr, escapedVal);
}
- } else if (value instanceof String[]) {
- String[] values = (String[]) value;
- out.println(" { \"" + key + "\",\n new String[] {");
+ } else if (value instanceof String[] values) {
+ out.println(" { \"" + keyStr + "\",\n new String[] {");
for (String s : values) {
out.println(" \"" + CLDRConverter.escape(s) + "\",");
}
@@ -311,7 +311,7 @@ class ResourceBundleGenerator implements BundleGenerator {
out.printf(" parentLocalesMap.put(Locale.ROOT,\n");
} else {
out.printf(" parentLocalesMap.put(Locale.forLanguageTag(\"%s\"),\n",
- parentTag);
+ CLDRConverter.escape(parentTag));
}
generateStringArray(metaInfo.get(key), out);
}
@@ -320,7 +320,7 @@ class ResourceBundleGenerator implements BundleGenerator {
// for languageAliasMap
CLDRConverter.handlerSupplMeta.getLanguageAliasData().forEach((key, value) -> {
- out.printf(" languageAliasMap.put(\"%s\", \"%s\");\n", key, value);
+ out.printf(" languageAliasMap.put(\"%s\", \"%s\");\n", CLDRConverter.escape(key), CLDRConverter.escape(value));
});
out.printf(" }\n\n");
@@ -338,11 +338,11 @@ class ResourceBundleGenerator implements BundleGenerator {
CLDRConverter.handlerTimeZone.getData().entrySet().stream()
.forEach(e -> {
String[] ids = ((String)e.getValue()).split("\\s");
- out.printf(" tzCanonicalIDMap.put(\"%s\", \"%s\");\n", e.getKey(),
- ids[0]);
+ out.printf(" tzCanonicalIDMap.put(\"%s\", \"%s\");\n", CLDRConverter.escape(e.getKey()),
+ CLDRConverter.escape(ids[0]));
for (int i = 1; i < ids.length; i++) {
- out.printf(" tzCanonicalIDMap.put(\"%s\", \"%s\");\n", ids[i],
- ids[0]);
+ out.printf(" tzCanonicalIDMap.put(\"%s\", \"%s\");\n", CLDRConverter.escape(ids[i]),
+ CLDRConverter.escape(ids[0]));
}
});
out.println();
@@ -352,8 +352,9 @@ class ResourceBundleGenerator implements BundleGenerator {
if (key.startsWith(CLDRConverter.LIKELY_SCRIPT_PREFIX)) {
// ensure spaces at the begin/end for delimiting purposes
out.printf(" likelyScriptMap.put(\"%s\", \"%s\");\n",
- key.substring(CLDRConverter.LIKELY_SCRIPT_PREFIX.length()),
- " " + metaInfo.get(key).stream().collect(Collectors.joining(" ")) + " ");
+ CLDRConverter.escape(key.substring(CLDRConverter.LIKELY_SCRIPT_PREFIX.length())),
+ " " + metaInfo.get(key).stream()
+ .map(l -> CLDRConverter.escape(l)).collect(Collectors.joining(" ")) + " ");
}
}
out.printf(" }\n }\n");
@@ -371,7 +372,7 @@ class ResourceBundleGenerator implements BundleGenerator {
return " %s";
}
""",
- toLocaleList(applyLanguageAliases(metaInfo.get("AvailableLocales")), false));
+ CLDRConverter.escape(toLocaleList(applyLanguageAliases(metaInfo.get("AvailableLocales")), false)));
if(CLDRConverter.isBaseModule) {
out.printf("""
@@ -408,7 +409,7 @@ class ResourceBundleGenerator implements BundleGenerator {
int count = 0;
for (int i = 0; i < children.length; i++) {
String child = children[i];
- out.printf("\"%s\", ", child);
+ out.printf("\"%s\", ", CLDRConverter.escape(child));
count += child.length() + 4;
if (i != children.length - 1 && count > 64) {
out.printf("\n ");
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
index 101ee81b256..35e1cef1e87 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -85,7 +85,9 @@ class SupplementalMetadataParseHandler extends AbstractLDMLHandler