RISC-V: Add riscv_hwprobe syscall for zicboz block size

.git-blame-ignore-revs

@@ -1,184 +0,0 @@
-# git blame ignore revs file
-#
-# The list of revisions below will be ignored by git-blame (1) if this file gets
-# passed via the --ignore-revs-file command line option or is configured using
-# the blame.ignoreRevsFile key.
-#
-# Only add commits that obviously do not change semantics, e.g. mechanical refactorings
-# or formatting. Always add the commit message as a comment above the revision
-# to keep the file readable.
-
-# 8299973: Replace NULL with nullptr in share/utilities/
-1084fd24eb118d4131538c2a3ead714db7d0357b
-
-# 8299974: Replace NULL with nullptr in share/adlc/
-62537d200f01d58ff1c236f31f71c5839316db9e
-
-# 8300081: Replace NULL with nullptr in share/asm/
-9d5bab11f08a992803399f422d75b17f8607df72
-
-# 8300086: Replace NULL with nullptr in share/c1/
-90d5041b6a055d6266140ffea2aa9a3b08b32209
-
-# 8300087: Replace NULL with nullptr in share/cds/
-eca64795be63c599a637ce2a7f740b2d0a1ec9bc
-
-# 8300222: Replace NULL with nullptr in share/logging
-bd5ca953058704087da4bc5796b3ce28ce2a8f78
-
-# 8300240: Replace NULL with nullptr in share/ci/
-f52d35c84b7333809156d201c866793854143888
-
-# 8300241: Replace NULL with nullptr in share/classfile/
-49ff52087be8b95cbf369518281312ecc9d83618
-
-# 8300242: Replace NULL with nullptr in share/code/
-cfe57466ddecb93b528478d0b053b089dd1ed285
-
-# 8300243: Replace NULL with nullptr in share/compiler/
-fcbf9d052efd16821750fb20813f8030ee828472
-
-# 8300244: Replace NULL with nullptr in share/interpreter/
-a5d8e12872d9de399fa97b33896635d101b71372
-
-# 8300245: Replace NULL with nullptr in share/jfr/
-cc396895e5a1dac49f4e341ce91c04b8c092d0af
-
-# 8300651: Replace NULL with nullptr in share/runtime/
-71107f4648d8f31a7bcc0aa5202ef46230df583f
-
-# 8301068: Replace NULL with nullptr in share/jvmci/
-90ec19efeda90f13a918b4481fe6ee552ab2af66
-
-# 8301069: Replace NULL with nullptr in share/libadt/
-b0376a5f4421fb58c0feeddfce2c2083314e400c
-
-# 8301070: Replace NULL with nullptr in share/memory/
-d98a323a8b972c17a066c597a81b164681ad5589
-
-# 8301072: Replace NULL with nullptr in share/oops/
-c8ace482edead720c865cf996729a316025d937e
-
-# 8301074: Replace NULL with nullptr in share/opto/
-5726d31e56530bbe7dee61ae04b126e20cb3611d
-
-# 8301076: Replace NULL with nullptr in share/prims/
-b76a52f2104b63e84e5d09f47ce01dd0cb3935d7
-
-# 8301077: Replace NULL with nullptr in share/services/
-5c1ec82656323872c4628026662fe5b62e7a61e3
-
-# 8301178: Replace NULL with nullptr in share/gc/epsilon/
-b77abc6a0daed0e01a9003d42493320376dc98bc
-
-# 8301179: Replace NULL with nullptr in share/gc/serial/
-107e184d59c0bbed6441a3c1a9bfd4527da3bce5
-
-# 8301180: Replace NULL with nullptr in share/gc/parallel/
-3758487fda61b27e7e684413793ed28c0b9e64d3
-
-# 8301223: Replace NULL with nullptr in share/gc/g1/
-75a4edca6b9fa6b3e66b564aeb4d7ca8acf02491
-
-# 8301225: Replace NULL with nullptr in share/gc/shenandoah/
-0c9658446d111ec944f06b7a8a4e3ae7bf53ee8d
-
-# 8301477: Replace NULL with nullptr in os/aix
-43288bbd684abfcefdf385ed1e0307070399ccbf
-
-# 8301478: Replace NULL with nullptr in os/bsd
-716f1df609e7f0aa7b3b9383d23dde5c71017d02
-
-# 8301479: Replace NULL with nullptr in os/linux
-ac9e046748a9bb6ee065dc473d82135ce36043b7
-
-# 8301480: Replace NULL with nullptr in os/posix
-4539899c55c77771b951d005c17550ef9ac94819
-
-# 8301481: Replace NULL with nullptr in os/windows
-c91cd2814baa8dee2af8af0fecf9185d4a0a44cf
-
-# 8301493: Replace NULL with nullptr in cpu/aarch64
-948f3b3c24709eca3aa6c3f0db6adb9226d6f9ac
-
-# 8301494: Replace NULL with nullptr in cpu/arm
-c4ffe4bf6369d5b271aa8689b8648f3fe8dcabed
-
-# 8301495: Replace NULL with nullptr in cpu/ppc
-0826ceee65ab83f643a77716f8f12d0060369923
-
-# 8301496: Replace NULL with nullptr in cpu/riscv
-d2ce04bb101002abfdb7c8adb3fa8ea267903c36
-
-# 8301497: Replace NULL with nullptr in cpu/s390
-54f7b6ca34986cc26c5b91c6724b9a1754c94391
-
-# 8301498: Replace NULL with nullptr in cpu/x86
-4154a980ca28c1ae56db26e3dce64c07c225de12
-
-# 8301499: Replace NULL with nullptr in cpu/zero
-4e327db1d127c652ef39e31c164e36ae429a0065
-
-# 8301500: Replace NULL with nullptr in os_cpu/aix_ppc
-c8307e37fdf4453cade84efc113d93dd14333fd0
-
-# 8301501: Replace NULL with nullptr in os_cpu/bsd_aarch64
-218223e4a31d485935655cb3f186a752defd8fa8
-
-# 8301502: Replace NULL with nullptr in os_cpu/bsd_x86
-6daff6b26946748360d59a12e9069a08ab5ca06d
-
-# 8301503: Replace NULL with nullptr in os_cpu/bsd_zero
-8cc399b672c6ce08037685b3a3a2db3c53a87b50
-
-# 8301504: Replace NULL with nullptr in os_cpu/linux_aarch64
-13fcd602d37eb0095f169255128588b872639571
-
-# 8301505: Replace NULL with nullptr in os_cpu/linux_arm
-b81f0ff43ac8d1431f2f5dccb7499a3a1503823d
-
-# 8301506: Replace NULL with nullptr in os_cpu/linux_ppc
-b1e96989b693aadea082a01576e25f85ed28ff0d
-
-# 8301507: Replace NULL with nullptr in os_cpu/linux_riscv
-182d1b2fb7034b6e9177dc360cbea43d548c3ff0
-
-# 8301508: Replace NULL with nullptr in os_cpu/linux_s390
-d097b5e6285e1a59632211e006592fedf2047c09
-
-# 8301509: Replace NULL with nullptr in os_cpu/linux_x86
-5d1f71daf06870810c9ca24e911d6191cc4f3006
-
-# 8301511: Replace NULL with nullptr in os_cpu/linux_zero
-42a286a15862d9a05ea3477a9eeab46e7b33e599
-
-# 8301512: Replace NULL with nullptr in os_cpu/windows_aarch64
-ad79e49141f063a61090eda69d96dc580db88949
-
-# 8301513: Replace NULL with nullptr in os_cpu/windows_x86
-c109dae48c61c6fbeacadf59d509d37d2c4d2bb8
-
-# 8308092: Replace NULL with nullptr in gc/x
-599fa774b875da971d66f79e5e43ede2b5ce18aa
-
-# 8309044: Replace NULL with nullptr, final sweep of hotspot code
-4f16161607edbf69f423ced1d3c24f7af058d46b
-
-# 8324286: Fix backsliding on use of nullptr instead of NULL
-bcb340da091e3287da8d2ecfcd017ebcc6613cae
-
-# 8324678: Replace NULL with nullptr in HotSpot gtests
-c1281e6b45ed167df69d29a6039d81854c145ae6
-
-# 8324679: Replace NULL with nullptr in HotSpot .ad files
-b3ecd55601d483359819d02e70789bbd412b13da
-
-# 8324680: Replace NULL with nullptr in JVMTI generated code
-267780bf0adf4bfd831fbc04347e297fa8f3bb01
-
-# 8324681: Replace NULL with nullptr in HotSpot jtreg test native code files
-a6bdee48f39993128d8095d40ab417f0102af0f4
-
-# 8324799: Use correct extension for C++ test headers
-998d0baab0fd051c38d9fd6021628eb863b80554
-

.github/actions/build-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2024, 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
@@ -37,13 +37,13 @@ runs:
 
     - name: 'Check cache for already built JTReg'
       id: get-cached
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+      uses: actions/cache@v4
       with:
         path: jtreg/installed
         key: jtreg-${{ steps.version.outputs.value }}
 
     - name: 'Checkout the JTReg source'
-      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      uses: actions/checkout@v4
       with:
         repository: openjdk/jtreg
         ref: jtreg-${{ steps.version.outputs.value }}
@@ -61,7 +61,7 @@ runs:
       if: (steps.get-cached.outputs.cache-hit != 'true')
 
     - name: 'Upload JTReg artifact'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@v4
       with:
         name: bundles-jtreg-${{ steps.version.outputs.value }}
         path: jtreg/installed

.github/actions/do-build/action.yml

@@ -66,7 +66,7 @@ runs:
       shell: bash
 
     - name: 'Upload build logs'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@v4
       with:
         name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: failure-logs
@@ -74,7 +74,7 @@ runs:
 
       # This is the best way I found to abort the job with an error message
     - name: 'Notify about build failures'
-      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+      uses: actions/github-script@v7
       with:
         script: core.setFailed('Build failed. See summary for details.')
       if: steps.check.outputs.failure == 'true'

.github/actions/get-bootjdk/action.yml

@@ -65,7 +65,7 @@ runs:
 
     - name: 'Check cache for BootJDK'
       id: get-cached-bootjdk
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+      uses: actions/cache@v4
       with:
         path: bootjdk/jdk
         key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}

.github/actions/get-bundles/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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,14 +54,14 @@ runs:
   steps:
     - name: 'Download bundles artifact'
       id: download-bundles
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
       continue-on-error: true
 
     - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
@@ -69,7 +69,7 @@ runs:
 
     - name: 'Download static bundles artifact'
       id: download-static-bundles
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
         path: bundles

.github/actions/get-gtest/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, 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
@@ -40,7 +40,7 @@ runs:
         var: GTEST_VERSION
 
     - name: 'Checkout GTest source'
-      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      uses: actions/checkout@v4
       with:
         repository: google/googletest
         ref: 'v${{ steps.version.outputs.value }}'

.github/actions/get-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2024, 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
@@ -41,7 +41,7 @@ runs:
 
     - name: 'Download JTReg artifact'
       id: download-jtreg
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@v4
       with:
         name: bundles-jtreg-${{ steps.version.outputs.value }}
         path: jtreg/installed

.github/actions/get-msys2/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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
@@ -25,49 +25,20 @@
 
 name: 'Get MSYS2'
 description: 'Download MSYS2 and prepare a Windows host'
-inputs:
-  architecture:
-    description: 'Architecture'
-    required: true
 
 runs:
   using: composite
   steps:
-    - name: 'Install MSYS2 on x86.x64'
-      id: msys2-x64
-      uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.32.0
+    - name: 'Install MSYS2'
+      id: msys2
+      uses: msys2/setup-msys2@v2.28.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@66cd2cce69caa17b53920067426061ca1de3a884 # v2.32.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 for x64'
+    - name: 'Set MSYS2 path'
       run: |
-        echo "${{ steps.msys2-x64.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
+        echo "${{ steps.msys2.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}

.github/actions/upload-bundles/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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
@@ -87,7 +87,7 @@ runs:
       shell: bash
 
     - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
         path: bundles

.github/pull_request_template.md

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

.github/workflows/build-alpine-linux.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 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
@@ -59,7 +59,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     container:
       image: alpine:3.20
 
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - name: 'Install toolchain and dependencies'
         run: |
@@ -96,8 +96,6 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
-          --with-external-symbols-in-bundles=none
-          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-cross-compile.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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,17 +48,24 @@ on:
 jobs:
   build-cross-compile:
     name: build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     strategy:
       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
@@ -87,7 +94,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -115,7 +122,7 @@ jobs:
 
       - name: 'Check cache for sysroot'
         id: get-cached-sysroot
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@v4
         with:
           path: sysroot
           key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
@@ -172,8 +179,6 @@ jobs:
           --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
           --with-sysroot=sysroot
           --with-jmod-compress=zip-1
-          --with-external-symbols-in-bundles=none
-          --with-native-debug-symbols-level=1
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (

.github/workflows/build-linux.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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
@@ -31,14 +31,6 @@ 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
@@ -83,7 +75,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ${{ inputs.runs-on }}
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -92,13 +84,13 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - name: 'Get the BootJDK'
         id: bootjdk
         uses: ./.github/actions/get-bootjdk
         with:
-          platform: ${{ inputs.bootjdk-platform }}
+          platform: linux-x64
 
       - name: 'Get JTReg'
         id: jtreg
@@ -123,21 +115,9 @@ jobs:
           if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
             sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
           fi
-          sudo apt update
-          sudo apt install --only-upgrade apt
-          sudo apt install \
-            gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
-            g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
-            libasound2-dev${{ steps.arch.outputs.suffix }} \
-            libcups2-dev${{ steps.arch.outputs.suffix }} \
-            libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
-            libx11-dev${{ steps.arch.outputs.suffix }} \
-            libxext-dev${{ steps.arch.outputs.suffix }} \
-            libxrandr-dev${{ steps.arch.outputs.suffix }} \
-            libxrender-dev${{ steps.arch.outputs.suffix }} \
-            libxt-dev${{ steps.arch.outputs.suffix }} \
-            libxtst-dev${{ steps.arch.outputs.suffix }} \
-            ${{ inputs.apt-extra-packages }}
+          sudo apt-get update
+          sudo apt-get install --only-upgrade apt
+          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
       - name: 'Configure'
@@ -151,8 +131,6 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
-          --with-external-symbols-in-bundles=none
-          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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
@@ -75,7 +75,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -110,8 +110,6 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
-          --with-external-symbols-in-bundles=none
-          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-windows.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, 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
@@ -31,9 +31,6 @@ on:
       platform:
         required: true
         type: string
-      runs-on:
-        required: true
-        type: string
       extra-conf-options:
         required: false
         type: string
@@ -48,7 +45,7 @@ on:
       msvc-toolset-version:
         required: true
         type: string
-      architecture:
+      msvc-toolset-architecture:
         required: true
         type: string
       configure-arguments:
@@ -70,7 +67,7 @@ env:
 jobs:
   build-windows:
     name: build
-    runs-on: ${{ inputs.runs-on }}
+    runs-on: windows-2025
     defaults:
       run:
         shell: bash
@@ -86,18 +83,16 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - 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: ${{ inputs.platform }}
+          platform: windows-x64
 
       - name: 'Get JTReg'
         id: jtreg
@@ -107,49 +102,26 @@ jobs:
         id: gtest
         uses: ./.github/actions/get-gtest
 
-      - name: 'Check toolchain installed for x64'
-        id: toolchain-check-x64
+      - name: 'Check toolchain installed'
+        id: toolchain-check
         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 for x64"
+            echo "Toolchain is already installed"
             echo "toolchain-installed=true" >> $GITHUB_OUTPUT
           else
-            echo "Toolchain is not yet installed for x64"
+            echo "Toolchain is not yet installed"
             echo "toolchain-installed=false" >> $GITHUB_OUTPUT
           fi
-        if: ${{ inputs.architecture == 'x86.x64' }}
 
-      - 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'
+      - name: 'Install toolchain and dependencies'
         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 }}.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') }}
+            --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
+        if: steps.toolchain-check.outputs.toolchain-installed != 'true'
 
       - name: 'Configure'
         run: >
@@ -162,7 +134,6 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
           --with-jmod-compress=zip-1
-          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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-aarch64, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -57,14 +57,13 @@ jobs:
 
   prepare:
     name: 'Prepare the run'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     env:
       # List of platforms to exclude by default
       EXCLUDED_PLATFORMS: 'alpine-linux-x64'
     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 }}
@@ -76,7 +75,7 @@ jobs:
 
     steps:
       - name: 'Checkout the scripts'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
         with:
           sparse-checkout: |
             .github
@@ -177,7 +176,6 @@ 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
@@ -203,20 +201,6 @@ 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
@@ -311,7 +295,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 build fine.
+      # dependent projects, e.g. libgraal, builds fine.
       bundle-suffix: "-static-libs"
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
@@ -343,8 +327,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      runs-on: 'macos-15-intel'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-13'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -356,8 +340,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      runs-on: 'macos-15'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-14'
+      xcode-toolset-version: '15.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -369,9 +353,8 @@ 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' }}
@@ -383,9 +366,10 @@ 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' }}
@@ -421,7 +405,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-24.04
+      runs-on: ubuntu-22.04
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug
 
@@ -435,23 +419,10 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-24.04
+      runs-on: ubuntu-22.04
       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:
@@ -461,9 +432,9 @@ jobs:
     with:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
-      runs-on: macos-15
+      runs-on: macos-14
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      xcode-toolset-version: '16.4'
+      xcode-toolset-version: '15.4'
       debug-suffix: -debug
 
   test-windows-x64:
@@ -475,21 +446,6 @@ jobs:
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
-      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
+      runs-on: windows-2025
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, 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
@@ -37,9 +37,6 @@ on:
       runs-on:
         required: true
         type: string
-      architecture:
-        required: false
-        type: string
       xcode-toolset-version:
         required: false
         type: string
@@ -131,12 +128,10 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@v4
 
       - name: 'Get MSYS2'
         uses: ./.github/actions/get-msys2
-        with:
-          architecture: ${{ inputs.architecture }}
         if: runner.os == 'Windows'
 
       - name: 'Get the BootJDK'
@@ -244,7 +239,7 @@ jobs:
         if: always()
 
       - name: 'Upload test results'
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v4
         with:
           path: results
           name: ${{ steps.package.outputs.artifact-name }}
@@ -252,7 +247,7 @@ jobs:
 
         # This is the best way I found to abort the job with an error message
       - name: 'Notify about test failures'
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        uses: actions/github-script@v7
         with:
           script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
         if: steps.run-tests.outputs.failure == 'true'

.gitignore

@@ -16,7 +16,6 @@ NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
 /src/utils/LogCompilation/target/
-/src/utils/LogCompilation/logc.jar
 /.project/
 /.settings/
 /compile_commands.json
@@ -24,9 +23,5 @@ NashornProfile.txt
 /.gdbinit
 /.lldbinit
 **/core.[0-9]*
-test/benchmarks/**/target
-/src/hotspot/CMakeLists.txt
-/src/hotspot/compile_commands.json
-/src/hotspot/cmake-build-debug/
-/src/hotspot/.cache/
-/src/hotspot/.idea/
+*.rej
+*.orig

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=28
+version=26
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright

README.md

@@ -1,7 +1,7 @@
 # Welcome to the JDK!
 
 For build instructions please see the
-[online documentation](https://git.openjdk.org/jdk/blob/master/doc/building.md),
+[online documentation](https://openjdk.org/groups/build/doc/building.html),
 or either of these files:
 
 - [doc/building.html](doc/building.html) (html version)

bin/idea.sh

@@ -187,18 +187,14 @@ fi
 SOURCE_PREFIX="<sourceFolder url=\"file://"
 SOURCE_POSTFIX="\" isTestSource=\"false\" />"
 
-# SOURCES is a single string containing embeded newlines.
 for root in $MODULE_ROOTS; do
     if [ "x$CYGPATH" != "x" ]; then
       root=`$CYGPATH -am $root`
     elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
       root=`wslpath -am $root`
     fi
-    # Add line termination/indentation for everything after the first entry.
-    if [ "x$SOURCES" != "x" ]; then
-      SOURCES="${SOURCES}\n      "
-    fi
-    SOURCES="${SOURCES}${SOURCE_PREFIX}${root}${SOURCE_POSTFIX}"
+
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done
 
 add_replacement "###SOURCE_ROOTS###" "$SOURCES"

bin/unshuffle_list.txt

@@ -0,0 +1,191 @@
+#
+# Copyright (c) 2014, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# 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.
+#
+
+src/bsd : jdk/src/bsd
+src/demo : jdk/src/demo
+src/java.activation : jaxws/src/java.activation
+src/java.base : jdk/src/java.base
+src/java.compiler : langtools/src/java.compiler
+src/java.corba : corba/src/java.corba
+src/java.datatransfer : jdk/src/java.datatransfer
+src/java.desktop : jdk/src/java.desktop
+src/java.instrument : jdk/src/java.instrument
+src/java.logging : jdk/src/java.logging
+src/java.management : jdk/src/java.management
+src/java.management.rmi : jdk/src/java.management.rmi
+src/java.naming : jdk/src/java.naming
+src/java.prefs : jdk/src/java.prefs
+src/java.rmi : jdk/src/java.rmi
+src/java.scripting : jdk/src/java.scripting
+src/java.se : jdk/src/java.se
+src/java.security.jgss : jdk/src/java.security.jgss
+src/java.security.sasl : jdk/src/java.security.sasl
+src/java.se.ee : jdk/src/java.se.ee
+src/java.smartcardio : jdk/src/java.smartcardio
+src/java.sql : jdk/src/java.sql
+src/java.sql.rowset : jdk/src/java.sql.rowset
+src/java.transaction : jdk/src/java.transaction
+src/java.xml : jaxp/src/java.xml
+src/java.xml.bind : jaxws/src/java.xml.bind
+src/java.xml.crypto : jdk/src/java.xml.crypto
+src/java.xml.ws : jaxws/src/java.xml.ws
+src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
+src/jdk.accessibility : jdk/src/jdk.accessibility
+src/jdk.aot : hotspot/src/jdk.aot
+src/jdk.attach : jdk/src/jdk.attach
+src/jdk.charsets : jdk/src/jdk.charsets
+src/jdk.compiler : jdk/src/jdk.compiler  langtools/src/jdk.compiler
+src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
+src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
+src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
+src/jdk.dynalink : nashorn/src/jdk.dynalink
+src/jdk.editpad : jdk/src/jdk.editpad
+src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
+src/jdk.httpserver : jdk/src/jdk.httpserver
+src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
+src/jdk.internal.ed : jdk/src/jdk.internal.ed
+src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
+src/jdk.internal.le : jdk/src/jdk.internal.le
+src/jdk.internal.opt : jdk/src/jdk.internal.opt
+src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
+src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
+src/jdk.jartool : jdk/src/jdk.jartool
+src/jdk.javadoc : langtools/src/jdk.javadoc
+src/jdk.jcmd : jdk/src/jdk.jcmd
+src/jdk.jconsole : jdk/src/jdk.jconsole
+src/jdk.jdeps : langtools/src/jdk.jdeps
+src/jdk.jdi : jdk/src/jdk.jdi
+src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
+src/jdk.jlink : jdk/src/jdk.jlink
+src/jdk.jshell : langtools/src/jdk.jshell
+src/jdk.jstatd : jdk/src/jdk.jstatd
+src/jdk.localedata : jdk/src/jdk.localedata
+src/jdk.management : jdk/src/jdk.management
+src/jdk.management.agent : jdk/src/jdk.management.agent
+src/jdk.naming.dns : jdk/src/jdk.naming.dns
+src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
+src/jdk.net : jdk/src/jdk.net
+src/jdk.pack : jdk/src/jdk.pack
+src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
+src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
+src/jdk.sctp : jdk/src/jdk.sctp
+src/jdk.security.auth : jdk/src/jdk.security.auth
+src/jdk.security.jgss : jdk/src/jdk.security.jgss
+src/jdk.unsupported : jdk/src/jdk.unsupported
+src/jdk.xml.bind : jaxws/src/jdk.xml.bind
+src/jdk.xml.dom : jaxp/src/jdk.xml.dom
+src/jdk.xml.ws : jaxws/src/jdk.xml.ws
+src/jdk.zipfs : jdk/src/jdk.zipfs
+src/langtools/sample : langtools/src/sample
+src/linux : jdk/src/linux
+src/sample : jdk/src/sample
+src/hotspot/share : hotspot/src/share/vm
+src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
+src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
+src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
+src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
+src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
+src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
+src/hotspot/os/aix : hotspot/src/os/aix/vm
+src/hotspot/os/bsd : hotspot/src/os/bsd/vm
+src/hotspot/os/linux : hotspot/src/os/linux/vm
+src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
+src/hotspot/os/posix : hotspot/src/os/posix/vm
+src/hotspot/os/windows : hotspot/src/os/windows/vm
+src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
+src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
+src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
+src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
+src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
+src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
+src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
+src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
+src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
+src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
+src/hotspot : hotspot/src
+src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
+src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
+src/utils/hsdis : hotspot/src/share/tools/hsdis
+src/utils/reorder : jdk/make/non-build-utils/reorder
+src/utils/src/build : jdk/make/non-build-utils/src/build
+make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
+make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
+make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
+make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
+make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
+make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
+make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
+make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
+make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
+make/ToolsJdk.gmk : jdk/make/Tools.gmk
+make/ToolsLangtools.gmk : langtools/make/Tools.gmk
+make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
+make/autoconf : common/autoconf
+make/conf : common/conf
+make/copy : jdk/make/copy
+make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
+make/corba : corba/make
+make/data : jdk/make/data
+make/gendata : jdk/make/gendata
+make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
+make/gensrc : jdk/make/gensrc
+make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
+make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
+make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
+make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
+make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
+make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
+make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
+make/hotspot : hotspot/make
+make/jdk : jdk/make
+make/langtools : langtools/make
+make/launcher : jdk/make/launcher
+make/lib : jdk/make/lib
+make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+make/mapfiles : jdk/make/mapfiles
+make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
+make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
+make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
+make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
+make/nashorn : nashorn/make
+make/nb_native : common/nb_native
+make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
+make/scripts/compare.sh : common/bin/compare.sh
+make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
+make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
+make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
+make/scripts/logger.sh : common/bin/logger.sh
+make/src/native/fixpath.c : common/src/fixpath.c
+make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
+make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
+test/jdk : jdk/test
+test/langtools : langtools/test
+test/nashorn : nashorn/test
+test/jaxp : jaxp/test
+test/hotspot/gtest : hotspot/test/native
+test/hotspot/jtreg : hotspot/test
+bin : common/bin
+bin/nashorn : nashorn/bin
+doc : common/doc
+doc/nashorn : nashorn/docs

bin/unshuffle_patch.sh

@@ -0,0 +1,237 @@
+#!/bin/bash
+#
+# Copyright (c) 2014, 2017, 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.
+#
+# 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.
+#
+
+# Script for updating a patch file as per the shuffled/unshuffled source location.
+
+usage() {
+  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
+  echo "where:"
+  echo "  -to9            create patches appropriate for a JDK 9 source tree"
+  echo "                  When going to 9, the output patches will be suffixed with the"
+  echo "                  repo name"
+  echo "  -to10           create patches appropriate for a JDK 10 source tree"
+  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
+  echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+  echo "  <output_patch>  is the updated patch file "
+  echo " "
+  exit 1
+}
+
+SCRIPT_DIR=`dirname $0`
+UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
+
+if [ ! -f "$UNSHUFFLE_LIST" ] ; then
+  echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
+  exit 1
+fi
+
+vflag="false"
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -h | --help )
+      usage
+      ;;
+
+    -v | --verbose )
+      vflag="true"
+      ;;
+
+    -r)
+      repo="$2"
+      shift
+      ;;
+
+    -to9)
+      shuffle_to=9
+      ;;
+
+    -to10)
+      shuffle_to=10
+      ;;
+
+    -*)  # bad option
+      usage
+      ;;
+
+    * )  # non option
+      break
+      ;;
+  esac
+  shift
+done
+
+# Make sure we have the right number of arguments
+if [ ! $# -eq 2 ] ; then
+  echo "ERROR: Invalid number of arguments." >&2
+  usage
+fi
+
+# Check the given repo
+repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
+found="false"
+if [ -n "$repo" ]; then
+  for r in $repos ; do
+    if [ $repo = "$r" ] ; then
+      found="true"
+      break;
+    fi
+  done
+  if [ $found = "false" ] ; then
+    echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
+    usage
+  fi
+fi
+
+if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
+  echo "ERROR: Must pick either -to9 or -to10"
+  exit 1
+fi
+
+# When going to 10, a repo must be specified for the source patch
+if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
+  echo "ERROR: Must specify src repo for JDK 9 patch"
+  exit 1
+fi
+
+# Check given input/output files
+input="$1"
+if [ "x$input" = "x-" ] ; then
+  input="/dev/stdin"
+fi
+
+if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
+  echo "ERROR: Cannot find input patch file: $input" >&2
+  exit 1
+fi
+
+output="$2"
+if [ "x$output" = "x-" ] ; then
+  output="/dev/stdout"
+fi
+base_output="$output"
+
+if [ "$shuffle_to" = "10" ]; then
+  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+    echo "ERROR: Output patch already exists: $output" >&2
+    exit 1
+  fi
+else
+  for r in $repos; do
+    if [ -f "$output.$r" ]; then
+      echo "ERROR: Output patch already exists: $output.$r" >&2
+      exit 1
+    fi
+  done
+fi
+
+verbose() {
+  if [ ${vflag} = "true" ] ; then
+    echo "$@" >&2
+  fi
+}
+
+unshuffle() {
+  line=$@
+  verbose "Attempting to rewrite: \"$line\""
+
+  # Retrieve the file name
+  path=
+  if echo "$line" | egrep '^diff' > /dev/null ; then
+    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
+      exit 1
+    fi
+    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
+  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
+    path="`echo "$line" | sed -e s@'--- a/'@@`"
+  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
+    path="`echo "$line" | sed s@'+++ b/'@@`"
+  fi
+  verbose "Extracted path: \"$path\""
+
+  # Find the most specific matches in the shuffle list
+  matches=
+  if [ -n "$repo" -a "$repo" != "top" ]; then
+    matchpath="$repo"/"$path"/x
+  else
+    matchpath="$path"/x
+  fi
+  while [ "$matchpath" != "" ] ; do
+    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
+
+    if [ "$shuffle_to" =  "10" ] ; then
+      pattern=": $matchpath$"
+    else
+      pattern="^$matchpath :"
+    fi
+    verbose "Attempting to find \"$matchpath\""
+    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
+    if ! [ "x${matches}" = "x" ] ; then
+      verbose "Got matches: [$matches]"
+      break;
+    fi
+
+    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
+      break;
+    fi
+  done
+
+  # Rewrite the line, if we have a match
+  if ! [ "x${matches}" = "x" ] ; then
+    shuffled="${matches%% : *}"
+    unshuffled="${matches#* : }"
+    patch_suffix_9=""
+    for r in $repos; do
+      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
+        unshuffled="${unshuffled#$r\/}"
+        patch_suffix_9=".$r"
+      fi
+    done
+    verbose "shuffled: $shuffled"
+    verbose "unshuffled: $unshuffled"
+    verbose "patch_suffix_9: $patch_suffix_9"
+    if [ "$shuffle_to" =  "10" ] ; then
+      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
+    else
+      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+      output=$base_output$patch_suffix_9
+      verbose "Writing to $output"
+    fi
+    verbose "Rewriting to \"$newline\""
+    echo "$newline" >> $output
+  else
+    echo "WARNING: no match found for $path"
+    echo "$line" >> $output
+  fi
+}
+
+while IFS= read -r line
+do
+  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
+    unshuffle "$line"
+  else
+    printf "%s\n" "$line" >> $output
+  fi
+done < "$input"

bin/update_copyright_year.sh

@@ -1,295 +0,0 @@
-#!/bin/bash -f
-
-#
-# Copyright (c) 2010, 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.
-#
-# 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.
-#
-
-# Script to update the Copyright YEAR range in Git sources.
-#  (Originally from xdono, Thanks!)
-
-# To update Copyright years for changes in a specific branch,
-# you use a command along these lines:
-# $ git diff upstream/master...<branch-name> | lsdiff | cut -d '/' -f 2-  | bash bin/update_copyright_year.sh -m -
-
-#------------------------------------------------------------
-copyright="Copyright"
-copyright_symbol="(c)"
-company="Oracle"
-year=`date +%Y`
-#------------------------------------------------------------
-
-awk="awk"
-
-# Stop on any error
-set -e
-
-# To allow total changes counting
-shopt -s lastpipe
-
-# Temp area
-tmp=/tmp/`basename $0`.${USER}.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-total=0
-
-usage="Usage: `basename "$0"` [-c company] [-y year] [-m file] [-h|f]"
-Help()
-{
-  # Display Help
-  echo "Updates the Copyright year range in Git sources."
-  echo
-  echo "By default, the tool limits the processed changesets "
-  echo "to those in the current branch and the current year."
-  echo
-  echo "Note, cancelling the script will skip cleanup in /tmp."
-  echo
-  echo $usage
-  echo "options:"
-  echo "-c     Specifies the company. Set to Oracle by default."
-  echo "-y     Specifies the copyright year. Set to current year by default."
-  echo "-b     Specifies the base reference for change set lookup."
-  echo "-f     Updates the copyright for all change sets in a given year,"
-  echo "       as specified by -y. Overrides -b flag."
-  echo "-m     Read the list of modified files from the given file,"
-  echo "       use - to read from stdin"
-  echo "-h     Print this help."
-  echo
-}
-
-full_year=false
-base_reference=master
-modified_files_origin="";
-
-# Process options
-while getopts "b:c:fhm:y:" option; do
-  case $option in
-    b) # supplied base reference
-      base_reference=${OPTARG}
-      ;;
-    c) # supplied company year
-      company=${OPTARG}
-      ;;
-    f) # update all change sets in a full year
-      full_year=true
-      ;;
-    h) # display help
-      Help
-      exit 0
-      ;;
-    y) # supplied company year
-      year=${OPTARG}
-      ;;
-    m) # modified files will be read from the given origin
-      modified_files_origin="${OPTARG}"
-      ;;
-    \?) # illegal option
-      echo "$usage"
-      exit 1
-      ;;
-  esac
-done
-
-# VCS check
-git_installed=false
-which git > /dev/null && git_installed=true
-if [ "$git_installed" != "true" ]; then
-  echo "Error: This script requires git. Please install it."
-  exit 1
-fi
-git_found=false
-git status &> /dev/null && git_found=true
-if [ "$git_found" != "true" ]; then
-  echo "Error: Please execute script from within a JDK git repository."
-  exit 1
-fi
-
-echo "Using Git version control system"
-
-# Return true if it makes sense to edit this file
-saneFileToCheck()
-{
-  if [ "$1" != "" -a -f $1 ] ; then
-    isText=`file "$1" | grep -i -E '(text|source)' | cat`
-    hasCopyright=`grep 'Copyright' "$1" | cat`
-    lastLineCount=`tail -1 "$1" | wc -l`
-    if [ "${isText}" != ""  \
-         -a "${hasCopyright}" != "" \
-	 -a ${lastLineCount} -eq 1 ] ; then
-      echo "true"
-    else
-      echo "false"
-    fi
-  else
-    echo "false"
-  fi
-}
-
-# Update the copyright year on a file
-updateFile() # file
-{
-  changed="false"
-  if [ `saneFileToCheck "$1"` = "true" ] ; then
-    rm -f $1.OLD
-    mv $1 $1.OLD
-    cat $1.OLD | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9] ${company}@\1 ${year} ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1, ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9]\) ${company}@\1, ${year} ${company}@" | \
-      sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" | \
-      sed -e "s@${copyright} ${copyright_symbol} ${year}, ${year}, ${company}@${copyright} ${copyright_symbol} ${year}, ${company}@"  \
-      > $1
-    if ! diff -b -w $1.OLD $1 > /dev/null ; then \
-      changed="true"
-      rm -f $1.OLD
-    else
-      rm -f $1
-      mv $1.OLD $1
-    fi
-  fi
-  echo "${changed}"
-}
-
-# Update the copyright year on files sent in stdin
-updateFiles() # stdin: list of files to update
-{
-  count=0
-  fcount=0
-  while read i; do
-    fcount=`expr ${fcount} '+' 1`
-    if [ `updateFile "${i}"` = "true" ] ; then
-      count=`expr ${count} '+' 1`
-    fi
-  done
-  if [ ${count} -gt 0 ] ; then
-    printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
-    total=`expr ${total} '+' ${count}`
-   else
-    printf "  None of the %d files were changed.\n" ${fcount}
-  fi
-}
-
-# Update the copyright year on all files changed by this changeset
-updateChangesetFiles() # changeset
-{
-  count=0
-  files=${tmp}/files.$1
-  rm -f ${files}
-  "${vcs_changeset_files[@]}" "$1" | expand \
-    | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
-    > ${files}
-  if [ -f "${files}" -a -s "${files}" ] ; then
-    cat ${files} | updateFiles
-  else
-    printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
-    set -x
-    ls -al ${files}
-    "${vcs_changeset_files[@]}" "$1"
-    "${vcs_changeset_files[@]}" "$1" | expand \
-      | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}'
-    set +x
-    exit 1
-  fi
-  rm -f ${files}
-}
-
-# Check if repository is clean
-vcs_status=(git ls-files -m)
-previous=`"${vcs_status[@]}"|wc -l`
-if [ ${previous} -ne 0 ] ; then
-  echo "WARNING: This repository contains previously edited working set files."
-  echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-fi
-
-if [ "x$modified_files_origin" != "x" ]; then
-  cat $modified_files_origin | updateFiles
-else
-  # Get all changesets this year
-  if [ "$full_year" = "true" ]; then
-    vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  else
-    vcs_list_changesets=(git log --no-merges "${base_reference}..HEAD" --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  fi
-  vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
-  vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
-
-  all_changesets=${tmp}/all_changesets
-  rm -f ${all_changesets}
-  "${vcs_list_changesets[@]}" > ${all_changesets}
-
-  # Check changeset to see if it is Copyright only changes, filter changesets
-  if [ -s ${all_changesets} ] ; then
-    echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
-    index=0
-    cat ${all_changesets} | while read changeset ; do
-      index=`expr ${index} '+' 1`
-      desc=${tmp}/desc.${changeset}
-      rm -f ${desc}
-      echo "------------------------------------------------"
-      "${vcs_changeset_message[@]}" "${changeset}" > ${desc}
-      printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-      if [ "${year}" = "2010" ] ; then
-        if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-          printf "  EXCLUDED tag changeset.\n"
-        elif cat ${desc} | grep -i -F rebrand > /dev/null ; then
-          printf "  EXCLUDED rebrand changeset.\n"
-        elif cat ${desc} | grep -i -F copyright > /dev/null ; then
-          printf "  EXCLUDED copyright changeset.\n"
-        else
-          updateChangesetFiles ${changeset}
-        fi
-      else
-        if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-          printf "  EXCLUDED tag changeset.\n"
-        elif cat ${desc} | grep -i -F "copyright year" > /dev/null ; then
-          printf "  EXCLUDED copyright year changeset.\n"
-        else
-          updateChangesetFiles ${changeset}
-        fi
-      fi
-      rm -f ${desc}
-    done
-  fi
-
-  if [ ${total} -gt 0 ] ; then
-     echo "---------------------------------------------"
-     echo "Updated the copyright year on a total of ${total} files."
-     if [ ${previous} -eq 0 ] ; then
-       echo "This count should match the count of modified files in the repository: ${vcs_status[*]}"
-     else
-       echo "WARNING: This repository contained previously edited working set files."
-     fi
-     echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-  else
-     echo "---------------------------------------------"
-     echo "No files were changed"
-     if [ ${previous} -ne 0 ] ; then
-       echo "WARNING: This repository contained previously edited working set files."
-     fi
-     echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-  fi
-fi
-
-# Cleanup
-rm -f -r ${tmp}
-exit 0

doc/building.html

@@ -394,11 +394,11 @@ to date at the time of writing.</p>
 <tbody>
 <tr class="odd">
 <td>Linux/x64</td>
-<td>Oracle Linux 6.4 / 8.x</td>
+<td>Oracle Enterprise Linux 6.4 / 8.x</td>
 </tr>
 <tr class="even">
 <td>Linux/aarch64</td>
-<td>Oracle Linux 7.6 / 8.x</td>
+<td>Oracle Enterprise Linux 7.6 / 8.x</td>
 </tr>
 <tr class="odd">
 <td>macOS</td>
@@ -541,11 +541,6 @@ href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
 <p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.</p>
-<p>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
-<code>xcodebuild -downloadComponent MetalToolchain</code>.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -673,7 +668,7 @@ update.</p>
 (Note that this version is often presented as "MSVC 14.28", and reported
 by cl.exe as 19.28.) Older versions will not be accepted by
 <code>configure</code> and will not work. The maximum accepted version
-of Visual Studio is 2026.</p>
+of Visual Studio is 2022.</p>
 <p>If you have multiple versions of Visual Studio installed,
 <code>configure</code> will by default pick the latest. You can request
 a specific version to be used by setting
@@ -1385,9 +1380,10 @@ dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre></li>
 can specify it by <code>--with-alsa</code>.</p></li>
 </ul>
 <h4 id="x11-1">X11</h4>
-<p>When not building a headless JDK, you will need X11 libraries
-suitable for your <em>target</em> system. In most cases, using Debian's
-pre-built libraries work fine.</p>
+<p>You will need X11 libraries suitable for your <em>target</em> system.
+In most cases, using Debian's pre-built libraries work fine.</p>
+<p>Note that X11 is needed even if you only want to build a headless
+JDK.</p>
 <ul>
 <li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian
 Package Search</a>, search for the following packages for your
@@ -1495,24 +1491,26 @@ following targets are known to work:</p>
 </tr>
 </tbody>
 </table>
-<p><code>BASE_OS</code> must be one of <code>OL</code> for Oracle Linux
-or <code>Fedora</code>. The release/version of the base OS can be
-specified using the <code>BASE_OS_VERSION</code> option. If the build is
-successful, the new devkits can be found in the
+<p><code>BASE_OS</code> must be one of <code>OL</code> for Oracle
+Enterprise Linux or <code>Fedora</code>. If the base OS is
+<code>Fedora</code> the corresponding Fedora release can be specified
+with the help of the <code>BASE_OS_VERSION</code> option. If the build
+is successful, the new devkits can be found in the
 <code>build/devkit/result</code> subdirectory:</p>
 <pre><code>cd make/devkit
-make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora
+make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora BASE_OS_VERSION=21
 ls -1 ../../build/devkit/result/
 x86_64-linux-gnu-to-aarch64-linux-gnu
 x86_64-linux-gnu-to-ppc64le-linux-gnu</code></pre>
 <p>Notice that devkits are not only useful for targeting different build
 platforms. Because they contain the full build dependencies for a system
-(i.e., compiler and root file system/sysroot), they can easily be used
-to build well-known, reliable, and reproducible build environments. You
-can, for example, create and use a devkit with a version of the GCC
-compiler not provided by the host OS, using a sysroot from an older
-Linux distribution to produce JDK binaries which will run on all Linux
-systems with newer runtime libraries.</p>
+(i.e. compiler and root file system), they can easily be used to build
+well-known, reliable and reproducible build environments. You can for
+example create and use a devkit with GCC 7.3 and a Fedora 12 sysroot
+environment (with glibc 2.11) on Ubuntu 14.04 (which doesn't have GCC
+7.3 by default) to produce JDK binaries which will run on all Linux
+systems with runtime libraries newer than the ones from Fedora 12 (e.g.
+Ubuntu 16.04, SLES 11 or RHEL 6).</p>
 <h4 id="using-debian-debootstrap">Using Debian debootstrap</h4>
 <p>On Debian (or a derivative like Ubuntu), you can create sysroots for
 foreign architectures with tools provided by the OS. You can use

doc/building.md

@@ -195,8 +195,8 @@ time of writing.
 
 | Operating system  | Vendor/version used                |
 | ----------------- | ---------------------------------- |
-| Linux/x64         | Oracle Linux 6.4 / 8.x             |
-| Linux/aarch64     | Oracle Linux 7.6 / 8.x             |
+| Linux/x64         | Oracle Enterprise Linux 6.4 / 8.x  |
+| Linux/aarch64     | Oracle Enterprise Linux 7.6 / 8.x  |
 | macOS             | macOS 14.x                         |
 | Windows           | Windows Server 2016                |
 
@@ -352,11 +352,6 @@ on some strategies to deal with this.
 It is recommended that you use at least macOS 14 and Xcode 15.4, but
 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`.
-
 The standard macOS environment contains the basic tooling needed to build, but
 for external libraries a package manager is recommended. The JDK uses
 [homebrew](https://brew.sh/) in the examples, but feel free to use whatever
@@ -473,7 +468,7 @@ available for this update.
 The minimum accepted version is Visual Studio 2019 version 16.8. (Note that
 this version is often presented as "MSVC 14.28", and reported by cl.exe as
 19.28.) Older versions will not be accepted by `configure` and will not work.
-The maximum accepted version of Visual Studio is 2026.
+The maximum accepted version of Visual Studio is 2022.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
@@ -1178,8 +1173,10 @@ Note that alsa is needed even if you only want to build a headless JDK.
 
 #### X11
 
-When not building a headless JDK, you will need X11 libraries suitable for your
-*target* system. In most cases, using Debian's pre-built libraries work fine.
+You will need X11 libraries suitable for your *target* system. In most cases,
+using Debian's pre-built libraries work fine.
+
+Note that X11 is needed even if you only want to build a headless JDK.
 
 * Go to [Debian Package Search](https://www.debian.org/distrib/packages),
   search for the following packages for your *target* system, and download them
@@ -1288,26 +1285,27 @@ at least the following targets are known to work:
 | riscv64-linux-gnu        |
 | s390x-linux-gnu          |
 
-`BASE_OS` must be one of `OL` for Oracle Linux or `Fedora`. The release/version
-of the base OS can be specified using the `BASE_OS_VERSION` option. If the build
-is successful, the new devkits can be found in the `build/devkit/result`
-subdirectory:
+`BASE_OS` must be one of `OL` for Oracle Enterprise Linux or `Fedora`. If the
+base OS is `Fedora` the corresponding Fedora release can be specified with the
+help of the `BASE_OS_VERSION` option. If the build is successful, the new
+devkits can be found in the `build/devkit/result` subdirectory:
 
 ```
 cd make/devkit
-make TARGETS="ppc64le-linux-gnu aarch64-linux-gnu" BASE_OS=Fedora
+make TARGETS="ppc64le-linux-gnu aarch64-linux-gnu" BASE_OS=Fedora BASE_OS_VERSION=21
 ls -1 ../../build/devkit/result/
 x86_64-linux-gnu-to-aarch64-linux-gnu
 x86_64-linux-gnu-to-ppc64le-linux-gnu
 ```
 
 Notice that devkits are not only useful for targeting different build
-platforms. Because they contain the full build dependencies for a system (i.e.,
-compiler and root file system/sysroot), they can easily be used to build
-well-known, reliable, and reproducible build environments. You can, for example,
-create and use a devkit with a version of the GCC compiler not provided by the
-host OS, using a sysroot from an older Linux distribution to produce JDK
-binaries which will run on all Linux systems with newer runtime libraries.
+platforms. Because they contain the full build dependencies for a system (i.e.
+compiler and root file system), they can easily be used to build well-known,
+reliable and reproducible build environments. You can for example create and
+use a devkit with GCC 7.3 and a Fedora 12 sysroot environment (with glibc 2.11)
+on Ubuntu 14.04 (which doesn't have GCC 7.3 by default) to produce JDK binaries
+which will run on all Linux systems with runtime libraries newer than the ones
+from Fedora 12 (e.g. Ubuntu 16.04, SLES 11 or RHEL 6).
 
 #### Using Debian debootstrap
 

doc/hotspot-style.html

@@ -75,9 +75,6 @@ Standard Library</a></li>
 Deduction</a></li>
 <li><a href="#expression-sfinae" id="toc-expression-sfinae">Expression
 SFINAE</a></li>
-<li><a href="#trailing-return-type-syntax-for-functions"
-id="toc-trailing-return-type-syntax-for-functions">Trailing return type
-syntax for functions</a></li>
 <li><a href="#non-type-template-parameter-values"
 id="toc-non-type-template-parameter-values">Non-type template parameter
 values</a></li>
@@ -86,9 +83,8 @@ values</a></li>
 <li><a href="#thread_local" id="toc-thread_local">thread_local</a></li>
 <li><a href="#nullptr" id="toc-nullptr">nullptr</a></li>
 <li><a href="#atomic" id="toc-atomic">&lt;atomic&gt;</a></li>
-<li><a href="#variable-templates-and-inline-variables"
-id="toc-variable-templates-and-inline-variables">Variable Templates and
-Inline Variables</a></li>
+<li><a href="#inline-variables" id="toc-inline-variables">Inline
+Variables</a></li>
 <li><a href="#initializing-variables-with-static-storage-duration"
 id="toc-initializing-variables-with-static-storage-duration">Initializing
 variables with static storage duration</a></li>
@@ -114,7 +110,7 @@ id="toc-compatibility-with-c11">Compatibility with C11</a></li>
 id="toc-additional-permitted-features">Additional Permitted
 Features</a></li>
 </ul></li>
-<li><a href="#forbidden-features" id="toc-forbidden-features">Forbidden
+<li><a href="#excluded-features" id="toc-excluded-features">Excluded
 Features</a>
 <ul>
 <li><a href="#structured-bindings"
@@ -123,8 +119,8 @@ id="toc-structured-bindings">Structured Bindings</a></li>
 System Library</a></li>
 <li><a href="#aggregate-extensions"
 id="toc-aggregate-extensions">Aggregate Extensions</a></li>
-<li><a href="#additional-forbidden-features"
-id="toc-additional-forbidden-features">Additional Forbidden
+<li><a href="#additional-excluded-features"
+id="toc-additional-excluded-features">Additional Excluded
 Features</a></li>
 </ul></li>
 <li><a href="#undecided-features" id="toc-undecided-features">Undecided
@@ -506,19 +502,19 @@ uses a subset. (Backports to JDK versions lacking support for more
 recent Standards must of course stick with the original C++98/03
 subset.)</p>
 <p>This section describes that subset. Features from the C++98/03
-language may be used unless explicitly forbidden here. Features from
+language may be used unless explicitly excluded here. Features from
 C++11, C++14, and C++17 may be explicitly permitted or explicitly
-forbidden, and discussed accordingly here. There is a third category,
+excluded, and discussed accordingly here. There is a third category,
 undecided features, about which HotSpot developers have not yet reached
 a consensus, or perhaps have not discussed at all. Use of these features
-is also forbidden.</p>
+is also excluded.</p>
 <p>(The use of some features may not be immediately obvious and may slip
 in anyway, since the compiler will accept them. The code review process
 is the main defense against this.)</p>
 <p>Some features are discussed in their own subsection, typically to
 provide more extensive discussion or rationale for limitations. Features
 that don't have their own subsection are listed in omnibus feature
-sections for permitted, forbidden, and undecided features.</p>
+sections for permitted, excluded, and undecided features.</p>
 <p>Lists of new features for C++11, C++14, and C++17, along with links
 to their descriptions, can be found in the online documentation for some
 of the compilers and libraries. The C++17 Standard is the definitive
@@ -594,15 +590,14 @@ title="Runtime Type Information">RTTI</a> are deemed not worthwhile,
 given the alternatives.</p>
 <h3 id="memory-allocation">Memory Allocation</h3>
 <p>Do not use the standard global allocation and deallocation functions
-(global <code>operator new</code> and related functions), other than the
-non-allocating forms of those functions. Use of these functions by
-HotSpot code is disabled for some platforms.</p>
+(operator new and related functions). Use of these functions by HotSpot
+code is disabled for some platforms.</p>
 <p>Rationale: HotSpot often uses "resource" or "arena" allocation. Even
 where heap allocation is used, the standard global functions are avoided
-in favor of wrappers around <code>malloc</code> and <code>free</code>
-that support the JVM's Native Memory Tracking (NMT) feature. Typically,
-uses of the global <code>operator new</code> are inadvertent and
-therefore often associated with memory leaks.</p>
+in favor of wrappers around malloc and free that support the VM's Native
+Memory Tracking (NMT) feature. Typically, uses of the global operator
+new are inadvertent and therefore often associated with memory
+leaks.</p>
 <p>Native memory allocation failures are often treated as
 non-recoverable. The place where "out of memory" is (first) detected may
 be an innocent bystander, unrelated to the actual culprit.</p>
@@ -649,39 +644,7 @@ for anonymous namespaces.</p>
 class="uri">https://sourceware.org/bugzilla/show_bug.cgi?id=16874</a><br>
 Bug for similar gdb problems.</p>
 <h3 id="c-standard-library">C++ Standard Library</h3>
-<p>Only curated parts of the C++ Standard Library may be used by HotSpot
-code.</p>
-<p>Functions that may throw exceptions must not be used. This is in
-accordance with the HotSpot policy of <a href="#error-handling">not
-using exceptions</a>.</p>
-<p>Also in accordance with HotSpot policy, the <a
-href="#memory-allocation">standard global allocator must not be
-used</a>. This means that uses of standard container classes cannot
-presently be used, as doing so requires specialization on some allocator
-type that is integrated with the existing HotSpot allocation mechanisms.
-(Such allocators may be provided in the future.)</p>
-<p>Standard Library identifiers should usually be fully qualified;
-<code>using</code> directives must not be used to bring Standard Library
-identifiers into scope just to remove the need for namespace
-qualification. Requiring qualification makes it easy to distinguish
-between references to external libraries and code that is part of
-HotSpot.</p>
-<p>As with language features, Standard Library facilities are either
-permitted, explicitly forbidden, or undecided (and so implicitly
-forbidden).</p>
-<p>Most HotSpot code should not directly <code>#include</code> C++
-Standard Library headers. HotSpot provides a set of wrapper headers for
-the Standard Library headers containing permitted definitions. These
-wrappers are in the <code>cppstdlib</code> directory, with the same name
-as the corresponding Standard Library header and a <code>.hpp</code>
-extension. These wrappers provide a place for any additional code (some
-of which may be platform-specific) needed to support HotSpot usage.</p>
-<p>These wrappers also provide a place to document HotSpot usage,
-including any restrictions. The set of wrappers and the usage
-documentation should be considered part of HotSpot style. Any changes
-are subject to the same process as applies to this document. (For
-historical reasons, there may be many direct inclusions of some C++
-Standard Library headers.)</p>
+<p>Avoid using the C++ Standard Library.</p>
 <p>Historically, HotSpot has mostly avoided use of the Standard
 Library.</p>
 <p>(It used to be impossible to use most of it in shared code, because
@@ -694,60 +657,46 @@ in mid-2017. Support for Solaris was removed in 2020.)</p>
 of Standard Library facilities is exceptions. HotSpot does not use
 exceptions and, for platforms which allow doing so, builds with them
 turned off. Many Standard Library facilities implicitly or explicitly
-use exceptions. On the other hand, many don't, and can be used without
-concern for this issue. Others may have a useful subset that doesn't use
-exceptions.</p></li>
+use exceptions.</p></li>
 <li><p><code>assert</code>. An issue that is quickly encountered is the
 <code>assert</code> macro name collision (<a
 href="https://bugs.openjdk.org/browse/JDK-8007770">JDK-8007770</a>).
-(Not all Standard Library implementations use <code>assert</code> in
-header files, but some do.) HotSpot provides a mechanism for addressing
-this, by establishing a scope around the include of a library header
-where the HotSpot <code>assert</code> macro is suppressed. One of the
-reasons for using wrapper headers rather than directly including
-standard headers is to provide a central place to deal with this issue
-for each header.</p></li>
+Some mechanism for addressing this would be needed before much of the
+Standard Library could be used. (Not all Standard Library
+implementations use assert in header files, but some do.)</p></li>
 <li><p>Memory allocation. HotSpot requires explicit control over where
 allocations occur. The C++98/03 <code>std::allocator</code> class is too
-limited to support our usage. But changes to the allocator concept in
-more recent Standards removed some of the limitations, supporting
-stateful allocators. HotSpot may, in the future, provide
-standard-conforming allocators that are integrated with HotSpot's
-existing allocation mechanisms.</p></li>
+limited to support our usage. (Changes in more recent Standards may
+remove this limitation.)</p></li>
 <li><p>Implementation vagaries. Bugs, or simply different implementation
 choices, can lead to different behaviors among the various Standard
-Libraries we need to deal with. But only selected parts of the Standard
-Library are being permitted, and one of the selection criteria is
-maturity. Some of these facilities are among the most heavily tested and
-used C++ codes that exist.</p></li>
+Libraries we need to deal with.</p></li>
 <li><p>Inconsistent naming conventions. HotSpot and the C++ Standard use
 different naming conventions. The coexistence of those different
-conventions might appear jarring and reduce readability. However,
-experience in some other code bases suggests this isn't a significant
-problem, so long as Standard Library names are namespace-qualified. It
-is tempting to bring the Standard Library names into scope via a
-<code>using std;</code> directive. Doing so makes writing code using
-those names easier, since the qualifiers don't need to be included. But
-there are several reasons not to do that.</p>
-<ul>
-<li><p>There is a risk of future name collisions. Additional Standard
-Library headers may be included, adding to the list of names being used.
-Also, future versions of the Standard Library may add currently unknown
-names to the headers already being included.</p></li>
-<li><p>It may harm readability. Code where this is relevant is a mixture
-of the local HotSpot naming conventions and the Standard Library's (or
-other 3rd-party library's) naming conventions. With only unqualified
-names, any distinctions from the naming conventions for the different
-code sources are lost. Instead one may end up with an undifferentiated
-mess, where it's not obvious whether an identifier is from local code
-that is inconsistent with HotSpot style (and there's a regretable amount
-of that for historical reasons), or is following some other convention.
-Having the qualifiers disambiguates that.</p></li>
-<li><p>It can be helpful to know, at a glance, whether the definition is
-in HotSpot or elsewhere, for purposes of looking up the definition or
-documentation.</p></li>
-</ul></li>
+conventions might appear jarring and reduce readability.</p></li>
 </ul>
+<p>There are a few exceptions to this rule.</p>
+<ul>
+<li><code>#include &lt;new&gt;</code> to use placement <code>new</code>,
+<code>std::nothrow</code>, and <code>std::nothrow_t</code>.</li>
+<li><code>#include &lt;limits&gt;</code> to use
+<code>std::numeric_limits</code>.</li>
+<li><code>#include &lt;type_traits&gt;</code> with some restrictions,
+listed below.</li>
+<li><code>#include &lt;cstddef&gt;</code> to use
+<code>std::nullptr_t</code> and <code>std::max_align_t</code>.</li>
+</ul>
+<p>Certain restrictions apply to the declarations provided by
+<code>&lt;type_traits&gt;</code>.</p>
+<ul>
+<li>The <code>alignof</code> operator should be used rather than
+<code>std::alignment_of&lt;&gt;</code>.</li>
+</ul>
+<p>TODO: Rather than directly #including (permitted) Standard Library
+headers, use a convention of #including wrapper headers (in some
+location like hotspot/shared/stdcpp). This provides a single place for
+dealing with issues we might have for any given header, esp.
+platform-specific issues.</p>
 <h3 id="type-deduction">Type Deduction</h3>
 <p>Use type deduction only if it makes the code clearer or safer. Do not
 use it merely to avoid the inconvenience of writing an explicit type,
@@ -770,14 +719,11 @@ href="http://wg21.link/p0127r2">p0127r2</a>)<br> <code>auto</code> may
 be used as a placeholder for the type of a non-type template parameter.
 The type is deduced from the value provided in a template
 instantiation.</p></li>
-</ul>
-<p><a name="function-return-type-deduction"></a> * Function return type
-deduction (<a
+<li><p>Function return type deduction (<a
 href="https://isocpp.org/files/papers/N3638.html">n3638</a>)<br> Only
 use if the function body has a very small number of <code>return</code>
-statements, and generally relatively little other code.</p>
-<ul>
-<li>Class template argument deduction (<a
+statements, and generally relatively little other code.</p></li>
+<li><p>Class template argument deduction (<a
 href="http://wg21.link/n3602">n3602</a>, <a
 href="http://wg21.link/p0091r3">p0091r3</a>)<br> The template arguments
 of a class template may be deduced from the arguments to a constructor.
@@ -790,7 +736,7 @@ harder to understand, because explicit type information is lacking. But
 it can also remove the need to be explicit about types that are either
 obvious, or that are very hard to write. For example, these allow the
 addition of a scope-guard mechanism with nice syntax; something like
-this</li>
+this</p></li>
 </ul>
 <pre><code>  ScopeGuard guard{[&amp;]{ ... cleanup code ... }};</code></pre>
 <ul>
@@ -825,44 +771,6 @@ class="uri">https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468</a><br>
 <a
 href="https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html"
 class="uri">https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html</a></p>
-<h3 id="trailing-return-type-syntax-for-functions">Trailing return type
-syntax for functions</h3>
-<p>A function's return type may be specified after the parameters and
-qualifiers (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</a>).
-In such a declaration the normal return type is <code>auto</code> and
-the return type is indicated by <code>-&gt;</code> followed by the type.
-Although both use <code>auto</code> in the "normal" leading return type
-position, this differs from <a
-href="#function-return-type-deduction">function return type
-deduction</a>, in that the return type is explicit rather than deduced,
-but specified in a trailing position.</p>
-<p>Use of trailing return types is permitted. However, the normal,
-leading position for the return type is preferred. A trailing return
-type should only be used where it provides some benefit. Such benefits
-usually arise because a trailing return type is in a different scope
-than a leading return type.</p>
-<ul>
-<li><p>If the function identifier is a nested name specifier, then the
-trailing return type occurs in the nested scope. This may permit simpler
-naming in the return type because of the different name lookup
-context.</p></li>
-<li><p>The trailing return type is in the scope of the parameters,
-making their types accessible via <code>decltype</code>. For
-example</p></li>
-</ul>
-<pre><code>template&lt;typename T, typename U&gt; auto add(T t, U u) -&gt; decltype(t + u);</code></pre>
-<p>rather than</p>
-<pre><code>template&lt;typename T, typename U&gt; decltype((*(T*)0) + (*(U*)0)) add(T t, U u);</code></pre>
-<ul>
-<li>Complex calculated leading return types may obscure the normal
-syntactic boundaries, making it more difficult for a reader to find the
-function name and parameters. This is particularly common in cases where
-the return type is being used for <a
-href="https://en.cppreference.com/w/cpp/language/sfinae"
-title="Substitution Failure Is Not An Error">SFINAE</a>. A trailing
-return type may be preferable in such situations.</li>
-</ul>
 <h3 id="non-type-template-parameter-values">Non-type template parameter
 values</h3>
 <p>C++17 extended the arguments permitted for non-type template
@@ -965,8 +873,9 @@ rather than <code>NULL</code>. See the paper for reasons to avoid
 <code>NULL</code>.</p>
 <p>Don't use (constant expression or literal) 0 for pointers. Note that
 C++14 removed non-literal 0 constants from <em>null pointer
-constants</em>, though some compilers continue to treat them as
-such.</p>
+constants</em>, though some compilers continue to treat them as such.
+For historical reasons there may be lingering uses of 0 as a
+pointer.</p>
 <h3 id="atomic">&lt;atomic&gt;</h3>
 <p>Do not use facilities provided by the <code>&lt;atomic&gt;</code>
 header (<a
@@ -984,18 +893,12 @@ differ from what the Java compilers implement.</p>
 "conservative" memory ordering, which may differ from (may be stronger
 than) sequentially consistent. There are algorithms in HotSpot that are
 believed to rely on that ordering.</p>
-<h3 id="variable-templates-and-inline-variables">Variable Templates and
-Inline Variables</h3>
-<p>The use of variable templates (including static data member
-templates) (<a href="https://wg21.link/N3651">N3651</a>) is permitted.
-They provide parameterized variables and constants in a simple and
-direct form, instead of requiring the use of various workarounds.</p>
-<p>Variables with static storage duration and variable templates may be
-declared <code>inline</code> (<a
-href="https://wg21.link/p0386r2">p0386r2</a>), and this usage is
-permitted. This has similar effects as for declaring a function inline:
-it can be defined, identically, in multiple translation units, must be
-defined in every translation unit in which it is <a
+<h3 id="inline-variables">Inline Variables</h3>
+<p>Variables with static storage duration may be declared
+<code>inline</code> (<a href="https://wg21.link/p0386r2">p0386r2</a>).
+This has similar effects as for declaring a function inline: it can be
+defined, identically, in multiple translation units, must be defined in
+every translation unit in which it is <a
 href="https://en.cppreference.com/w/cpp/language/definition"
 title="One Definition Rule">ODR used</a>, and the behavior of the
 program is as if there is exactly one variable.</p>
@@ -1008,17 +911,16 @@ initializations can make initialization order problems worse. The few
 ordering constraints that exist for non-inline variables don't apply, as
 there isn't a single program-designated translation unit containing the
 definition.</p>
-<p>A <code>constexpr</code> static data member or static data member
-template is implicitly <code>inline</code>. As a consequence, an <a
+<p>A <code>constexpr</code> static data member is implicitly
+<code>inline</code>. As a consequence, an <a
 href="https://en.cppreference.com/w/cpp/language/definition"
-title="One Definition Rule">ODR use</a> of such a member doesn't require
-a definition in some .cpp file. (This is a change from pre-C++17.
-Beginning with C++17, such a definition is considered a duplicate
-definition, and is deprecated.)</p>
-<p>Declaring a <code>thread_local</code> variable template or
-<code>inline</code> variable is forbidden in HotSpot code. <a
-href="#thread_local">The use of <code>thread_local</code></a> is already
-heavily restricted.</p>
+title="One Definition Rule">ODR use</a> of such a variable doesn't
+require a definition in some .cpp file. (This is a change from
+pre-C++17. Beginning with C++17, such a definition is considered a
+duplicate definition, and is deprecated.)</p>
+<p>Declaring a <code>thread_local</code> variable <code>inline</code> is
+forbidden for HotSpot code. <a href="#thread_local">The use of
+<code>thread_local</code></a> is already heavily restricted.</p>
 <h3
 id="initializing-variables-with-static-storage-duration">Initializing
 variables with static storage duration</h3>
@@ -1036,8 +938,8 @@ running destructors at exit can lead to problems.</p>
 <p>Some of the approaches used in HotSpot to avoid dynamic
 initialization include:</p>
 <ul>
-<li><p>Use the <code>DeferredStatic&lt;T&gt;</code> class template. Add
-a call to its initialization function at an appropriate place during VM
+<li><p>Use the <code>Deferred&lt;T&gt;</code> class template. Add a call
+to its initialization function at an appropriate place during VM
 initialization. The underlying object is never destroyed.</p></li>
 <li><p>For objects of class type, use a variable whose value is a
 pointer to the class, initialized to <code>nullptr</code>. Provide an
@@ -1623,10 +1525,10 @@ href="http://wg21.link/p0138r2">p0138r2</a>)</p></li>
 <li><p>Allow <code>typename</code> in template template parameter (<a
 href="http://wg21.link/n4051">n4051</a>) — template template parameters
 are barely used (if at all) in HotSpot, but there's no reason to
-artificially forbid this syntactic regularization in any such
+artificially disallow this syntactic regularization in any such
 uses.</p></li>
 </ul>
-<h2 id="forbidden-features">Forbidden Features</h2>
+<h2 id="excluded-features">Excluded Features</h2>
 <h3 id="structured-bindings">Structured Bindings</h3>
 <p>The use of structured bindings <a
 href="http://wg21.link/p0217r3">p0217r3</a> is forbidden. Preferred
@@ -1668,33 +1570,8 @@ initialization for classes with base classes (<a
 href="https://wg21.link/p0017r1">p0017r1</a>). HotSpot makes very little
 use of aggregate classes, preferring explicit constructors even for very
 simple classes.</p>
-<h3 id="additional-forbidden-features">Additional Forbidden
-Features</h3>
+<h3 id="additional-excluded-features">Additional Excluded Features</h3>
 <ul>
-<li><p><code>&lt;algorithm&gt;</code>, <code>&lt;iterator&gt;</code>,
-<code>&lt;numeric&gt;</code><br> Not useful without standard containers
-or similar classes in HotSpot.</p></li>
-<li><p><code>&lt;bitset&gt;</code> - Overlap with HotSpot
-<code>BitMap</code>.</p></li>
-<li><p><code>&lt;cassert&gt;</code>, <code>assert.h</code> - HotSpot has
-its own <code>assert</code> macro.</p></li>
-<li><p><code>&lt;exception&gt;</code>, <code>&lt;stdexcept&gt;</code> -
-Use of <a href="#error-handling">exceptions</a> is not
-permitted.</p></li>
-<li><p>Thread support - <code>&lt;thread&gt;</code>,
-<code>&lt;mutex&gt;</code>, <code>&lt;shared_mutex&gt;</code>,
-<code>&lt;condition_varible&gt;</code>, <code>&lt;future&gt;</code><br>
-HotSpot has its own threading support.</p></li>
-<li><p>Streams - HotSpot doesn't use the C++ I/O library.</p></li>
-<li><p><code>&lt;scoped_allocator&gt;</code> - Not useful without
-specialized allocators.</p></li>
-<li><p><code>&lt;string&gt;</code> - Requires allocator support, similar
-to standard containers.</p></li>
-<li><p><code>&lt;typeinfo&gt;</code>, <code>&lt;typeindex&gt;</code><br>
-Use of <a href="#runtime-type-information">runtime type information</a>
-is not permitted.</p></li>
-<li><p><code>&lt;valarray&gt;</code> - May allocate, but is not
-allocator-aware.</p></li>
 <li><p>New string and character literals</p>
 <ul>
 <li>New character types (<a
@@ -1930,6 +1807,11 @@ difference.</p>
 <h3 id="additional-undecided-features">Additional Undecided
 Features</h3>
 <ul>
+<li><p>Trailing return type syntax for functions (<a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</a>)</p></li>
+<li><p>Variable templates (<a
+href="https://isocpp.org/files/papers/N3651.pdf">n3651</a>, <a
+href="http://wg21.link/p0127r2">p0127r2</a>)</p></li>
 <li><p>Member initializers and aggregates (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html">n3653</a>)</p></li>
 <li><p>Rvalue references and move semantics</p></li>
@@ -1952,43 +1834,8 @@ that developers should need to know about this feature. But if someone
 does come up with a good use-case, it's likely that the alternatives are
 significantly worse, because pack manipulation without this can be
 complicated.</p></li>
-<li><p><a
-href="https://en.cppreference.com/w/cpp/header/tuple.html"><code>&lt;tuple&gt;</code></a>
-— Prefer named access to class objects, rather than indexed access to
-anonymous heterogeneous sequences. In particular, a standard-layout
-class is preferred to a tuple.</p></li>
 <li><p><code>std::invoke&lt;&gt;()</code> (<a
 href="http://wg21.link/n4169">n4169</a>)</p></li>
-<li><p><a
-href="https://en.cppreference.com/w/cpp/header/chrono.html"><code>&lt;chrono&gt;</code></a>
-— The argument for chrono is that our existing APIs aren't serving us
-well. chrono provides strong type safety. We've had multiple cases of
-mistakes like a double seconds being treated as double milliseconds or
-vice versa, and other similar errors. But it would be a large effort to
-adopt chrono. We'd also need to decide whether to use the predefined
-clocks or hook up chrono to our clocks. It may be that using the
-predefined clocks is fine, but it's a question that needs careful
-study.</p></li>
-<li><p><a
-href="https://en.cppreference.com/w/cpp/header/initializer_list.html"><code>&lt;initializer_list&gt;</code></a>
-— The potential ambiguity between some forms of direct initialization
-and initializer list initialization, and the resolution of that
-ambiguity, is unfortunate.</p></li>
-<li><p><a
-href="https://en.cppreference.com/w/cpp/header/ratio.html"><code>&lt;ratio&gt;</code></a>
-— <code>&lt;ratio&gt;</code> is a <em>compile-time</em> rational
-arithmetic package. It's also fixed (though parameterized) precision.
-It's not a general purpose rational arithmetic facility. It appears to
-have started out as an implementation detail of chrono, and was
-extracted and promoted to a public facility in the belief that it has
-broader utility.</p></li>
-<li><p><a
-href="https://en.cppreference.com/w/cpp/header/system_error.html"><code>&lt;system_error&gt;</code></a>
-— We don't really have a generally agreed upon mechanism for managing
-errors. Instead, we have a plethora of bespoke ad hoc mechanisms.
-Managing errors is a topic of substantial discussion.
-<code>&lt;system_error&gt;</code> might end up being a part of a result
-from that discussion.</p></li>
 </ul>
 </body>
 </html>

doc/hotspot-style.md

@@ -413,12 +413,12 @@ support for more recent Standards must of course stick with the
 original C++98/03 subset.)
 
 This section describes that subset.  Features from the C++98/03
-language may be used unless explicitly forbidden here.  Features from
-C++11, C++14, and C++17 may be explicitly permitted or explicitly forbidden,
+language may be used unless explicitly excluded here.  Features from
+C++11, C++14, and C++17 may be explicitly permitted or explicitly excluded,
 and discussed accordingly here.  There is a third category, undecided
 features, about which HotSpot developers have not yet reached a
 consensus, or perhaps have not discussed at all.  Use of these
-features is also forbidden.
+features is also excluded.
 
 (The use of some features may not be immediately obvious and may slip
 in anyway, since the compiler will accept them.  The code review
@@ -427,7 +427,7 @@ process is the main defense against this.)
 Some features are discussed in their own subsection, typically to provide
 more extensive discussion or rationale for limitations.  Features that
 don't have their own subsection are listed in omnibus feature sections
-for permitted, forbidden, and undecided features.
+for permitted, excluded, and undecided features.
 
 Lists of new features for C++11, C++14, and C++17, along with links to their
 descriptions, can be found in the online documentation for some of the
@@ -494,16 +494,15 @@ worthwhile, given the alternatives.
 
 ### Memory Allocation
 
-Do not use the standard global allocation and deallocation functions (global
-`operator new` and related functions), other than the non-allocating forms of
-those functions.  Use of these functions by HotSpot code is disabled for some
-platforms.
+Do not use the standard global allocation and deallocation functions
+(operator new and related functions).  Use of these functions by HotSpot
+code is disabled for some platforms.
 
 Rationale: HotSpot often uses "resource" or "arena" allocation.  Even
 where heap allocation is used, the standard global functions are
-avoided in favor of wrappers around `malloc` and `free` that support the
-JVM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
-`operator new` are inadvertent and therefore often associated with memory
+avoided in favor of wrappers around malloc and free that support the
+VM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
+operator new are inadvertent and therefore often associated with memory
 leaks.
 
 Native memory allocation failures are often treated as non-recoverable.
@@ -561,39 +560,7 @@ Bug for similar gdb problems.
 
 ### C++ Standard Library
 
-Only curated parts of the C++ Standard Library may be used by HotSpot code.
-
-Functions that may throw exceptions must not be used.  This is in accordance
-with the HotSpot policy of [not using exceptions](#error-handling).
-
-Also in accordance with HotSpot policy, the
-[standard global allocator must not be used](#memory-allocation).  This means
-that uses of standard container classes cannot presently be used, as doing so
-requires specialization on some allocator type that is integrated with the
-existing HotSpot allocation mechanisms. (Such allocators may be provided in
-the future.)
-
-Standard Library identifiers should usually be fully qualified; `using`
-directives must not be used to bring Standard Library identifiers into scope
-just to remove the need for namespace qualification.  Requiring qualification
-makes it easy to distinguish between references to external libraries and code
-that is part of HotSpot.
-
-As with language features, Standard Library facilities are either permitted,
-explicitly forbidden, or undecided (and so implicitly forbidden).
-
-Most HotSpot code should not directly `#include` C++ Standard Library headers.
-HotSpot provides a set of wrapper headers for the Standard Library headers
-containing permitted definitions.  These wrappers are in the `cppstdlib`
-directory, with the same name as the corresponding Standard Library header and
-a `.hpp` extension.  These wrappers provide a place for any additional code
-(some of which may be platform-specific) needed to support HotSpot usage.
-
-These wrappers also provide a place to document HotSpot usage, including any
-restrictions.  The set of wrappers and the usage documentation should be
-considered part of HotSpot style.  Any changes are subject to the same process
-as applies to this document. (For historical reasons, there may be many direct
-inclusions of some C++ Standard Library headers.)
+Avoid using the C++ Standard Library.
 
 Historically, HotSpot has mostly avoided use of the Standard
 Library.
@@ -610,59 +577,43 @@ Some reasons for this include
 Standard Library facilities is exceptions. HotSpot does not use
 exceptions and, for platforms which allow doing so, builds with them
 turned off.  Many Standard Library facilities implicitly or explicitly
-use exceptions. On the other hand, many don't, and can be used without
-concern for this issue. Others may have a useful subset that doesn't
 use exceptions.
 
 * `assert`.  An issue that is quickly encountered is the `assert` macro name
 collision ([JDK-8007770](https://bugs.openjdk.org/browse/JDK-8007770)).
-(Not all Standard Library implementations use `assert` in header files, but
-some  do.) HotSpot provides a mechanism for addressing this, by establishing a
-scope around the include of a library header where the HotSpot `assert` macro
-is suppressed.  One of the reasons for using wrapper headers rather than
-directly including standard headers is to provide a central place to deal with
-this issue for each header.
+Some mechanism for addressing this would be needed before much of the
+Standard Library could be used.  (Not all Standard Library implementations
+use assert in header files, but some do.)
 
-* Memory allocation. HotSpot requires explicit control over where allocations
-occur. The C++98/03 `std::allocator` class is too limited to support our
-usage. But changes to the allocator concept in more recent Standards removed
-some of the limitations, supporting stateful allocators. HotSpot may, in the
-future, provide standard-conforming allocators that are integrated with
-HotSpot's existing allocation mechanisms.
+* Memory allocation. HotSpot requires explicit control over where
+allocations occur. The C++98/03 `std::allocator` class is too limited
+to support our usage.  (Changes in more recent Standards may remove
+this limitation.)
 
 * Implementation vagaries. Bugs, or simply different implementation choices,
 can lead to different behaviors among the various Standard Libraries we need
-to deal with. But only selected parts of the Standard Library are being
-permitted, and one of the selection criteria is maturity. Some of these
-facilities are among the most heavily tested and used C++ codes that exist.
+to deal with.
 
-* Inconsistent naming conventions. HotSpot and the C++ Standard use different
-naming conventions. The coexistence of those different conventions might
-appear jarring and reduce readability. However, experience in some other code
-bases suggests this isn't a significant problem, so long as Standard Library
-names are namespace-qualified. It is tempting to bring the Standard Library
-names into scope via a `using std;` directive. Doing so makes writing code
-using those names easier, since the qualifiers don't need to be included. But
-there are several reasons not to do that.
+* Inconsistent naming conventions. HotSpot and the C++ Standard use
+different naming conventions. The coexistence of those different conventions
+might appear jarring and reduce readability.
 
-    * There is a risk of future name collisions. Additional Standard Library
-    headers may be included, adding to the list of names being used. Also,
-    future versions of the Standard Library may add currently unknown names to
-    the headers already being included.
+There are a few exceptions to this rule.
 
-    * It may harm readability. Code where this is relevant is a mixture of the
-    local HotSpot naming conventions and the Standard Library's (or other
-    3rd-party library's) naming conventions. With only unqualified names, any
-    distinctions from the naming conventions for the different code sources
-    are lost. Instead one may end up with an undifferentiated mess, where it's
-    not obvious whether an identifier is from local code that is inconsistent
-    with HotSpot style (and there's a regretable amount of that for historical
-    reasons), or is following some other convention. Having the qualifiers
-    disambiguates that.
+* `#include <new>` to use placement `new`, `std::nothrow`, and `std::nothrow_t`.
+* `#include <limits>` to use `std::numeric_limits`.
+* `#include <type_traits>` with some restrictions, listed below.
+* `#include <cstddef>` to use `std::nullptr_t` and `std::max_align_t`.
 
-    * It can be helpful to know, at a glance, whether the definition is in
-    HotSpot or elsewhere, for purposes of looking up the definition or
-    documentation.
+Certain restrictions apply to the declarations provided by `<type_traits>`.
+
+* The `alignof` operator should be used rather than `std::alignment_of<>`.
+
+TODO: Rather than directly \#including (permitted) Standard Library
+headers, use a convention of \#including wrapper headers (in some
+location like hotspot/shared/stdcpp).  This provides a single place
+for dealing with issues we might have for any given header, esp.
+platform-specific issues.
 
 ### Type Deduction
 
@@ -691,7 +642,6 @@ use can make code much harder to understand.
 parameter. The type is deduced from the value provided in a template
 instantiation.
 
-<a name="function-return-type-deduction"></a>
 * Function return type deduction
 ([n3638](https://isocpp.org/files/papers/N3638.html))<br>
 Only use if the function body has a very small number of `return`
@@ -741,42 +691,6 @@ Here are a few closely related example bugs:<br>
 <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468><br>
 <https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html>
 
-### Trailing return type syntax for functions
-
-A function's return type may be specified after the parameters and qualifiers
-([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm)).
-In such a declaration the normal return type is `auto` and the return type is
-indicated by `->` followed by the type.  Although both use `auto` in the
-"normal" leading return type position, this differs from
-[function return type deduction](#function-return-type-deduction),
-in that the return type is explicit rather than deduced, but specified in a
-trailing position.
-
-Use of trailing return types is permitted.  However, the normal, leading
-position for the return type is preferred. A trailing return type should only
-be used where it provides some benefit. Such benefits usually arise because a
-trailing return type is in a different scope than a leading return type.
-
-* If the function identifier is a nested name specifier, then the trailing
-return type occurs in the nested scope. This may permit simpler naming in the
-return type because of the different name lookup context.
-
-* The trailing return type is in the scope of the parameters, making their
-types accessible via `decltype`. For example
-```
-template<typename T, typename U> auto add(T t, U u) -> decltype(t + u);
-```
-rather than
-```
-template<typename T, typename U> decltype((*(T*)0) + (*(U*)0)) add(T t, U u);
-```
-
-* Complex calculated leading return types may obscure the normal syntactic
-boundaries, making it more difficult for a reader to find the function name and
-parameters. This is particularly common in cases where the return type is
-being used for [SFINAE]. A trailing return type may be preferable in such
-situations.
-
 ### Non-type template parameter values
 
 C++17 extended the arguments permitted for non-type template parameters
@@ -884,7 +798,8 @@ rather than `NULL`.  See the paper for reasons to avoid `NULL`.
 
 Don't use (constant expression or literal) 0 for pointers.  Note that C++14
 removed non-literal 0 constants from _null pointer constants_, though some
-compilers continue to treat them as such.
+compilers continue to treat them as such.  For historical reasons there may be
+lingering uses of 0 as a pointer.
 
 ### &lt;atomic&gt;
 
@@ -904,19 +819,14 @@ ordering, which may differ from (may be stronger than) sequentially
 consistent.  There are algorithms in HotSpot that are believed to rely
 on that ordering.
 
-### Variable Templates and Inline Variables
+### Inline Variables
 
-The use of variable templates (including static data member templates)
-([N3651](https://wg21.link/N3651)) is permitted. They provide parameterized
-variables and constants in a simple and direct form, instead of requiring the
-use of various workarounds.
-
-Variables with static storage duration and variable templates may be declared
-`inline` ([p0386r2](https://wg21.link/p0386r2)), and this usage is
-permitted. This has similar effects as for declaring a function inline: it can
-be defined, identically, in multiple translation units, must be defined in
-every translation unit in which it is [ODR used][ODR], and the behavior of the
-program is as if there is exactly one variable.
+Variables with static storage duration may be declared `inline`
+([p0386r2](https://wg21.link/p0386r2)). This has similar effects as for
+declaring a function inline: it can be defined, identically, in multiple
+translation units, must be defined in every translation unit in which it is
+[ODR used][ODR], and the behavior of the program is as if there is exactly one
+variable.
 
 Declaring a variable inline allows the complete definition to be in a header
 file, rather than having a declaration in a header and the definition in a
@@ -927,15 +837,13 @@ make initialization order problems worse. The few ordering constraints
 that exist for non-inline variables don't apply, as there isn't a single
 program-designated translation unit containing the definition.
 
-A `constexpr` static data member or static data member template
-is implicitly `inline`. As a consequence, an
-[ODR use][ODR] of such a member doesn't require a definition in some .cpp
+A `constexpr` static data member is implicitly `inline`. As a consequence, an
+[ODR use][ODR] of such a variable doesn't require a definition in some .cpp
 file. (This is a change from pre-C++17. Beginning with C++17, such a
 definition is considered a duplicate definition, and is deprecated.)
 
-Declaring a `thread_local` variable template or `inline` variable is forbidden
-in HotSpot code.  [The use of `thread_local`](#thread_local) is already
-heavily restricted.
+Declaring a `thread_local` variable `inline` is forbidden for HotSpot code.
+[The use of `thread_local`](#thread_local) is already heavily restricted.
 
 ### Initializing variables with static storage duration
 
@@ -953,7 +861,7 @@ destructors at exit can lead to problems.
 Some of the approaches used in HotSpot to avoid dynamic initialization
 include:
 
-* Use the `DeferredStatic<T>` class template. Add a call to its initialization
+* Use the `Deferred<T>` class template. Add a call to its initialization
 function at an appropriate place during VM initialization. The underlying
 object is never destroyed.
 
@@ -1577,9 +1485,9 @@ single-argument form are permitted.
 * Allow `typename` in template template parameter
 ([n4051](http://wg21.link/n4051)) &mdash; template template parameters are
 barely used (if at all) in HotSpot, but there's no reason to artificially
-forbid this syntactic regularization in any such uses.
+disallow this syntactic regularization in any such uses.
 
-## Forbidden Features
+## Excluded Features
 
 ### Structured Bindings
 
@@ -1629,32 +1537,7 @@ initialization for classes with base classes
 aggregate classes, preferring explicit constructors even for very simple
 classes.
 
-### Additional Forbidden Features
-
-* `<algorithm>`, `<iterator>`, `<numeric>`<br>
-Not useful without standard containers or similar classes in HotSpot.
-
-* `<bitset>` - Overlap with HotSpot `BitMap`.
-
-* `<cassert>`, `assert.h` - HotSpot has its own `assert` macro.
-
-* `<exception>`, `<stdexcept>` - Use of [exceptions](#error-handling) is not
-permitted.
-
-* Thread support - `<thread>`, `<mutex>`, `<shared_mutex>`,
-`<condition_varible>`, `<future>`<br>
-HotSpot has its own threading support.
-
-* Streams - HotSpot doesn't use the C++ I/O library.
-
-* `<scoped_allocator>` - Not useful without specialized allocators.
-
-* `<string>` - Requires allocator support, similar to standard containers.
-
-* `<typeinfo>`, `<typeindex>`<br>
-Use of [runtime type information](#runtime-type-information) is not permitted.
-
-* `<valarray>` - May allocate, but is not allocator-aware.
+### Additional Excluded Features
 
 * New string and character literals
     * New character types
@@ -1926,6 +1809,13 @@ See Object Lifetime: C++17 6.8/8, C++20 6.7.3/8
 
 ### Additional Undecided Features
 
+* Trailing return type syntax for functions
+([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm))
+
+* Variable templates
+([n3651](https://isocpp.org/files/papers/N3651.pdf),
+[p0127r2](http://wg21.link/p0127r2))
+
 * Member initializers and aggregates
 ([n3653](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html))
 
@@ -1953,40 +1843,9 @@ should need to know about this feature.  But if someone does come up with a
 good use-case, it's likely that the alternatives are significantly worse,
 because pack manipulation without this can be complicated.
 
-* [`<tuple>`](https://en.cppreference.com/w/cpp/header/tuple.html) &mdash;
-Prefer named access to class objects, rather than indexed access
-to anonymous heterogeneous sequences.  In particular, a standard-layout
-class is preferred to a tuple.
-
 * `std::invoke<>()`
 ([n4169](http://wg21.link/n4169))
 
-* [`<chrono>`](https://en.cppreference.com/w/cpp/header/chrono.html) &mdash;
-The argument for chrono is that our existing APIs aren't serving us well.
-chrono provides strong type safety. We've had multiple cases of mistakes like
-a double seconds being treated as double milliseconds or vice versa, and other
-similar errors. But it would be a large effort to adopt chrono. We'd also need
-to decide whether to use the predefined clocks or hook up chrono to our
-clocks. It may be that using the predefined clocks is fine, but it's a
-question that needs careful study.
-
-* [`<initializer_list>`](https://en.cppreference.com/w/cpp/header/initializer_list.html) &mdash;
-The potential ambiguity between some forms of direct initialization and
-initializer list initialization, and the resolution of that ambiguity, is
-unfortunate.
-
-* [`<ratio>`](https://en.cppreference.com/w/cpp/header/ratio.html) &mdash;
-`<ratio>` is a *compile-time* rational arithmetic package. It's also fixed
-(though parameterized) precision. It's not a general purpose rational
-arithmetic facility. It appears to have started out as an implementation
-detail of chrono, and was extracted and promoted to a public facility in the
-belief that it has broader utility.
-
-* [`<system_error>`](https://en.cppreference.com/w/cpp/header/system_error.html) &mdash;
-We don't really have a generally agreed upon mechanism for managing
-errors. Instead, we have a plethora of bespoke ad hoc mechanisms. Managing
-errors is a topic of substantial discussion. `<system_error>` might end up
-being a part of a result from that discussion.
 
 
 [ADL]: https://en.cppreference.com/w/cpp/language/adl

doc/hotspot-unit-tests.html

@@ -305,11 +305,11 @@ recognize your tests.</p>
 the product.</p>
 <ul>
 <li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code>
-should be placed <code>foo/bar/test_baz.cpp</code> in the
-<code>test/hotspot/gtest/</code> directory. Having all tests for a class
-in one file is a common practice for unit tests, it helps to see all
-existing tests at once, share functions and/or resources without losing
-encapsulation.</p></li>
+should be placed <code>foo/bar/test_baz.cpp</code> in
+<code>hotspot/test/native/</code> directory. Having all tests for a
+class in one file is a common practice for unit tests, it helps to see
+all existing tests at once, share functions and/or resources without
+losing encapsulation.</p></li>
 <li><p>For tests which test more than one class, directory hierarchy
 should be the same as product hierarchy, and file name should reflect
 the name of the tested subsystem/functionality. For example, if a
@@ -319,7 +319,7 @@ placed in <code>gc/g1</code> directory.</p></li>
 <p>Please note that framework prepends directory name to a test group
 name. For example, if <code>TEST(foo, check_this)</code> and
 <code>TEST(bar, check_that)</code> are defined in
-<code>test/hotspot/gtest/gc/shared/test_foo.cpp</code> file, they will
+<code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will
 be reported as <code>gc/shared/foo::check_this</code> and
 <code>gc/shared/bar::check_that</code>.</p>
 <h3 id="test-names">Test names</h3>

doc/hotspot-unit-tests.md

@@ -241,7 +241,7 @@ recognize your tests.
 Test file location should reflect a location of the tested part of the product.
 
 * All unit tests for a class from `foo/bar/baz.cpp` should be placed
-`foo/bar/test_baz.cpp` in the `test/hotspot/gtest/` directory. Having all
+`foo/bar/test_baz.cpp` in `hotspot/test/native/` directory. Having all
 tests for a class in one file is a common practice for unit tests, it
 helps to see all existing tests at once, share functions and/or
 resources without losing encapsulation.
@@ -254,7 +254,7 @@ sub-system under tests belongs to `gc/g1`, tests should be placed in
 
 Please note that framework prepends directory name to a test group
 name. For example, if `TEST(foo, check_this)` and `TEST(bar, check_that)`
-are defined in `test/hotspot/gtest/gc/shared/test_foo.cpp` file, they
+are defined in `hotspot/test/native/gc/shared/test_foo.cpp` file, they
 will be reported as `gc/shared/foo::check_this` and
 `gc/shared/bar::check_that`.
 

doc/starting-next-release.html

@@ -119,9 +119,6 @@ cover the new source version</li>
 and
 <code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
 update expected messages for preview errors and warnings</li>
-<li><code>test/langtools/tools/javac/versions/Versions.java</code>: add
-new source version to the set of valid sources and add new enum constant
-for the new class file version.</li>
 </ul>
 </body>
 </html>

doc/starting-next-release.md

@@ -65,4 +65,4 @@ to be updated for a particular release.
 * `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
    update annotation processor extended by `javac` tests to cover the new source version
 * `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
-* `test/langtools/tools/javac/versions/Versions.java`: add new source version to the set of valid sources and add new enum constant for the new class file version.
+

doc/testing.html

@@ -72,7 +72,6 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
-<li><a href="#sctp-tests" id="toc-sctp-tests">SCTP Tests</a></li>
 <li><a href="#testing-ahead-of-time-optimizations"
 id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</a></li>
@@ -284,10 +283,9 @@ possible, or if you want to use a fully qualified test descriptor, add
 <h3 id="gtest">Gtest</h3>
 <p><strong>Note:</strong> To be able to run the Gtest suite, you need to
 configure your build to be able to find a proper version of the gtest
-source. For details, see the section <strong>"Running Tests" in the
-build documentation</strong> (<a
-href="building.html#running-tests">html</a>, <a
-href="building.md#running-tests">markdown</a>).</p>
+source. For details, see the section <a
+href="building.html#running-tests">"Running Tests" in the build
+documentation</a>.</p>
 <p>Since the Hotspot Gtest suite is so quick, the default is to run all
 tests. This is specified by just <code>gtest</code>, or as a fully
 qualified test descriptor <code>gtest:all</code>.</p>
@@ -452,7 +450,7 @@ itself (<code>-timeoutFactor</code>). Also, some test cases that
 programmatically wait a certain amount of time will apply this factor.
 If we run in forced compilation mode (<code>-Xcomp</code>), the build
 system will automatically adjust this factor to compensate for less
-performance. Defaults to 4.</p>
+performance. Defaults to 1.</p>
 <h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
 <p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
 default value is 0. This is only valid if the failure handler is
@@ -465,44 +463,6 @@ class, named Virtual, is currently part of the JDK build in the
 <code>test/jtreg_test_thread_factory/</code> directory. This class gets
 compiled during the test image build. The implementation of the Virtual
 class creates a new virtual thread for executing each test class.</p>
-<h4 id="value_class_plugin">VALUE_CLASS_PLUGIN</h4>
-<p>Enables the <code>ValueClassPlugin</code> javac plugin when compiling
-and running JTReg tests. This is a <strong>temporary mode</strong>
-intended for use while value classes (JEP 401) are a preview feature.
-The long-term plan is to replace classes annotated with
-<code>@jdk.test.lib.valueclass.AsValueClass</code> with plain
-<code>value class</code> declarations once value classes are
-finalized.</p>
-<p>In the meantime, this mode allows test sources to compile and run as
-either value classes or regular identity classes without source-level
-changes.</p>
-<p>When set to any non-empty value, the following options are appended to
-every JTReg invocation:</p>
-<ul>
-<li><code>-cpa:&lt;valueClassPlugin.jar&gt;</code> — appends the plugin
-JAR to the compile-time classpath (only when the JAR is present in the
-test image under
-<code>jtreg_value_class_plugin/valueClassPlugin.jar</code>).</li>
-<li><code>-vmoption:--enable-preview</code> — enables JVM preview
-features at runtime.</li>
-<li><code>-javacoption:-XDaccessInternalAPI</code> — grants the compiler
-access to internal APIs required by the plugin.</li>
-<li><code>-javacoption:--source &lt;version&gt; --enable-preview</code>
-— enables preview language features at compile time.</li>
-<li><code>-javacoption:-Xplugin:ValueClassPlugin</code> — activates the
-plugin.</li>
-</ul>
-<p>The plugin scans each compilation unit after parsing and converts any
-class annotated with
-<code>@jdk.test.lib.valueclass.AsValueClass</code> into a value class by
-setting the internal <code>VALUE_CLASS</code> modifier flag and clearing
-the <code>IDENTITY_TYPE</code> flag. This transformation only takes
-effect when <code>--enable-preview</code> is active; without it the
-annotation is a no-op and the class compiles as an ordinary identity
-class, so the same test source can exercise both code paths.</p>
-<p>Example:</p>
-<pre><code>$ make test TEST=jdk_lang JTREG="VALUE_CLASS_PLUGIN=true"
-</code></pre>
 <h4 id="jvmti_stress_agent">JVMTI_STRESS_AGENT</h4>
 <p>Executes JTReg tests with JVM TI stress agent. The stress agent is
 the part of test library and located in
@@ -575,8 +535,6 @@ failure. This helps to reproduce intermittent test failures. Defaults to
 <h4 id="report">REPORT</h4>
 <p>Use this report style when reporting test results (sent to JTReg as
 <code>-report</code>). Defaults to <code>files</code>.</p>
-<h4 id="manual">MANUAL</h4>
-<p>Set to <code>true</code> to execute manual tests only.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests
@@ -661,21 +619,6 @@ element of the appropriate <code>@Artifact</code> class. (See
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
-<h3 id="sctp-tests">SCTP Tests</h3>
-<p>The SCTP tests require the SCTP runtime library, which is often not
-installed by default in popular Linux distributions. Without this
-library, the SCTP tests will be skipped. If you want to enable the SCTP
-tests, you should install the SCTP library before running the tests.</p>
-<p>For distributions using the .deb packaging format and the apt tool
-(such as Debian, Ubuntu, etc.), try this:</p>
-<pre><code>sudo apt install libsctp1
-sudo modprobe sctp
-lsmod | grep sctp</code></pre>
-<p>For distributions using the .rpm packaging format and the dnf tool
-(such as Fedora, Red Hat, etc.), try this:</p>
-<pre><code>sudo dnf install -y lksctp-tools
-sudo modprobe sctp
-lsmod | grep sctp</code></pre>
 <h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</h3>
 <p>One way to improve test coverage of ahead-of-time (AOT) optimizations

doc/testing.md

@@ -198,8 +198,8 @@ use a fully qualified test descriptor, add `jtreg:`, e.g.
 
 **Note:** To be able to run the Gtest suite, you need to configure your build
 to be able to find a proper version of the gtest source. For details, see the
-section **"Running Tests" in the build
-documentation** ([html](building.html#running-tests), [markdown](building.md#running-tests)).
+section ["Running Tests" in the build
+documentation](building.html#running-tests).
 
 Since the Hotspot Gtest suite is so quick, the default is to run all tests.
 This is specified by just `gtest`, or as a fully qualified test descriptor
@@ -387,7 +387,7 @@ The `TIMEOUT_FACTOR` is forwarded to JTReg framework itself
 (`-timeoutFactor`). Also, some test cases that programmatically wait a
 certain amount of time will apply this factor. If we run in forced
 compilation mode (`-Xcomp`), the build system will automatically
-adjust this factor to compensate for less performance. Defaults to 4.
+adjust this factor to compensate for less performance. Defaults to 1.
 
 #### FAILURE_HANDLER_TIMEOUT
 
@@ -403,42 +403,6 @@ the `test/jtreg_test_thread_factory/` directory. This class gets compiled
 during the test image build. The implementation of the Virtual class creates a
 new virtual thread for executing each test class.
 
-#### VALUE_CLASS_PLUGIN
-
-Enables the `ValueClassPlugin` javac plugin when compiling and running JTReg
-tests. This is a **temporary mode** intended for use while value classes
-(JEP 401) are a preview feature. The long-term plan is to replace classes
-annotated with `@jdk.test.lib.valueclass.AsValueClass` with plain
-`value class` declarations once value classes are finalized.
-
-In the meantime, this mode allows test sources to compile and run as either
-value classes or regular identity classes without source-level changes.
-
-When set to any non-empty value, the following options are appended to every
-JTReg invocation:
-
-* `-cpa:<valueClassPlugin.jar>` — appends the plugin JAR to the compile-time
-  classpath (only when the JAR is present in the test image under
-  `jtreg_value_class_plugin/valueClassPlugin.jar`).
-* `-vmoption:--enable-preview` — enables JVM preview features at runtime.
-* `-javacoption:-XDaccessInternalAPI` — grants the compiler access to internal
-  APIs required by the plugin.
-* `-javacoption:--source <version> --enable-preview` — enables preview language
-  features at compile time.
-* `-javacoption:-Xplugin:ValueClassPlugin` — activates the plugin.
-
-The plugin scans each compilation unit after parsing and converts any class
-annotated with `@jdk.test.lib.valueclass.AsValueClass` into a value class by
-setting the internal `VALUE_CLASS` modifier flag and clearing the
-`IDENTITY_TYPE` flag. This transformation only takes effect when
-`--enable-preview` is active; without it the annotation is a no-op and the
-class compiles as an ordinary identity class, so the same test source can
-exercise both code paths.
-
-Example:
-
-    $ make test TEST=jdk_lang JTREG="VALUE_CLASS_PLUGIN=true"
-
 #### JVMTI_STRESS_AGENT
 
 Executes JTReg tests with JVM TI stress agent. The stress agent is the part of
@@ -548,10 +512,6 @@ helps to reproduce intermittent test failures. Defaults to 0.
 Use this report style when reporting test results (sent to JTReg as `-report`).
 Defaults to `files`.
 
-#### MANUAL
-
-Set to `true` to execute manual tests only.
-
 ### Gtest keywords
 
 #### REPEAT
@@ -676,32 +636,6 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
-
-### SCTP Tests
-
-The SCTP tests require the SCTP runtime library, which is often not installed
-by default in popular Linux distributions. Without this library, the SCTP tests
-will be skipped. If you want to enable the SCTP tests, you should install the
-SCTP library before running the tests.
-
-For distributions using the .deb packaging format and the apt tool
-(such as Debian, Ubuntu, etc.), try this:
-
-```
-sudo apt install libsctp1
-sudo modprobe sctp
-lsmod | grep sctp
-```
-
-For distributions using the .rpm packaging format and the dnf tool
-(such as Fedora, Red Hat, etc.), try this:
-
-```
-sudo dnf install -y lksctp-tools
-sudo modprobe sctp
-lsmod | grep sctp
-```
-
 ### Testing Ahead-of-time Optimizations
 
 One way to improve test coverage of ahead-of-time (AOT) optimizations in

doc/value-class-preview.html

@@ -1,188 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Migration of JDK Classes to Value Classes</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    div.columns{display: flex; gap: min(4vw, 1.5em);}
-    div.column{flex: auto; overflow-x: auto;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
-    ul.task-list li input[type="checkbox"] {
-      width: 0.8em;
-      margin: 0 0.8em 0.2em -1.6em;
-      vertical-align: middle;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">Migration of JDK Classes to Value Classes</h1>
-</header>
-<nav id="TOC" role="doc-toc">
-<ul>
-<li><a href="#introduction" id="toc-introduction">Introduction</a></li>
-<li><a href="#the-build-process" id="toc-the-build-process">The Build
-Process</a>
-<ul>
-<li><a href="#the-custom-handling-for-the-value-objects-jep"
-id="toc-the-custom-handling-for-the-value-objects-jep">The Custom
-Handling for the Value Objects JEP</a></li>
-<li><a href="#the-general-preview-source-to-binary-pipeline"
-id="toc-the-general-preview-source-to-binary-pipeline">The General
-Preview Source to Binary Pipeline</a></li>
-<li><a href="#non-goals" id="toc-non-goals">Non-Goals</a></li>
-</ul></li>
-<li><a href="#testing" id="toc-testing">Testing</a></li>
-<li><a href="#wrapper-class-caches"
-id="toc-wrapper-class-caches">Wrapper Class Caches</a></li>
-<li><a href="#editing-this-document"
-id="toc-editing-this-document">Editing This Document</a></li>
-</ul>
-</nav>
-<h2 id="introduction">Introduction</h2>
-<p>The Value Objects feature introduces value objects and migrates
-suitable classes to value classes. This means that when preview features
-are enabled, different class files are used for the migrated classes in
-the Java class library.</p>
-<p>To accomplish this, a built JDK uses <em>preview-specific</em> files
-in <code>META-INF/preview</code>, which overrides the regular files of
-the same name. For example,
-<code>META-INF/preview/java/lang/Integer.class</code> overrides
-<code>java/lang/Integer.class</code>.</p>
-<p>The JDK generates preview-specific source files (they may use preview
-language features), compiles class files from them, and distributes
-these class files in <code>META-INF/preview</code>.</p>
-<h2 id="the-build-process">The Build Process</h2>
-<h3 id="the-custom-handling-for-the-value-objects-jep">The Custom
-Handling for the Value Objects JEP</h3>
-<p>The Value Objects JEP requires a few select classes in the
-<code>java.base</code> module to become value classes when preview
-features are enabled.</p>
-<p>The build of <code>java.base</code> module first creates the source
-code of those value classes, done in <a
-href="../make/modules/java.base/gensrc/GensrcValueClasses.gmk"><code>GensrcValueClasses.gmk</code></a>.</p>
-<ol type="1">
-<li><p>A hardcoded list of regular source files are selected for
-preview-specific generation.</p></li>
-<li><p>Extract the content of each regular source file, search for any
-occurrences of <code>/*value*/ class</code> or
-<code>/*value*/ record</code>, and replace with <code>value class</code>
-or <code>value record</code>.</p></li>
-<li><p>The replaced contents are written to the preview-specific
-generated files, located in
-<code>support/gensrc-valueclasses/java.base/</code>. The regular source
-files remain unchanged in their original locations.</p></li>
-<li><p>The general preview source to binary build pipeline recognizes
-the <code>support/gensrc-valueclasses/java.base/</code> directory as
-where the <code>java.base</code> module places its preview-specific
-source files.</p></li>
-</ol>
-<h3 id="the-general-preview-source-to-binary-pipeline">The General
-Preview Source to Binary Pipeline</h3>
-<p>Once the preview-specific source files are ready, they are picked up
-by the build system into a fully automated pipeline handling all modules
-and all outcome images.</p>
-<ol type="1">
-<li><p>The <code>GENERATED_PREVIEW_SUBDIRS</code> variable in <a
-href="../make/common/Modules.gmk"><code>make/common/Modules.gmk</code></a>
-indicates where the source files are found.</p></li>
-<li><p>For each module that has preview-specific source files, a goal is
-created to compile these source files into class files.</p></li>
-<li><p>The class files from each of these tasks reside in
-<code>support/preview/&lt;module&gt;</code> for each module.</p></li>
-<li><p>These preview-specific class files and other resources are copied
-to the <code>META-INF/preview</code> directory of the regular output
-directory.</p></li>
-<li><p>At run-time, jimage will pick up the preview-specific overrides
-from <code>META-INF/preview</code> only when preview features are
-enabled.</p></li>
-<li><p>The interim javac used by the build system cannot pick up the
-preview-specific overrides; they must be supplied explicitly with the
-following javac flag for every single module where overrides are
-significant:</p>
-<pre><code>--patch-module &lt;module&gt;=$(SUPPORT_OUTPUTDIR)/preview/&lt;module&gt;</code></pre>
-<p>See <a
-href="../make/test/BuildMicrobenchmark.gmk"><code>BuildMicroBenchmarks.gmk</code></a>
-for an example.</p></li>
-</ol>
-<h3 id="non-goals">Non-Goals</h3>
-<p>The Value Objects JEP only plans to introduce value classes that
-are:</p>
-<ol type="1">
-<li><p>In the <code>java.base</code> module.</p>
-<p>There's no plan to migrate other classes in other modules.</p></li>
-<li><p>Migrated from existing classes.</p>
-<p>These classes are available as identity classes when preview features
-are disabled. There's no plan to introduce completely new value
-classes.</p></li>
-</ol>
-<p>Support for other value classes would require significant changes to
-the build system.</p>
-<h2 id="testing">Testing</h2>
-<p>In addition to tests that require preview features to be enabled,
-tests that do not depend on preview features wish to run with preview
-features enabled to ensure compatibility:</p>
-<ol type="1">
-<li><p>Some tests wish to run against the Java SE class library with
-value classes.</p>
-<p>The jtreg tests may be run with
-<code>JTREG=VM_OPTIONS=--enable-preview</code>.</p></li>
-<li><p>Some tests wish to run against their own classes migrated to
-value classes.</p>
-<p>The jtreg <a
-href="testing.html#VALUE_CLASS_PLUGIN">VALUE_CLASS_PLUGIN</a> allows
-tests to migrate their own classes to value classes when running with
-the plugin.</p></li>
-</ol>
-<h2 id="wrapper-class-caches">Wrapper Class Caches</h2>
-<p>Currently, wrapper class caches are retained even when preview
-features are enabled to address performance losses. They have no
-semantic impact to value objects.</p>
-<p>In interpreter or C1 execution in Hotspot, allocations of a value
-object to the heap as a full object with header happen when a value
-object is:</p>
-<ol type="1">
-<li>Loaded from a flat storage (field or array)</li>
-<li>Created by a constructor</li>
-<li>If C2 uses scalarized calling convention, at C2 to C1/interpreter
-calls and returns</li>
-</ol>
-<p>Ideally, C2 can eliminate such allocations, but this does not work if
-the resulting object is stored into references. Unfortunately, many uses
-of boxing conversions store the resulting wrapper objects as
-references.</p>
-<p>For the uses that store wrapper objects to references, if the boxing
-conversion is:</p>
-<ol type="1">
-<li>Returning a value object from a flat cache array</li>
-<li>Calling the value class constructor</li>
-</ol>
-<p>Then we would have heap allocation on every single use.</p>
-<p>To avoid the allocations, we fall back to returning a value object
-from a reference cache array, from which the loaded reference is
-directly storable into a destination that wants a reference without any
-allocation.</p>
-<p>Since Hotspot may create flat arrays if an array of value objects is
-requested by regular Java array creation mechanisms, we use
-<code>ValueClass.newReferenceArray</code> to ensure we always create a
-reference cache array.</p>
-<p>The cache array for value objects may be removed without notice if
-the performance losses from allocations are no longer significant.</p>
-<h2 id="editing-this-document">Editing This Document</h2>
-<p>If you want to contribute changes to this document, edit
-<code>doc/value-class-preview.md</code> and then run
-<code>make update-build-docs</code> to generate the same changes in
-<code>doc/value-class-preview.html</code>.</p>
-</body>
-</html>

doc/value-class-preview.md

@@ -1,151 +0,0 @@
-% Migration of JDK Classes to Value Classes
-
-## Introduction
-
-The Value Objects feature introduces value objects and migrates suitable classes
-to value classes. This means that when preview features are enabled, different
-class files are used for the migrated classes in the Java class library.
-
-To accomplish this, a built JDK uses *preview-specific* files in `META-INF/preview`,
-which overrides the regular files of the same name. For example,
-`META-INF/preview/java/lang/Integer.class` overrides `java/lang/Integer.class`.
-
-The JDK generates preview-specific source files (they may use preview language
-features), compiles class files from them, and distributes these class files in
-`META-INF/preview`.
-
-## The Build Process
-
-### The Custom Handling for the Value Objects JEP
-
-The Value Objects JEP requires a few select classes in the `java.base` module
-to become value classes when preview features are enabled.
-
-The build of `java.base` module first creates the source code of those value
-classes, done in
-[`GensrcValueClasses.gmk`](../make/modules/java.base/gensrc/GensrcValueClasses.gmk).
-
-1. A hardcoded list of regular source files are selected for preview-specific
-   generation.
-
-2. Extract the content of each regular source file, search for any occurrences
-   of `/*value*/ class` or `/*value*/ record`, and replace with `value class`
-   or `value record`.
-
-3. The replaced contents are written to the preview-specific generated files,
-   located in `support/gensrc-valueclasses/java.base/`.  The regular source
-   files remain unchanged in their original locations.
-
-4. The general preview source to binary build pipeline recognizes the
-   `support/gensrc-valueclasses/java.base/` directory as where the `java.base`
-   module places its preview-specific source files.
-
-### The General Preview Source to Binary Pipeline
-
-Once the preview-specific source files are ready, they are picked up by the
-build system into a fully automated pipeline handling all modules and all
-outcome images.
-
-1. The `GENERATED_PREVIEW_SUBDIRS` variable in [`make/common/Modules.gmk`](../make/common/Modules.gmk)
-   indicates where the source files are found.
-
-2. For each module that has preview-specific source files, a goal is created
-   to compile these source files into class files.
-
-3. The class files from each of these tasks reside in `support/preview/<module>`
-   for each module.
-
-4. These preview-specific class files and other resources are copied to the
-   `META-INF/preview` directory of the regular output directory.
-
-5. At run-time, jimage will pick up the preview-specific overrides from
-   `META-INF/preview` only when preview features are enabled.
-
-6. The interim javac used by the build system cannot pick up the
-   preview-specific overrides; they must be supplied explicitly with the
-   following javac flag for every single module where overrides are significant:
-
-   ```
-   --patch-module <module>=$(SUPPORT_OUTPUTDIR)/preview/<module>
-   ```
-
-   See [`BuildMicroBenchmarks.gmk`](../make/test/BuildMicrobenchmark.gmk) for an example.
-
-### Non-Goals
-
-The Value Objects JEP only plans to introduce value classes that are:
-
-1. In the `java.base` module.
-
-   There's no plan to migrate other classes in other modules.
-
-2. Migrated from existing classes.
-
-   These classes are available as identity classes when preview features are
-   disabled. There's no plan to introduce completely new value classes.
-
-Support for other value classes would require significant changes to the build
-system.
-
-## Testing
-
-In addition to tests that require preview features to be enabled, tests that do
-not depend on preview features wish to run with preview features enabled to
-ensure compatibility:
-
-1. Some tests wish to run against the Java SE class library with value classes.
-
-   The jtreg tests may be run with `JTREG=VM_OPTIONS=--enable-preview`.
-
-2. Some tests wish to run against their own classes migrated to value classes.
-
-   The jtreg [VALUE_CLASS_PLUGIN](testing.html#VALUE_CLASS_PLUGIN) allows tests
-   to migrate their own classes to value classes when running with the plugin.
-
-## Wrapper Class Caches
-
-Currently, wrapper class caches are retained even when preview features are
-enabled to address performance losses. They have no semantic impact to value
-objects.
-
-In interpreter or C1 execution in Hotspot, allocations of a value object to the
-heap as a full object with header happen when a value object is:
-
-1. Loaded from a flat storage (field or array)
-2. Created by a constructor
-3. If C2 uses scalarized calling convention, at C2 to C1/interpreter calls and returns
-
-Ideally, C2 can eliminate such allocations, but this does not work if the
-resulting object is stored into references. Unfortunately, many uses of boxing
-conversions store the resulting wrapper objects as references.
-
-For the uses that store wrapper objects to references, if the boxing
-conversion is:
-
-1. Returning a value object from a flat cache array
-2. Calling the value class constructor
-
-Then we would have heap allocation on every single use.
-
-To avoid the allocations, we fall back to returning a value object from a
-reference cache array, from which the loaded reference is directly storable
-into a destination that wants a reference without any allocation.
-
-Since Hotspot may create flat arrays if an array of value objects is requested
-by regular Java array creation mechanisms, we use `ValueClass.newReferenceArray`
-to ensure we always create a reference cache array.
-
-The cache array for value objects may be removed without notice if the
-performance losses from allocations are no longer significant.
-
-## Editing This Document
-
-If you want to contribute changes to this document, edit `doc/value-class-preview.md`
-and then run `make update-build-docs` to generate the same changes in
-`doc/value-class-preview.html`.
-
----
-# Override styles from the base CSS file that are not ideal for this document.
-header-includes:
- - '<style type="text/css">pre, code, tt { color: #1d6ae5; }</style>'
----

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -125,6 +125,13 @@ define SetupBundleFileBody
 	    && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
 	        $(TAR_IGNORE_EXIT_VALUE) ) \
 	    | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
+          # Rename stripped pdb files
+          ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+public)
+	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.stripped.pdb"`; do \
+	      $(ECHO) Renaming $$$${f} to $$$${f%stripped.pdb}pdb $(LOG_INFO); \
+	      $(MV) $$$${f} $$$${f%stripped.pdb}pdb; \
+	    done
+          endif
           # Unzip any zipped debuginfo files
           ifeq ($$($1_UNZIP_DEBUGINFO), true)
 	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
@@ -185,30 +192,96 @@ endif
 
 ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 
-  # There may be files with spaces in the names, so use ShellFindFiles explicitly.
+  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.map
+
+  # There may be files with spaces in the names, so use ShellFindFiles
+  # explicitly.
   ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
+  ifneq ($(JDK_IMAGE_DIR), $(JDK_SYMBOLS_IMAGE_DIR))
+    ALL_JDK_SYMBOLS_FILES := $(call ShellFindFiles, $(JDK_SYMBOLS_IMAGE_DIR))
+  else
+    ALL_JDK_SYMBOLS_FILES := $(ALL_JDK_FILES)
+  endif
   ifneq ($(JDK_IMAGE_DIR), $(JDK_DEMOS_IMAGE_DIR))
     ALL_JDK_DEMOS_FILES := $(call ShellFindFiles, $(JDK_DEMOS_IMAGE_DIR))
   else
     ALL_JDK_DEMOS_FILES := $(ALL_JDK_FILES)
   endif
 
+  # Create special filter rules when dealing with unzipped .dSYM directories on
+  # macosx
+  ifeq ($(call isTargetOs, macosx), true)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
+      JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
+          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, \
+          $(ALL_JDK_SYMBOLS_FILES))))
+    endif
+  endif
+
+  # Create special filter rules when dealing with debug symbols on windows
+  ifeq ($(call isTargetOs, windows), true)
+    ifeq ($(SHIP_DEBUG_SYMBOLS), )
+      JDK_SYMBOLS_EXCLUDE_PATTERN := %.pdb
+    else
+      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
+        JDK_SYMBOLS_EXCLUDE_PATTERN := \
+            $(filter-out \
+                %.stripped.pdb, \
+                $(filter %.pdb, $(ALL_JDK_FILES)) \
+            )
+      endif
+    endif
+  endif
+
   JDK_BUNDLE_FILES := \
       $(filter-out \
+          $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_EXTRA_EXCLUDES) \
+          $(SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_IMAGE_HOMEDIR)/demo/% \
           , \
           $(ALL_JDK_FILES) \
       )
 
-  JDK_SYMBOLS_BUNDLE_FILES := $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
+  JDK_SYMBOLS_BUNDLE_FILES := \
+      $(filter-out \
+          %.stripped.pdb, \
+          $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
+      )
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
       $(ALL_JDK_DEMOS_FILES))
 
   ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
 
-  JRE_BUNDLE_FILES := $(ALL_JRE_FILES)
+  # Create special filter rules when dealing with unzipped .dSYM directories on
+  # macosx
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
+      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
+          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
+    endif
+  endif
+
+  # Create special filter rules when dealing with debug symbols on windows
+  ifeq ($(call isTargetOs, windows), true)
+    ifeq ($(SHIP_DEBUG_SYMBOLS), )
+      JRE_SYMBOLS_EXCLUDE_PATTERN := %.pdb
+    else
+      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
+        JRE_SYMBOLS_EXCLUDE_PATTERN := \
+            $(filter-out \
+                %.stripped.pdb, \
+                $(filter %.pdb, $(ALL_JRE_FILES)) \
+            )
+      endif
+    endif
+  endif
+
+  JRE_BUNDLE_FILES := $(filter-out \
+      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
+      $(SYMBOLS_EXCLUDE_PATTERN), \
+      $(ALL_JRE_FILES))
 
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)
     # Macosx release build and code signing available.
@@ -228,7 +301,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JDK_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@
 
     $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
@@ -257,7 +330,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JRE_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@
 
     $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
@@ -410,6 +483,27 @@ 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))
 
@@ -432,12 +526,13 @@ 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-jdk-bundles jcov-bundles
+    static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
 
 ################################################################################
 

make/CompileDemos.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -173,41 +173,41 @@ $(BUILD_DEMO_CodePointIM_JAR): $(CODEPOINT_METAINF_SERVICE_FILE)
 
 $(eval $(call SetupBuildDemo, FileChooserDemo, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, SwingSet2, \
     DEMO_SUBDIR := jfc, \
     EXTRA_COPY_TO_JAR := .java, \
     EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
-    DISABLED_WARNINGS := rawtypes static serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := serial dangling-doc-comments, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape dangling-doc-comments, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, J2Ddemo, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := java2d.J2Ddemo, \
-    DISABLED_WARNINGS := cast lossy-conversions this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions this-escape, \
     JAR_NAME := J2Ddemo, \
 ))
 
 $(eval $(call SetupBuildDemo, Metalworks, \
-    DISABLED_WARNINGS := this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Notepad, \
-    DISABLED_WARNINGS := this-escape, \
+    DISABLED_WARNINGS := rawtypes this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Stylepad, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     EXTRA_SRC_DIR := $(DEMO_SHARE_SRC)/jfc/Notepad, \
     EXCLUDE_FILES := $(DEMO_SHARE_SRC)/jfc/Notepad/README.txt, \
 ))
@@ -217,7 +217,7 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := dangling-doc-comments, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape dangling-doc-comments, \
     DEMO_SUBDIR := jfc, \
 ))
 

make/CompileInterimLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -68,19 +68,17 @@ java.compiler.interim_EXTRA_FILES := \
 TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
 
 ################################################################################
-# Create a hybrid PreviewFeature.java that combines constants
-# from the current sources, as those can be used in javac APIs,  and from the
-# bootstrap JDK, as those can be used from bootstrap JDK classfiles.
+# Use the up-to-date PreviewFeature.java and NoPreview.java from the current
+# sources, instead of the versions from the boot JDK, as javac may be referring
+# to constants from the up-to-date versions.
 
-$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/PreviewFeature.java: \
-    $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
-	$(call LogInfo, Generating $@)
-	$(JAVA) $(TOPDIR)/make/langtools/tools/previewfeature/SetupPreviewFeature.java \
-            $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java \
-            $@
+$(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \
+    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java \
+        $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/NoPreview.java, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/, \
+))
 
-
-TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/PreviewFeature.java
+TARGETS += $(COPY_PREVIEW_FEATURES)
 
 ################################################################################
 # Setup the rules to build interim langtools, which is compiled by the boot
@@ -125,8 +123,7 @@ define SetupInterimModule
   $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \
       $$(INTERIM_LANGTOOLS_BASE_MODULES), $$(call FindTransitiveDepsForModule, $1)))
 
-  $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) \
-      $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/PreviewFeature.java
+  $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES)
 
   TARGETS += $$(BUILD_$1.interim)
 endef

make/CompileJavaModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -30,8 +30,6 @@ include MakeFileStart.gmk
 include JavaCompilation.gmk
 include Modules.gmk
 
-include CopyFiles.gmk
-
 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
 # module-info.java.
@@ -100,15 +98,13 @@ endif
 ################################################################################
 # Setup the main compilation
 
-COMPILATION_OUTPUTDIR := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules)
-
 $(eval $(call SetupJavaCompilation, $(MODULE), \
     SMALL_JAVA := false, \
     MODULE := $(MODULE), \
     SRC := $(wildcard $(MODULE_SRC_DIRS)), \
     INCLUDES := $(JDK_USER_DEFINED_FILTER), \
     FAIL_NO_SRC := $(FAIL_NO_SRC), \
-    BIN := $(COMPILATION_OUTPUTDIR), \
+    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
     CREATE_API_DIGEST := true, \
     CLEAN := $(CLEAN), \
@@ -130,66 +126,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
 
 TARGETS += $($(MODULE))
 
-################################################################################
-# Setup compilation for preview classes in the module
-# TBD: When $(DOCLINT) was included there was an NPE in JavacTypes.getOverriddenMethods
-
-# Directory and file name suffix for jar file containing preview classes/resources.
-PREVIEW_CLASSES_LABEL := preview
-# Module relative path in which preview classes/resources are placed.
-PREVIEW_PATH := META-INF/preview
-
-MODULE_PREVIEW_SRC_DIRS := $(call FindModulePreviewSrcDirs, $(MODULE))
-MODULE_PREVIEW_SOURCEPATH := $(call GetModulePreviewSrcPath)
-ifneq ($(MODULE_PREVIEW_SRC_DIRS),)
-  # Compile preview classes into a separate directory, and then copy into the
-  # correct output path location. We cannot compile directly into the desired
-  # directory because it's the compiler which creates the original
-  # '<module>/<classpath>/...' hierarchy.
-  PREVIEW_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/$(PREVIEW_CLASSES_LABEL)
-  PATCH_COMMAND := $(MODULE)=$(call strip, $(COMPILATION_OUTPUTDIR)/$(MODULE))
-
-  $(eval $(call SetupJavaCompilation, $(MODULE)-$(PREVIEW_CLASSES_LABEL), \
-      SMALL_JAVA := false, \
-      MODULE := $(MODULE), \
-      SRC := $(wildcard $(MODULE_PREVIEW_SRC_DIRS)), \
-      INCLUDES := $(JDK_USER_DEFINED_FILTER), \
-      FAIL_NO_SRC := $(FAIL_NO_SRC), \
-      BIN := $(PREVIEW_OUTPUTDIR)/, \
-      DISABLED_WARNINGS := $(DISABLED_WARNINGS_java) preview, \
-      EXCLUDES := $(EXCLUDES), \
-      EXCLUDE_FILES := $(EXCLUDE_FILES), \
-      KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-      DEPENDS := $($(MODULE)), \
-      JAVAC_FLAGS := \
-          $(JAVAC_FLAGS) \
-          --module-source-path $(MODULE_PREVIEW_SOURCEPATH) \
-          --module-path $(MODULEPATH) \
-          --patch-module $(PATCH_COMMAND) \
-          --system none \
-          --enable-preview -source $(JDK_SOURCE_TARGET_VERSION), \
-  ))
-
-  # Don't add '$($(MODULE)-$(PREVIEW_CLASSES_LABEL))' to TARGETS (it's transient).
-  # The 'preview' target below depends on it, and that's the non-transient
-  # result we care about.
-
-  # Copy compiled output from "$(PREVIEW_OUTPUTDIR)/$(MODULE)/<classpath>/..."
-  # to "$(COMPILATION_OUTPUTDIR)/$(MODULE)/$(PREVIEW_PATH)/<classpath>/...".
-  MOD_SRC := $(PREVIEW_OUTPUTDIR)/$(MODULE)
-  MOD_DST := $(COMPILATION_OUTPUTDIR)/$(MODULE)
-
-  # NOTE: We cannot use '$(CP) -R $(MOD_SRC)/*/ ...' to select sub-directories (it
-  # does not work on MacOS/BSD). Use 'filter-out' to explicitly exclude marker files.
-  $(MOD_DST)/_the.$(MODULE).preview: $($(MODULE)-$(PREVIEW_CLASSES_LABEL))
-		$(RM) -r $(@D)/$(PREVIEW_PATH)
-		$(MKDIR) -p $(@D)/$(PREVIEW_PATH)
-		$(CP) -R $(filter-out $(MOD_SRC)/_%, $(wildcard $(MOD_SRC)/*)) $(@D)/$(PREVIEW_PATH)
-		$(TOUCH) $@
-
-  TARGETS += $(MOD_DST)/_the.$(MODULE).preview
-endif
-
 # Declare dependencies between java compilations of different modules.
 # Since the other modules are declared in different invocations of this file,
 # use the macro to find the correct target file to depend on.

make/CreateJmods.gmk

@@ -218,14 +218,10 @@ ifeq ($(call isTargetOs, windows), true)
   ifeq ($(SHIP_DEBUG_SYMBOLS), )
     JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.pdb,*.map}'
   else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.map}'
   endif
 else
-  ifeq ($(SHIP_DEBUG_SYMBOLS), )
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
-  else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*}'
-  endif
+  JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
 endif
 
 # Unless we are creating a very large module, use the small tool JVM options

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -93,10 +93,9 @@ JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
 JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
-JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
+JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
@@ -292,7 +291,8 @@ define SetupApiDocsGenerationBody
   $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES))
   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
 
-  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION)
+  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
+	-Djspec.version=$$(VERSION_SPECIFICATION)
 
   ifeq ($$(ENABLE_FULL_DOCS), true)
     $1_SEALED_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-sealed-graphs

make/GenerateLinkOptData.gmk

@@ -70,15 +70,12 @@ CLASSLIST_FILE_VM_OPTS = \
 
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.
-# The classlists must be generated with -Xint to avoid non-determinism
-# introduced by JIT compiled code
 $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    $(CLASSLIST_FILE_VM_OPTS) \
-	    -Xint \
 	    -Xlog:aot=off \
 	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
@@ -93,7 +90,6 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    $(CLASSLIST_FILE_VM_OPTS) \
-	    -Xint \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    -Xlog:aot=off \
 	    -Xlog:cds=off \

make/GraalBuilderImage.gmk

@@ -0,0 +1,52 @@
+#
+# 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

make/Hsdis.gmk

@@ -44,9 +44,6 @@ ifeq ($(HSDIS_BACKEND), capstone)
   else ifeq ($(call isTargetCpuArch, aarch64), true)
     CAPSTONE_ARCH := CS_ARCH_$(CAPSTONE_ARCH_AARCH64_NAME)
     CAPSTONE_MODE := CS_MODE_ARM
-  else ifeq ($(call isTargetCpuArch, arm), true)
-    CAPSTONE_ARCH := CS_ARCH_ARM
-    CAPSTONE_MODE := CS_MODE_ARM
   else
     $(error No support for Capstone on this platform)
   endif
@@ -117,6 +114,7 @@ ifeq ($(HSDIS_BACKEND), binutils)
     TOOLCHAIN_TYPE := gcc
     OPENJDK_TARGET_OS := linux
     OPENJDK_TARGET_OS_TYPE := unix
+    CC_OUT_OPTION := -o$(SPACE)
     GENDEPS_FLAGS := -MMD -MF
     CFLAGS_DEBUG_SYMBOLS := -g
     DISABLED_WARNINGS :=

make/Images.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -137,23 +137,24 @@ 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, _nocoh, _nocoops_nocoh, or empty
-# Param3 - _preview, or empty
+# Param2 - _nocoops, _coh, _nocoops_coh, 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_NOCOH_OPTION := $(if $(findstring _nocoh, $2),-XX:-UseCompactObjectHeaders,-XX:+UseCompactObjectHeaders)
+    $1_$2_COH_OPTION := -XX:+UnlockExperimentalVMOptions \
+                        $(if $(findstring _coh, $2),-XX:+UseCompactObjectHeaders,-XX:-UseCompactObjectHeaders)
   endif
-  $1_$2_$3_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_NOCOH_OPTION) $(if $(findstring _preview, $3), --enable-preview,)
-  $1_$2_$3_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _nocoh, $2),-NOCOH,)$(if $(findstring _preview, $3),-PREVIEW,)
+  $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_$3_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
+  # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
+  $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    $1_$2_$3_CDS_ARCHIVE := bin/$1/classes$2$3.jsa
+    $1_$2_CDS_ARCHIVE := bin/$1/classes$2.jsa
   else
-    $1_$2_$3_CDS_ARCHIVE := lib/$1/classes$2$3.jsa
+    $1_$2_CDS_ARCHIVE := lib/$1/classes$2.jsa
   endif
 
   ifneq ($(COMPARE_BUILD), )
@@ -161,83 +162,53 @@ define CreateCDSArchive
   endif
 
   ifeq ($(DEBUG_CDS_ARCHIVE), true)
-    $1_$2_$3_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_$3_CDS_ARCHIVE).cdsmap:none:filesize=0
+    $1_$2_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
   endif
 
-  $$(eval $$(call SetupExecute, $1_$2_$3_gen_cds_archive_jdk, \
-      WARN := Creating CDS$$($1_$2_$3_DUMP_TYPE) archive for jdk image for $1, \
-      INFO := Using CDS flags for $1: $$($1_$2_$3_CDS_DUMP_FLAGS), \
+  $$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jdk, \
+      WARN := Creating CDS$$($1_$2_DUMP_TYPE) archive for jdk image for $1, \
+      INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
       DEPS := $$(jlink_jdk), \
-      OUTPUT_FILE := $$(JDK_IMAGE_DIR)/$$($1_$2_$3_CDS_ARCHIVE), \
+      OUTPUT_FILE := $$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
       SUPPORT_DIR := $$(JDK_IMAGE_SUPPORT_DIR), \
       COMMAND := $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java -Xshare:dump \
-          -XX:SharedArchiveFile=$$(JDK_IMAGE_DIR)/$$($1_$2_$3_CDS_ARCHIVE) \
-          -$1 $$($1_$2_$3_DUMP_EXTRA_ARG) $$($1_$2_$3_CDS_DUMP_FLAGS) $$(LOG_INFO), \
+          -XX:SharedArchiveFile=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
+          -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
   ))
 
-  JDK_TARGETS += $$($1_$2_$3_gen_cds_archive_jdk)
+  JDK_TARGETS += $$($1_$2_gen_cds_archive_jdk)
 
-  $$(eval $$(call SetupExecute, $1_$2_$3_gen_cds_archive_jre, \
-      WARN := Creating CDS$$($1_$2_$3_DUMP_TYPE) archive for jre image for $1, \
-      INFO := Using CDS flags for $1: $$($1_$2_$3_CDS_DUMP_FLAGS), \
+  $$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jre, \
+      WARN := Creating CDS$$($1_$2_DUMP_TYPE) archive for jre image for $1, \
+      INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
       DEPS := $$(jlink_jre), \
-      OUTPUT_FILE := $$(JRE_IMAGE_DIR)/$$($1_$2_$3_CDS_ARCHIVE), \
+      OUTPUT_FILE := $$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
       SUPPORT_DIR := $$(JRE_IMAGE_SUPPORT_DIR), \
       COMMAND := $$(FIXPATH) $$(JRE_IMAGE_DIR)/bin/java -Xshare:dump \
-          -XX:SharedArchiveFile=$$(JRE_IMAGE_DIR)/$$($1_$2_$3_CDS_ARCHIVE) \
-          -$1 $$($1_$2_$3_DUMP_EXTRA_ARG) $$($1_$2_$3_CDS_DUMP_FLAGS) $$(LOG_INFO), \
+          -XX:SharedArchiveFile=$$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
+          -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
   ))
 
-  JRE_TARGETS += $$($1_$2_$3_gen_cds_archive_jre)
+  JRE_TARGETS += $$($1_$2_gen_cds_archive_jre)
 endef
 
 ifeq ($(BUILD_CDS_ARCHIVE), true)
   $(foreach v, $(JVM_VARIANTS), \
-    $(eval $(call CreateCDSArchive,$v,,)) \
+    $(eval $(call CreateCDSArchive,$v,)) \
   )
 
-  ifeq ($(BUILD_CDS_ARCHIVE_PREVIEW), true)
-    $(foreach v, $(JVM_VARIANTS), \
-      $(eval $(call CreateCDSArchive,$v,,_preview)) \
-    )
-  endif
-
   ifeq ($(call isTargetCpuBits, 64), true)
-    ifeq ($(BUILD_CDS_ARCHIVE_NOCOOPS), true)
+    $(foreach v, $(JVM_VARIANTS), \
+      $(eval $(call CreateCDSArchive,$v,_nocoops)) \
+    )
+    ifeq ($(BUILD_CDS_ARCHIVE_COH), true)
       $(foreach v, $(JVM_VARIANTS), \
-        $(eval $(call CreateCDSArchive,$v,_nocoops,)) \
+        $(eval $(call CreateCDSArchive,$v,_coh)) \
       )
-    endif
-
-    ifeq ($(BUILD_CDS_ARCHIVE_PREVIEW)+$(BUILD_CDS_ARCHIVE_NOCOOPS), true+true)
       $(foreach v, $(JVM_VARIANTS), \
-        $(eval $(call CreateCDSArchive,$v,_nocoops,_preview)) \
+        $(eval $(call CreateCDSArchive,$v,_nocoops_coh)) \
       )
     endif
-
-    ifeq ($(BUILD_CDS_ARCHIVE_NOCOH), true)
-      $(foreach v, $(JVM_VARIANTS), \
-        $(eval $(call CreateCDSArchive,$v,_nocoh)) \
-      )
-
-      ifeq ($(BUILD_CDS_ARCHIVE_PREVIEW), true)
-        $(foreach v, $(JVM_VARIANTS), \
-          $(eval $(call CreateCDSArchive,$v,_nocoh,_preview)) \
-        )
-      endif
-
-      ifeq ($(BUILD_CDS_ARCHIVE_NOCOOPS), true)
-        $(foreach v, $(JVM_VARIANTS), \
-          $(eval $(call CreateCDSArchive,$v,_nocoops_nocoh)) \
-        )
-      endif
-
-      ifeq ($(BUILD_CDS_ARCHIVE_PREVIEW)+$(BUILD_CDS_ARCHIVE_NOCOOPS), true+true)
-        $(foreach v, $(JVM_VARIANTS), \
-          $(eval $(call CreateCDSArchive,$v,_nocoops_nocoh,_preview)) \
-        )
-      endif
-    endif
   endif
 endif
 
@@ -312,33 +283,29 @@ else
 endif
 CMDS_TARGET_SUBDIR := bin
 
-# Copy debug info files into symbols bundle.
-# In case of Windows and --with-external-symbols-in-bundles=public, take care to remove *.stripped.pdb files
+# Param 1 - either JDK or JRE
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
-      $(eval dbgfiles := $(call FindDebuginfoFiles, $(SUPPORT_OUTPUTDIR)/modules_libs/$m)) \
-      $(eval dbgfiles := $(if $(filter true+public,$(call isTargetOs,windows)+$(SHIP_DEBUG_SYMBOLS)), \
-        $(filter-out %.stripped.pdb,$(dbgfiles)),$(dbgfiles)) \
-      ) \
       $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
           DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
-          FILES := $(dbgfiles), \
+          FILES := $(call FindDebuginfoFiles, \
+              $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
-      $(eval dbgfiles := $(call FindDebuginfoFiles, $(SUPPORT_OUTPUTDIR)/modules_cmds/$m)) \
-      $(eval dbgfiles := $(if $(filter true+public,$(call isTargetOs,windows)+$(SHIP_DEBUG_SYMBOLS)), \
-        $(filter-out %.stripped.pdb,$(dbgfiles)),$(dbgfiles)) \
-      ) \
       $(eval $(call SetupCopyFiles, COPY_$1_CMDS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$m, \
           DEST := $($1_IMAGE_DIR)/$(CMDS_TARGET_SUBDIR), \
-          FILES := $(dbgfiles), \
+          FILES := $(call FindDebuginfoFiles, \
+              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_CMDS_DEBUGINFO_$m)) \
     )
 
-# No space before argument to avoid having to put $(strip ) everywhere in implementation above.
+# No space before argument to avoid having to put $(strip ) everywhere in
+# implementation above.
+$(call SetupCopyDebuginfo,JDK)
+$(call SetupCopyDebuginfo,JRE)
 $(call SetupCopyDebuginfo,SYMBOLS)
 
 ################################################################################

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -461,9 +461,9 @@ $(eval $(call SetupTarget, symbols-image, \
     TARGET := symbols, \
 ))
 
-$(eval $(call SetupTarget, static-launchers, \
+$(eval $(call SetupTarget, static-launcher, \
     MAKEFILE := StaticLibs, \
-    TARGET := static-launchers, \
+    TARGET := static-launcher, \
     DEPS := hotspot-static-libs static-libs, \
 ))
 
@@ -478,6 +478,11 @@ $(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, \
@@ -501,6 +506,11 @@ $(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, \
@@ -794,20 +804,6 @@ ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
   ))
 endif
 
-# Builds the value class plugin jtreg extension (JEP 401)
-$(eval $(call SetupTarget, build-test-value-class-plugin, \
-    MAKEFILE := test/BuildJtregValueClassPlugin, \
-    TARGET := build, \
-    DEPS := interim-langtools exploded-image, \
-))
-
-# Copies the value class plugin into the test image
-$(eval $(call SetupTarget, test-image-value-class-plugin, \
-    MAKEFILE := test/BuildJtregValueClassPlugin, \
-    TARGET := images, \
-    DEPS := build-test-value-class-plugin, \
-))
-
 $(eval $(call SetupTarget, build-microbenchmark, \
     MAKEFILE := test/BuildMicrobenchmark, \
     DEPS := interim-langtools exploded-image build-test-lib, \
@@ -881,6 +877,12 @@ $(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, \
@@ -1122,6 +1124,8 @@ 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)
@@ -1286,7 +1290,7 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-static-exploded-image: static-launchers exploded-image
+static-exploded-image: static-launcher exploded-image
 
 # These targets build the various documentation images
 docs-jdk-image: docs-jdk
@@ -1324,8 +1328,6 @@ ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
   test-image: test-image-test-thread-factory
 endif
 
-test-image: test-image-value-class-plugin
-
 ifneq ($(JMH_CORE_JAR), )
   test-image: build-microbenchmark
 endif

make/MainSupport.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -107,7 +107,6 @@ define Clean-java
 	@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
-	$(RM) -r $(SUPPORT_OUTPUTDIR)/preview/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
 	$(ECHO) " done"
 	$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"

make/PreInit.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -66,8 +66,7 @@ CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
 ifeq ($(CALLED_SPEC_TARGETS), )
   SKIP_SPEC := true
 endif
-MFLAGS_SINGLE := $(filter-out --%, $(MFLAGS))
-ifeq ($(findstring p, $(MFLAGS_SINGLE))$(findstring q, $(MFLAGS_SINGLE)), pq)
+ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
   SKIP_SPEC := true
 endif
 

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -93,9 +93,6 @@ JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar
 JTREG_TEST_THREAD_FACTORY_DIR := $(TEST_IMAGE_DIR)/jtreg_test_thread_factory
 JTREG_TEST_THREAD_FACTORY_JAR := $(JTREG_TEST_THREAD_FACTORY_DIR)/jtregTestThreadFactory.jar
 
-JTREG_VALUE_CLASS_PLUGIN_DIR := $(TEST_IMAGE_DIR)/jtreg_value_class_plugin
-JTREG_VALUE_CLASS_PLUGIN_JAR := $(JTREG_VALUE_CLASS_PLUGIN_DIR)/valueClassPlugin.jar
-
 JTREG_FAILURE_HANDLER_TIMEOUT ?= 0
 
 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
@@ -209,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \
         MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \
-        AOT_JDK MANUAL VALUE_CLASS_PLUGIN $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -876,21 +873,7 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
-    ))
-  endif
-
-  ifneq ($$(JTREG_VALUE_CLASS_PLUGIN), )
-    ifneq ($$(wildcard $$(JTREG_VALUE_CLASS_PLUGIN_JAR)), )
-      $1_JTREG_BASIC_OPTIONS += -cpa:$$(JTREG_VALUE_CLASS_PLUGIN_JAR)
-    endif
-    $1_JTREG_BASIC_OPTIONS += -vmoption:--enable-preview
-    $1_JTREG_BASIC_OPTIONS += -javacoption:-XDaccessInternalAPI
-    $1_JTREG_BASIC_OPTIONS += -javacoption:--source -javacoption:$(VERSION_FEATURE)
-    $1_JTREG_BASIC_OPTIONS += -javacoption:--enable-preview
-    $1_JTREG_BASIC_OPTIONS += -javacoption:-Xplugin:ValueClassPlugin
-    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-ValueClass.txt) \
+	$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
     ))
   endif
 
@@ -898,8 +881,8 @@ define SetupRunJtregTestBody
     AGENT := $$(LIBRARY_PREFIX)JvmtiStressAgent$$(SHARED_LIBRARY_SUFFIX)=$$(JTREG_JVMTI_STRESS_AGENT)
     $1_JTREG_BASIC_OPTIONS += -javaoption:'-agentpath:$(TEST_IMAGE_DIR)/hotspot/jtreg/native/$$(AGENT)'
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-jvmti-stress-agent.txt) \
-    ))
+	    $$(addprefix $$($1_TEST_ROOT)/, ProblemList-jvmti-stress-agent.txt) \
+        ))
   endif
 
 
@@ -928,13 +911,7 @@ define SetupRunJtregTestBody
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
 
-  $1_JTREG_BASIC_OPTIONS += -ignore:quiet
-
-  ifeq ($$(JTREG_MANUAL), true)
-    $1_JTREG_BASIC_OPTIONS += -manual
-  else
-    $1_JTREG_BASIC_OPTIONS += -automatic
-  endif
+  $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver
@@ -969,8 +946,8 @@ define SetupRunJtregTestBody
   JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
 
   JTREG_AUTO_PROBLEM_LISTS :=
-  # Please reach consensus before changing this.
-  JTREG_AUTO_TIMEOUT_FACTOR := 4
+  # Please reach consensus before changing this. It was not easy changing it to a `1`.
+  JTREG_AUTO_TIMEOUT_FACTOR := 1
 
   ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
@@ -989,6 +966,7 @@ define SetupRunJtregTestBody
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.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 \
@@ -1032,9 +1010,6 @@ define SetupRunJtregTestBody
         VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
     $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
-    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-AotJdk.txt) \
-    ))
   endif
 
 
@@ -1111,7 +1086,7 @@ define SetupRunJtregTestBody
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
 	    $$($1_TEST_TMP_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
-	    $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
+            $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
 	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt
@@ -1121,11 +1096,11 @@ define SetupRunJtregTestBody
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 
-        # Read jtreg documentation to learn on the test stats categories:
-        # https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
-        # In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
-        # At the same time these tests contribute to "passed:" tests.
-        # In here we don't want that and so we substract number of "skipped:" from "passed:".
+	# Read jtreg documentation to learn on the test stats categories:
+	# https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
+	# In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
+	# At the same time these tests contribute to "passed:" tests.
+	# In here we don't want that and so we substract number of "skipped:" from "passed:".
 
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
 	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
@@ -1176,7 +1151,6 @@ define SetupRunJtregTestBody
 	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR) + $$($1_SKIPPED))) \
 	, \
 	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0) \
-	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_RUNTIME_SKIPPED := 0) \
 	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_FAILED := 0) \

make/RunTestsPrebuiltSpec.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, 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
@@ -53,9 +53,6 @@ $(eval $(call VerifyVariable,TEST_IMAGE_DIR))
 $(eval $(call VerifyVariable,MAKE))
 $(eval $(call VerifyVariable,BASH))
 
-include $(TOPDIR)/make/conf/version-numbers.conf
-VERSION_FEATURE := $(DEFAULT_VERSION_FEATURE)
-
 ################################################################################
 # The "human readable" name of this configuration
 CONF_NAME := run-test-prebuilt
@@ -67,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 := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
+JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
 BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
 BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG)
 

make/StaticLibs.gmk

@@ -48,8 +48,8 @@ ifneq ($(word 2, $(wildcard $(HOTSPOT_STATIC_LIB_PATH))), )
 endif
 
 # Find all modules with static libraries
-STATIC_LIB_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*)))
+STATIC_LIB_MODULES := $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*))
 
 # Filter out known broken libraries. This is a temporary measure until
 # proper support for these libraries can be provided.
@@ -116,25 +116,17 @@ else ifeq ($(call isTargetOs, aix), true)
     $(eval STATIC_LIB_EXPORT_FILES += $(lib).exp) \
   )
   STATIC_LIBS := -Wl,-bexpfull $(STATIC_LIB_FILES) $(addprefix -Wl$(COMMA)-bE:, $(STATIC_LIB_EXPORT_FILES))
-  ifeq ($(DEBUG_LEVEL), slowdebug)
-    STATIC_LIBS += -Wl,-bbigtoc
-  endif
 else
   $(error Unsupported platform)
 endif
 
-################################################################################
-# Build the java static launcher
-################################################################################
 $(eval $(call SetupBuildLauncher, java, \
     ENABLE_ARG_FILES := true, \
     EXPAND_CLASSPATH_WILDCARDS := true, \
     EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OPTIMIZATION := HIGH, \
-    MACOSX_PRIVILEGED := true, \
     STATIC_LAUNCHER := true, \
-    CFLAGS := -DSTATIC_BUILD, \
     LDFLAGS := $(LDFLAGS_STATIC_JDK), \
     LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
     LINK_TYPE := C++, \
@@ -151,53 +143,7 @@ TARGETS += $(java)
 
 JAVA_LAUNCHER := $(BUILD_LAUNCHER_java_TARGET)
 
-static-launchers: $(java)
-
-################################################################################
-# Build relaunchers (thin wrappers calling the java binary) for all other
-# JDK launchers.
-################################################################################
-
-RELAUNCHER_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher
-
-# $1: The module name
-# $2: The launcher name
-define SetupRelauncher
-  $1_$2_LAUNCHER_ARGS_LINE := $$(call ReadFile, $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$1/$2-relauncher-arguments.txt)
-  # Restore |||| with space
-  $1_$2_LAUNCHER_ARGS := '{ $$(subst ||||,$(SPACE),$$(strip $$(foreach a, $$($1_$2_LAUNCHER_ARGS_LINE), "-J$$a"$$(COMMA) )) ) }'
-
-  $$(eval $$(call SetupJdkExecutable, BUILD_relauncher_$2, \
-      NAME := $2, \
-      EXTRA_FILES := $$(RELAUNCHER_SRC)/relauncher.c, \
-      CFLAGS := -DLAUNCHER_ARGS=$$($1_$2_LAUNCHER_ARGS), \
-      LIBS_windows := shlwapi.lib, \
-      OUTPUT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR), \
-      OBJECT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR)/relaunchers/$2, \
-  ))
-
-  TARGETS += $$(BUILD_relauncher_$2)
-
-  RELAUNCHERS += $$(BUILD_relauncher_$2_TARGET)
-  static-launchers: $$(BUILD_relauncher_$2)
-endef
-
-# Find all modules with launchers
-LAUNCHER_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-launchers/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-launchers/*)))
-
-# Find launchers for each module
-$(foreach module, $(LAUNCHER_MODULES), \
-    $(eval LAUNCHERS_$(module) := $(if $(wildcard \
-    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt), \
-    $(shell cat \
-    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt))) \
-)
-
-# For all launchers (except java and javaw), setup a relauncher build
-$(foreach module, $(LAUNCHER_MODULES), \
-    $(foreach launcher, $(filter-out java javaw, $(LAUNCHERS_$(module))), \
-    $(eval $(call SetupRelauncher,$(module),$(launcher)))))
+static-launcher: $(java)
 
 ################################################################################
 #
@@ -239,72 +185,26 @@ TARGETS += $(copy-from-jdk-image)
 
 $(copy-from-jdk-image): | static-jdk-info
 
-$(eval $(call SetupCopyFiles, copy-static-launchers, \
-    FILES := $(JAVA_LAUNCHER) $(RELAUNCHERS), \
+$(eval $(call SetupCopyFiles, copy-static-launcher, \
+    FILES := $(JAVA_LAUNCHER), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
 ))
 
-TARGETS += $(copy-static-launchers)
+TARGETS += $(copy-static-launcher)
 
-$(eval $(call SetupCopyFiles, copy-static-launchers-debuginfo, \
+$(eval $(call SetupCopyFiles, copy-static-launcher-debuginfo, \
     SRC := $(STATIC_LAUNCHER_OUTPUT_DIR), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
     FILES := $(call FindDebuginfoFiles, $(STATIC_LAUNCHER_OUTPUT_DIR)), \
 ))
 
-TARGETS += $(copy-static-launchers-debuginfo)
+TARGETS += $(copy-static-launcher-debuginfo)
 
-# Copy the microsoft runtime libraries on windows
-ifeq ($(call isTargetOs, windows), true)
-  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
-  # Use separate macro calls in case the source files are not in the same
-  # directory.
-  $(eval $(call SetupCopyFiles, copy-windows-msvcr, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(MSVCR_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-msvcr)
-
-  $(eval $(call SetupCopyFiles, copy-windows-vcruntime, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(VCRUNTIME_1_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-vcruntime)
-
-  $(eval $(call SetupCopyFiles, copy-windows-msvcp, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(MSVCP_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-msvcp)
-
-  copy-windows-libs := $(copy-windows-msvcr) $(copy-windows-vcruntime) $(copy-windows-msvcp)
-
-  ifneq ($(UCRT_DLL_DIR), )
-    $(eval $(call SetupCopyFiles, copy-windows-ucrt, \
-        DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-        SRC := $(UCRT_DLL_DIR), \
-        FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
-        MACRO := copy-and-chmod-executable, \
-    ))
-
-    TARGETS += $(copy-windows-ucrt)
-
-    copy-windows-libs += $(copy-windows-ucrt)
-  endif
-endif
-
-static-jdk-image: $(copy-from-jdk-image) $(copy-static-launchers) \
-    $(copy-static-launchers-debuginfo) $(copy-windows-libs)
+static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-launcher-debuginfo)
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launchers static-jdk-image
+.PHONY: static-launcher static-jdk-image
 
 ################################################################################
 

make/StaticLibsImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -39,6 +39,8 @@ 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.
@@ -68,6 +70,7 @@ 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)
 
 ################################################################################
 

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -79,10 +79,7 @@ TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_too
     build.tools.generateextraproperties.GenerateExtraProperties
 
 TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatecharacter.GenerateCaseFolding
-
-TOOL_GENERATESPECIALCASING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatespecialcasing.GenerateSpecialCasing
+    build.tools.generatecharacter.CaseFolding
 
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible

make/UpdateSleefSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 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
@@ -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/unix/native/libsleef
+SLEEF_SOURCE_BASE_DIR := $(TOPDIR)/src/jdk.incubator.vector/linux/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,12 +82,7 @@ $(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) \
-       -DCMAKE_INSTALL_PREFIX=$(SLEEF_NATIVE_BUILD_DIR) \
-       -DSLEEF_BUILD_TESTS=OFF \
-       -DSLEEF_DISABLE_SSL=ON \
-       -DSLEEF_ENABLE_TLFLOAT=OFF \
-       -DSLEEF_ENABLE_TESTER4=OFF, \
+    COMMAND := $(CMAKE) -S . -B $(SLEEF_NATIVE_BUILD_DIR), \
 ))
 
 TARGETS := $(sleef_native_config)
@@ -111,11 +106,6 @@ $(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), \
 ))
@@ -149,7 +139,7 @@ $(eval $(call SetupCopyFiles, copy_generated_sleef_source, \
     DEST := $(SLEEF_TARGET_DIR), \
 ))
 
-TARGETS := $(copy_static_sleef_source) $(copy_generated_sleef_source)
+TARGETS := $(copy_generated_sleef_source)
 
 ################################################################################
 

make/ZipSource.gmk

@@ -35,35 +35,12 @@ $(if $(filter $(TOPDIR)/%, $(SUPPORT_OUTPUTDIR)), $(eval SRC_ZIP_BASE := $(TOPDI
 
 ################################################################################
 # Create the directory structure for src.zip using symlinks.
-#   <module>/<package>/<file>.java
-# or:
-#   <module>/META-INF/preview/<package>/<file>.java
-# for preview enabled sources.
-#
-# Generate the src dirs in the first make invocation and then call this makefile
-# again to create src.zip.
+# <module>/<package>/<file>.java
 
 ALL_MODULES := $(FindAllModules)
 
-# Module source directories ($d) are things like (but not limited to):
-# - $TOPDIR/src/<module>/share/classes
-# - $SUPPORT_OUTPUTDIR/gensrc/<module>
-#
-# A symbolic link is created for each directory. For example:
-# - $TOPDIR/src/<module>/share/classes
-# is linked from:
-# - $SRC_ZIP_WORK_DIR/src/<module>/share/classes/<module>
-#
-# Each link has the form:
-# - $SRC_ZIP_WORK_DIR/<link-dir>/<module>
-# and always has the name of its module (even if the module already appears in <link-dir>.
-#
-# Then the contents of all link parent directories are given as ZIP includes:
-# - $SRC_ZIP_WORK_DIR/<link-dir>
-# results in ZIP file entries starting:
-# - <module>/...
-# where multiple source links/directories can contribute to the same module's sources.
-#
+# Generate the src dirs in the first make invocation and then call this makefile
+# again to create src.zip.
 $(foreach m, $(ALL_MODULES), \
   $(foreach d, $(call FindModuleSrcDirs, $m), \
     $(eval $d_TARGET := $(SRC_ZIP_WORK_DIR)/$(patsubst $(TOPDIR)/%,%,$(patsubst $(SUPPORT_OUTPUTDIR)/%,%,$d))/$m) \
@@ -77,36 +54,6 @@ $(foreach m, $(ALL_MODULES), \
   ) \
 )
 
-# Preview source directories are currently limited to:
-# - $SUPPORT_OUTPUTDIR/gensrc-valueclasses/<module>
-# If this is changed, the 'patsubst' rewriting will need updating.
-#
-# The difficulty with this case is that we need to have a directory of the form:
-# - $SRC_ZIP_WORK_DIR/<link-dir>/<module>
-# containing (either directly or via symbolic linking) a `META-INF/preview`
-# subdirectory which then contains the sources.
-#
-# The easiest way to achieve this is to symbolically link:
-# - $SRC_ZIP_WORK_DIR/<link-dir>/<module>/META-INF/preview
-# and then use the parent directory:
-# - $SRC_ZIP_WORK_DIR/<link-dir>/<module>
-# as the actual target for the ZIP file generation. However, this requires
-# an extra rule to associate the symbolic link and the parent directory.
-#
-$(foreach m, $(ALL_MODULES), \
-  $(foreach d, $(call FindModulePreviewSrcDirs, $m), \
-    $(eval $d_TARGET := $(SRC_ZIP_WORK_DIR)/$(patsubst $(SUPPORT_OUTPUTDIR)/%,%,$d)/$m) \
-    $(if $(SRC_GENERATED), , \
-      $(eval $$($d_TARGET)/META-INF/preview: $d ; \
-          $$(if $(filter $(SRC_ZIP_BASE)/%, $d), $$(link-file-relative), $$(link-file-absolute)) \
-      ) \
-      $(eval $$($d_TARGET): $$($d_TARGET)/META-INF/preview) \
-    ) \
-    $(eval SRC_ZIP_SRCS += $$($d_TARGET)) \
-    $(eval SRC_ZIP_SRCS_$m += $$($d_TARGET)) \
-  ) \
-)
-
 TARGETS += $(SRC_ZIP_SRCS)
 
 ################################################################################

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -210,8 +210,17 @@ AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
     if test $? -ne 0; then
       AC_MSG_ERROR([The xcodebuild tool in the devkit reports an error: $XCODEBUILD_OUTPUT])
     fi
+  elif test "x$TOOLCHAIN_PATH" != x; then
+    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
+    if test "x$XCODEBUILD" != x; then
+      XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
+      if test $? -ne 0; then
+        AC_MSG_WARN([Ignoring the located xcodebuild tool $XCODEBUILD due to an error: $XCODEBUILD_OUTPUT])
+        XCODEBUILD=
+      fi
+    fi
   else
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(XCODEBUILD, xcodebuild)
+    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild)
     if test "x$XCODEBUILD" != x; then
       XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
       if test $? -ne 0; then
@@ -327,15 +336,33 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
     elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
       SYSROOT="$DEVKIT_ROOT/$host/sys-root"
     fi
+
+    if test "x$DEVKIT_ROOT" != x; then
+      DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib"
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+        DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib64"
+      fi
+      AC_SUBST(DEVKIT_LIB_DIR)
+    fi
   fi
 
   # You can force the sysroot if the sysroot encoded into the compiler tools
   # is not correct.
+  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
+      [alias for --with-sysroot for backwards compatibility])],
+      [SYSROOT=$with_sys_root]
+  )
+
   AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
       [use this directory as sysroot])],
       [SYSROOT=$with_sysroot]
   )
 
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [alias for --with-toolchain-path for backwards compatibility])],
+      [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
+  )
+
   AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
       [prepend these directories when searching for toolchain binaries (compilers etc)])],
       [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
@@ -344,14 +371,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
       [set up toolchain on Mac OS using a path to an Xcode installation])])
 
-  UTIL_DEPRECATED_ARG_WITH(sys-root)
-
-  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
-      [Point to a nonstandard Visual Studio installation location on Windows by
-      specifying any existing directory 2 or 3 levels below the installation
-      root.])]
-  )
-
   if test "x$with_xcode_path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
       UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],

make/autoconf/basic_tools.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -148,7 +148,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
           if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
             MAKE_EXPECTED_ENV='cygwin'
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
-            MAKE_EXPECTED_ENV='cygwin|msys'
+            MAKE_EXPECTED_ENV='msys'
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
             if test "x$OPENJDK_BUILD_CPU" = "xaarch64"; then
               MAKE_EXPECTED_ENV='aarch64-.*-linux-gnu'
@@ -159,7 +159,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
             AC_MSG_ERROR([Unknown Windows environment])
           fi
           MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
-          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP -E $MAKE_EXPECTED_ENV`
+          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
         else
           # Not relevant for non-Windows
           IS_MAKE_CORRECT_ENV=true
@@ -207,14 +207,29 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
   UTIL_SETUP_TOOL(MAKE,
   [
     # Try our hardest to locate a correct version of GNU make
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(CHECK_GMAKE, gmake)
+    UTIL_LOOKUP_PROGS(CHECK_GMAKE, gmake)
     BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
 
     if test "x$FOUND_MAKE" = x; then
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(CHECK_MAKE, make)
+      UTIL_LOOKUP_PROGS(CHECK_MAKE, make)
       BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
     fi
 
+    if test "x$FOUND_MAKE" = x; then
+      if test "x$TOOLCHAIN_PATH" != x; then
+        # We have a toolchain path, check that as well before giving up.
+        OLD_PATH=$PATH
+        PATH=$TOOLCHAIN_PATH:$PATH
+        UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
+        BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
+        if test "x$FOUND_MAKE" = x; then
+          UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_MAKE, make)
+          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
+        fi
+        PATH=$OLD_PATH
+      fi
+    fi
+
     if test "x$FOUND_MAKE" = x; then
       AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
     fi
@@ -363,16 +378,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   # Check if it's a GNU date compatible version
   AC_MSG_CHECKING([if date is a GNU compatible version])
-  check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox\|uutils"`
+  check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox"`
   if test "x$check_date" != x; then
     AC_MSG_RESULT([yes])
     IS_GNU_DATE=yes
   else
     AC_MSG_RESULT([no])
-    # Likely at the AIX provided version of the date utility here, which is not compatible
-    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
-      AC_MSG_ERROR([gnu date from AIX toolbox is required])
-    fi
     IS_GNU_DATE=no
   fi
   AC_SUBST(IS_GNU_DATE)

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -408,6 +408,27 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
   AC_MSG_RESULT([$BOOT_JDK_BITS])
 
+  # Try to enable CDS
+  AC_MSG_CHECKING([for local Boot JDK Class Data Sharing (CDS)])
+  BOOT_JDK_CDS_ARCHIVE=$CONFIGURESUPPORT_OUTPUTDIR/classes.jsa
+  UTIL_ADD_JVM_ARG_IF_OK([-XX:+UnlockDiagnosticVMOptions -XX:-VerifySharedSpaces -XX:SharedArchiveFile=$BOOT_JDK_CDS_ARCHIVE],boot_jdk_cds_args,[$JAVA])
+
+  if test "x$boot_jdk_cds_args" != x; then
+    # Try creating a CDS archive
+    $JAVA $boot_jdk_cds_args -Xshare:dump > /dev/null 2>&1
+    if test $? -eq 0; then
+      BOOTJDK_USE_LOCAL_CDS=true
+      AC_MSG_RESULT([yes, created])
+    else
+      # Generation failed, don't use CDS.
+      BOOTJDK_USE_LOCAL_CDS=false
+      AC_MSG_RESULT([no, creation failed])
+    fi
+  else
+    BOOTJDK_USE_LOCAL_CDS=false
+    AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
+  fi
+
   BOOTJDK_SETUP_CLASSPATH
 ])
 
@@ -423,8 +444,13 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
   # Force en-US environment
   UTIL_ADD_JVM_ARG_IF_OK([-Duser.language=en -Duser.country=US],boot_jdk_jvmargs,[$JAVA])
 
-  UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=off:stdout],boot_jdk_jvmargs,[$JAVA])
-  UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=warning:stderr],boot_jdk_jvmargs,[$JAVA])
+  if test "x$BOOTJDK_USE_LOCAL_CDS" = xtrue; then
+    # Use our own CDS archive
+    UTIL_ADD_JVM_ARG_IF_OK([$boot_jdk_cds_args -Xshare:auto],boot_jdk_jvmargs,[$JAVA])
+  else
+    # Otherwise optimistically use the system-wide one, if one is present
+    UTIL_ADD_JVM_ARG_IF_OK([-Xshare:auto],boot_jdk_jvmargs,[$JAVA])
+  fi
 
   # Finally append user provided options to allow them to override.
   UTIL_ADD_JVM_ARG_IF_OK([$USER_BOOT_JDK_OPTIONS],boot_jdk_jvmargs,[$JAVA])
@@ -481,6 +507,8 @@ 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])
@@ -490,6 +518,8 @@ 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)
 
@@ -567,9 +597,10 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
   AC_ARG_WITH(build-jdk, [AS_HELP_STRING([--with-build-jdk],
       [path to JDK of same version as is being built@<:@the newly built JDK@:>@])])
 
-  EXTERNAL_BUILDJDK_PATH=""
+  CREATE_BUILDJDK=false
+  EXTERNAL_BUILDJDK=false
+  BUILD_JDK_FOUND="no"
   if test "x$with_build_jdk" != "x"; then
-    BUILD_JDK_FOUND=no
     BOOTJDK_CHECK_BUILD_JDK([
       if test "x$with_build_jdk" != x; then
         BUILD_JDK=$with_build_jdk
@@ -577,15 +608,40 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
         AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
       fi
     ])
-    if test "x$BUILD_JDK_FOUND" != "xyes"; then
+    EXTERNAL_BUILDJDK=true
+  else
+    if test "x$COMPILE_TYPE" = "xcross"; then
+      BUILD_JDK="\$(BUILDJDK_OUTPUTDIR)/jdk"
+      BUILD_JDK_FOUND=yes
+      CREATE_BUILDJDK=true
       AC_MSG_CHECKING([for Build JDK])
-      AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Could not find a suitable Build JDK])
+      AC_MSG_RESULT([yes, will build it for the host platform])
+    else
+      BUILD_JDK="\$(JDK_OUTPUTDIR)"
+      BUILD_JDK_FOUND=yes
+      AC_MSG_CHECKING([for Build JDK])
+      AC_MSG_RESULT([yes, will use output dir])
     fi
-    EXTERNAL_BUILDJDK_PATH="$BUILD_JDK"
   fi
 
-  AC_SUBST(EXTERNAL_BUILDJDK_PATH)
+  # Since these tools do not yet exist, we cannot use UTIL_FIXUP_EXECUTABLE to
+  # detect the need of fixpath
+  JMOD="$BUILD_JDK/bin/jmod"
+  UTIL_ADD_FIXPATH(JMOD)
+  JLINK="$BUILD_JDK/bin/jlink"
+  UTIL_ADD_FIXPATH(JLINK)
+  AC_SUBST(JMOD)
+  AC_SUBST(JLINK)
+
+  if test "x$BUILD_JDK_FOUND" != "xyes"; then
+    AC_MSG_CHECKING([for Build JDK])
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([Could not find a suitable Build JDK])
+  fi
+
+  AC_SUBST(CREATE_BUILDJDK)
+  AC_SUBST(BUILD_JDK)
+  AC_SUBST(EXTERNAL_BUILDJDK)
 ])
 
 # The docs-reference JDK is used to run javadoc for the docs-reference targets.

make/autoconf/bootcycle-spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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,3 +44,7 @@ JAVAC_CMD := $(FIXPATH) $(BOOT_JDK)/bin/javac
 JAR_CMD := $(FIXPATH) $(BOOT_JDK)/bin/jar
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
+# Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
+# By filtering out those JVM args, the bootcycle JVM will use its default
+# settings for CDS.
+JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))

make/autoconf/build-performance.m4

@@ -162,7 +162,12 @@ AC_DEFUN([BPERF_SETUP_CCACHE],
   # Check if ccache is available
   CCACHE_AVAILABLE=true
 
-  UTIL_LOOKUP_TOOLCHAIN_PROGS(CCACHE, ccache)
+  OLD_PATH="$PATH"
+  if test "x$TOOLCHAIN_PATH" != x; then
+    PATH=$TOOLCHAIN_PATH:$PATH
+  fi
+  UTIL_LOOKUP_PROGS(CCACHE, ccache)
+  PATH="$OLD_PATH"
 
   AC_MSG_CHECKING([if ccache is available])
   if test "x$TOOLCHAIN_TYPE" != "xgcc" && test "x$TOOLCHAIN_TYPE" != "xclang"; then

make/autoconf/buildjdk-spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, 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
@@ -108,4 +108,3 @@ override EXTRA_LDFLAGS :=
 # hsdis is not needed
 HSDIS_BACKEND := none
 ENABLE_HSDIS_BUNDLING := false
-DEFAULT_PRINT_ASSEMBLY_OPTIONS :=

make/autoconf/compare.sh.template

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, 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
@@ -110,4 +110,4 @@ $MV $OUTPUTDIR/compare.log $OUTPUTDIR/compare.log.old 2> /dev/null
 
 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
 
-$BASH $TOPDIR/make/scripts/compare-logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
+$BASH $TOPDIR/make/scripts/logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"

make/autoconf/configure.ac

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -260,9 +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_NOCOH
-JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOOPS
-JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_PREVIEW
+JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH
 JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
 JDKOPT_SETUP_MACOSX_SIGNING
 JDKOPT_SETUP_SIGNING_HOOK

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -37,25 +37,56 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     # Default works for linux, might work on other platforms as well.
     SHARED_LIBRARY_FLAGS='-shared'
+    # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+    # This protects internal library dependencies within the JDK from being
+    # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
+    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
+    SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
       # Linking is different on MacOSX
       SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0"
+      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)'
+      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
 
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
       # Linking is different on aix
       SHARED_LIBRARY_FLAGS="-shared -Wl,-bM:SRE -Wl,-bnoentry"
+      SET_EXECUTABLE_ORIGIN=""
+      SET_SHARED_LIBRARY_ORIGIN=''
+      SET_SHARED_LIBRARY_NAME=''
 
     else
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
+      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
+      if test "x$OPENJDK_TARGET_OS" = xlinux; then
+        SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
+      fi
+      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+
+      # arm specific settings
+      if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
+        # '-Wl,-z,origin' isn't used on arm.
+        SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
+      else
+        SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
+      fi
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     SHARED_LIBRARY_FLAGS="-dll"
+    SET_EXECUTABLE_ORIGIN=''
+    SET_SHARED_LIBRARY_ORIGIN=''
+    SET_SHARED_LIBRARY_NAME=''
   fi
 
+  AC_SUBST(SET_EXECUTABLE_ORIGIN)
+  AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
+  AC_SUBST(SET_SHARED_LIBRARY_NAME)
   AC_SUBST(SHARED_LIBRARY_FLAGS)
 ])
 
@@ -69,19 +100,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # Debug prefix mapping if supported by compiler
   DEBUG_PREFIX_CFLAGS=
 
-  UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: literal,
-    DEFAULT: [auto], VALID_VALUES: [auto 1 2 3],
-    CHECK_AVAILABLE: [
-      if test x$TOOLCHAIN_TYPE = xmicrosoft; then
-        AVAILABLE=false
-      fi
-    ],
-    DESC: [set the native debug symbol level (GCC and Clang only)],
-    DEFAULT_DESC: [toolchain default],
-    IF_AUTO: [
-      RESULT=""
-    ])
-
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
@@ -106,9 +124,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
       )
     fi
 
-    # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
-    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    CFLAGS_DEBUG_SYMBOLS="-g -gdwarf-4"
+    ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
       # Check if compiler supports -fdebug-prefix-map. If so, use that to make
@@ -127,9 +144,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${GDWARF_FLAGS}],
         IF_FALSE: [GDWARF_FLAGS=""])
 
-    # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
-    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    CFLAGS_DEBUG_SYMBOLS="-g ${GDWARF_FLAGS}"
+    ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
@@ -209,12 +225,8 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-wd"
       CFLAGS_WARNINGS_ARE_ERRORS="-WX"
 
-      WARNINGS_ENABLE_ALL_NORMAL="-W3"
-      WARNINGS_ENABLE_ADDITIONAL=""
-      WARNINGS_ENABLE_ADDITIONAL_CXX=""
-      WARNINGS_ENABLE_ADDITIONAL_JVM=""
+      WARNINGS_ENABLE_ALL="-W3"
       DISABLED_WARNINGS="4800 5105"
-      CFLAGS_CONVERSION_WARNINGS=
       ;;
 
     gcc)
@@ -222,16 +234,14 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
-      WARNINGS_ENABLE_ALL_NORMAL="-Wall -Wextra"
-
       # Additional warnings that are not activated by -Wall and -Wextra
-      WARNINGS_ENABLE_ADDITIONAL="-Wformat=2 \
-          -Winvalid-pch -Wpointer-arith -Wreturn-type \
+      WARNINGS_ENABLE_ADDITIONAL="-Winvalid-pch -Wpointer-arith -Wreturn-type \
           -Wsign-compare -Wtrampolines -Wtype-limits -Wundef -Wuninitialized \
           -Wunused-const-variable=1 -Wunused-function -Wunused-result \
           -Wunused-value"
       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
-      WARNINGS_ENABLE_ADDITIONAL_JVM="-Wzero-as-null-pointer-constant"
+      WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
+      WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
       # These warnings will never be turned on, since they generate too many
       # false positives.
@@ -240,7 +250,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
         DISABLED_WARNINGS="$DISABLED_WARNINGS psabi"
       fi
-      CFLAGS_CONVERSION_WARNINGS="-Wconversion -Wno-float-conversion"
       ;;
 
     clang)
@@ -248,32 +257,22 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
-      WARNINGS_ENABLE_ALL_NORMAL="-Wall -Wextra"
-
       # Additional warnings that are not activated by -Wall and -Wextra
-      WARNINGS_ENABLE_ADDITIONAL="-Wformat=2 \
-          -Wpointer-arith -Wsign-compare -Wreorder \
+      WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wsign-compare -Wreorder \
           -Wunused-function -Wundef -Wunused-value -Woverloaded-virtual"
-      WARNINGS_ENABLE_ADDITIONAL_CXX=""
-      WARNINGS_ENABLE_ADDITIONAL_JVM="-Wzero-as-null-pointer-constant"
+      WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
 
       # These warnings will never be turned on, since they generate too many
       # false positives.
       DISABLED_WARNINGS="unknown-warning-option unused-parameter"
-      CFLAGS_CONVERSION_WARNINGS="-Wimplicit-int-conversion"
       ;;
   esac
-  WARNINGS_ENABLE_ALL="$WARNINGS_ENABLE_ALL_NORMAL $WARNINGS_ENABLE_ADDITIONAL"
-  WARNINGS_ENABLE_ALL_CXX="$WARNINGS_ENABLE_ALL $WARNINGS_ENABLE_ADDITIONAL_CXX"
-  WARNINGS_ENABLE_ALL_JVM="$WARNINGS_ENABLE_ALL_CXX $WARNINGS_ENABLE_ADDITIONAL_JVM"
-
   AC_SUBST(DISABLE_WARNING_PREFIX)
   AC_SUBST(BUILD_CC_DISABLE_WARNING_PREFIX)
   AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS)
   AC_SUBST(DISABLED_WARNINGS)
   AC_SUBST(DISABLED_WARNINGS_C)
   AC_SUBST(DISABLED_WARNINGS_CXX)
-  AC_SUBST(CFLAGS_CONVERSION_WARNINGS)
 ])
 
 AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
@@ -314,17 +313,10 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM="-O0"
     C_O_FLAG_NONE="-O0"
 
-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-      C_O_FLAG_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects"
-    else
-      C_O_FLAG_LTO="-flto -fno-strict-aliasing"
-    fi
-
     if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
       C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} -finline-functions"
       C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} -finline-functions"
       C_O_FLAG_HI="${C_O_FLAG_HI} -finline-functions"
-      C_O_FLAG_LTO="${C_O_FLAG_LTO} -ffat-lto-objects"
     fi
 
     # -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
@@ -356,7 +348,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM=""
     C_O_FLAG_NONE="-Od"
     C_O_FLAG_SIZE="-O1"
-    C_O_FLAG_LTO="-GL"
   fi
 
   # Now copy to C++ flags
@@ -368,7 +359,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   CXX_O_FLAG_DEBUG_JVM="$C_O_FLAG_DEBUG_JVM"
   CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
   CXX_O_FLAG_SIZE="$C_O_FLAG_SIZE"
-  CXX_O_FLAG_LTO="$C_O_FLAG_LTO"
 
   # Adjust optimization flags according to debug level.
   case $DEBUG_LEVEL in
@@ -401,15 +391,12 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   AC_SUBST(C_O_FLAG_NORM)
   AC_SUBST(C_O_FLAG_NONE)
   AC_SUBST(C_O_FLAG_SIZE)
-  AC_SUBST(C_O_FLAG_LTO)
-
   AC_SUBST(CXX_O_FLAG_HIGHEST_JVM)
   AC_SUBST(CXX_O_FLAG_HIGHEST)
   AC_SUBST(CXX_O_FLAG_HI)
   AC_SUBST(CXX_O_FLAG_NORM)
   AC_SUBST(CXX_O_FLAG_NONE)
   AC_SUBST(CXX_O_FLAG_SIZE)
-  AC_SUBST(CXX_O_FLAG_LTO)
 ])
 
 AC_DEFUN([FLAGS_SETUP_CFLAGS],
@@ -544,9 +531,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
     TOOLCHAIN_CFLAGS_JDK="-fvisibility=hidden -pipe -fstack-protector"
     # reduce lib size on linux in link step, this needs also special compile flags
+    # do this on s390x also for libjvm (where serviceability agent is not supported)
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
-      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
+      if test "x$OPENJDK_TARGET_CPU" = xs390x && test "x$DEBUG_LEVEL" == xrelease; then
+        TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
+      fi
     fi
     # technically NOT for CXX (but since this gives *worse* performance, use
     # no-strict-aliasing everywhere!)
@@ -575,11 +565,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
       TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX
     fi
 
-    if test "x$ENABLE_LINKTIME_GC" = xtrue; then
-      TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
-      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
-    fi
-
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno"
       TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char"
@@ -623,9 +608,19 @@ 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_JVM="$WARNINGS_ENABLE_ALL_JVM"
+  # Set JVM_CFLAGS warning handling
+  if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL_CFLAGS"
+    WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXXFLAGS"
+    WARNING_CFLAGS_JVM="$WARNINGS_ENABLE_ALL_CXXFLAGS"
+
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    WARNING_CFLAGS="$WARNINGS_ENABLE_ALL"
+
+  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+    WARNING_CFLAGS="$WARNINGS_ENABLE_ALL"
+
+  fi
 
   # Set some additional per-OS defines.
 
@@ -887,12 +882,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
-      $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
+      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
       $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
-      $DEBUG_SYMBOLS_CFLAGS_JDK \
+      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
       $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
@@ -939,6 +934,48 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         IF_FALSE: [$2FDLIBM_CFLAGS=""])
   fi
   AC_SUBST($2FDLIBM_CFLAGS)
+
+  # Check whether the compiler supports the Arm C Language Extensions (ACLE)
+  # for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
+  # ACLE and this flag are required to build the aarch64 SVE related functions in
+  # libvectormath. Apple Silicon does not support SVE; use macOS as a proxy for
+  # that check.
+  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+      AC_LANG_PUSH(C)
+      OLD_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -march=armv8-a+sve"
+      AC_MSG_CHECKING([if Arm SVE ACLE is supported])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <arm_sve.h>],
+          [
+            svint32_t r = svdup_n_s32(1);
+            return 0;
+          ])],
+          [
+            AC_MSG_RESULT([yes])
+            $2SVE_CFLAGS="-march=armv8-a+sve"
+            # Switching the initialization mode with gcc from 'pattern' to 'zero'
+            # avoids the use of unsupported `__builtin_clear_padding` for variable
+            # length aggregates
+            if test "x$DEBUG_LEVEL" != xrelease && test "x$TOOLCHAIN_TYPE" = xgcc ; then
+              INIT_ZERO_FLAG="-ftrivial-auto-var-init=zero"
+              FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$INIT_ZERO_FLAG],
+                IF_TRUE: [
+                  $2SVE_CFLAGS="${$2SVE_CFLAGS} $INIT_ZERO_FLAG"
+                ]
+              )
+            fi
+          ],
+          [
+            AC_MSG_RESULT([no])
+            $2SVE_CFLAGS=""
+          ]
+      )
+      CFLAGS="$OLD_CFLAGS"
+      AC_LANG_POP(C)
+    fi
+  fi
+  AC_SUBST($2SVE_CFLAGS)
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

make/autoconf/flags-ldflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -34,7 +34,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
-  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
+  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
 
   AC_SUBST(ADLC_LDFLAGS)
 ])
@@ -50,19 +50,17 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
     # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
-    # add --icf=all (Identical Code Folding — merges identical functions)
     BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
-
-    BASIC_LDFLAGS_JVM_ONLY=""
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
-      # keep vtables : -Wl,--undefined-glob=_ZTV* (but this seems not to work with gold ld)
-      # so keep at least the Metadata vtable that is used in the serviceability agent
-      BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,--gc-sections -Wl,--undefined=_ZTV8Metadata"
-      BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
+      if test "x$OPENJDK_TARGET_CPU" = xs390x; then
+        BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections"
+      else
+        BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
+      fi
     fi
 
-    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
+    BASIC_LDFLAGS_JVM_ONLY=""
 
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
@@ -70,32 +68,25 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
         -fPIC"
 
-    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
       # Clang needs the lld linker to work correctly
       BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL"
       if test "x$CXX_IS_USER_SUPPLIED" = xfalse && test "x$CC_IS_USER_SUPPLIED" = xfalse; then
-        UTIL_REQUIRE_TOOLCHAIN_PROGS(LLD, lld)
-      fi
-
-      if test "x$ENABLE_LINKTIME_GC" = xtrue; then
-        BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,--gc-sections -Wl,--undefined=_ZTV8Metadata"
-        BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
+        UTIL_REQUIRE_PROGS(LLD, lld, $TOOLCHAIN_PATH:$PATH)
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-blibpath:/usr/lib:lib -Wl,-bnoexpall \
-        -Wl,-bernotok -Wl,-bcdtors:mbr::s -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
+        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
       BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     BASIC_LDFLAGS="-opt:ref"
     BASIC_LDFLAGS_JDK_ONLY="-incremental:no"
-    BASIC_LDFLAGS_JVM_ONLY="-opt:noicf -subsystem:windows"
-    LDFLAGS_LTO="-LTCG:INCREMENTAL"
+    BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
   fi
 
   if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
@@ -107,10 +98,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup OS-dependent LDFLAGS
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test x$DEBUG_LEVEL = xrelease; then
-      BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,-dead_strip"
-    fi
-    # FIXME: We should really generalize SetSharedLibraryOrigin instead.
+    # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
     OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"
   fi
@@ -160,7 +148,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Export some intermediate variables for compatibility
   LDFLAGS_CXX_JDK="$DEBUGLEVEL_LDFLAGS_JDK_ONLY"
-  AC_SUBST(LDFLAGS_LTO)
   AC_SUBST(LDFLAGS_CXX_JDK)
   AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])
@@ -168,8 +155,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 ################################################################################
 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
 #      conditionals against.
-# $2 - Optional prefix for each variable defined (OPENJDK_BUILD_ or nothing).
-# $3 - Optional prefix for toolchain variables (BUILD_ or nothing).
+# $2 - Optional prefix for each variable defined.
 AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
 [
   # Setup CPU-dependent basic LDFLAGS. These can differ between the target and
@@ -203,12 +189,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
   fi
 
-  if test "x${$3LD_TYPE}" = "xgold"; then
-    if test x$DEBUG_LEVEL = xrelease; then
-      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--icf=all"
-    fi
-  fi
-
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
       $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"

make/autoconf/flags-other.m4

@@ -107,62 +107,6 @@ AC_DEFUN([FLAGS_SETUP_NMFLAGS],
   AC_SUBST(NMFLAGS)
 ])
 
-# Check whether the compiler supports the Arm C Language Extensions (ACLE)
-# for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
-# ACLE and this flag are required to build the aarch64 SVE related functions
-# in libvectormath.
-AC_DEFUN([FLAGS_SETUP_SVE],
-[
-  AARCH64_SVE_AVAILABLE=false
-  # Apple Silicon does not support SVE; use macOS as a proxy for that check.
-  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-      # check the compiler and binutils support sve or not
-      AC_MSG_CHECKING([if Arm SVE ACLE is supported])
-      AC_LANG_PUSH([C])
-      saved_cflags="$CFLAGS"
-      CFLAGS="$CFLAGS -march=armv8-a+sve $CFLAGS_WARNINGS_ARE_ERRORS ARG_ARGUMENT"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-        [
-          #include <arm_sve.h>
-          svfloat64_t a() {}
-        ],
-        [
-          svint32_t r = svdup_n_s32(1)
-        ])],
-        [
-          AARCH64_SVE_AVAILABLE=true
-        ]
-      )
-      CFLAGS="$saved_cflags"
-      AC_LANG_POP([C])
-      AC_MSG_RESULT([$AARCH64_SVE_AVAILABLE])
-    fi
-  fi
-
-  UTIL_ARG_ENABLE(NAME: aarch64-sve, DEFAULT: auto,
-    RESULT: AARCH64_SVE_ENABLED,
-    DESC: [Use SVE when compiling libsleef],
-    AVAILABLE: $AARCH64_SVE_AVAILABLE)
-  SVE_CFLAGS=""
-  if test "x$AARCH64_SVE_ENABLED" = xtrue; then
-    SVE_CFLAGS="-march=armv8-a+sve"
-    # Switching the initialization mode with gcc from 'pattern' to 'zero'
-    # avoids the use of unsupported `__builtin_clear_padding` for variable
-    # length aggregates
-    if test "x$DEBUG_LEVEL" != xrelease && test "x$TOOLCHAIN_TYPE" = xgcc ; then
-      AC_MSG_CHECKING([Switching the initialization mode with gcc from pattern to zero])
-      INIT_ZERO_FLAG="-ftrivial-auto-var-init=zero"
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$INIT_ZERO_FLAG],
-        IF_TRUE: [
-          SVE_CFLAGS="${SVE_CFLAGS} $INIT_ZERO_FLAG"
-        ]
-      )
-    fi
-  fi
-  AC_SUBST(SVE_CFLAGS)
-])
-
 ################################################################################
 # platform independent
 AC_DEFUN([FLAGS_SETUP_ASFLAGS],

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -319,10 +319,16 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
 AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 [
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+    CC_OUT_OPTION=-Fo
     if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
       AS_NON_ASM_EXTENSION_OPTION=-Ta
     fi
+  else
+    # The option used to specify the target .o,.a or .so file.
+    # When compiling, how to specify the to be created object file.
+    CC_OUT_OPTION='-o$(SPACE)'
   fi
+  AC_SUBST(CC_OUT_OPTION)
   AC_SUBST(AS_NON_ASM_EXTENSION_OPTION)
 
   # Generate make dependency files
@@ -368,7 +374,6 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
   FLAGS_SETUP_RCFLAGS
   FLAGS_SETUP_NMFLAGS
 
-  FLAGS_SETUP_SVE
   FLAGS_SETUP_ASFLAGS
   FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
   FLAGS_SETUP_ASFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])

make/autoconf/hotspot.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -95,13 +95,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
 [
-  # Should we build a JDK with/without sound ?
-  UTIL_ARG_ENABLE(NAME: jsound, DEFAULT: true,
-      RESULT: ENABLE_JSOUND,
-      DESC: [build with sound support],
-      CHECKING_MSG: [if we should build with sound support])
-  AC_SUBST(ENABLE_JSOUND)
-
   # Should we build a JDK without a graphical UI?
   UTIL_ARG_ENABLE(NAME: headless-only, DEFAULT: false,
       RESULT: ENABLE_HEADLESS_ONLY,
@@ -109,20 +102,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
       CHECKING_MSG: [if we should build headless-only (no GUI)])
   AC_SUBST(ENABLE_HEADLESS_ONLY)
 
-  # Avoid headless-only on macOS and Windows, it is not supported there
-  if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
-    if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      AC_MSG_ERROR([headless-only is not supported on macOS and Windows])
-    fi
-  fi
-
   # should we linktime gc unused code sections in the JDK build ?
-  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    if test "x$OPENJDK_TARGET_CPU" = "xs390x" || test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
-      LINKTIME_GC_DEFAULT=true
-    else
-      LINKTIME_GC_DEFAULT=false
-    fi
+  if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = xs390x; then
+    LINKTIME_GC_DEFAULT=true
   else
     LINKTIME_GC_DEFAULT=false
   fi
@@ -330,48 +312,27 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
   AC_SUBST(COPY_DEBUG_SYMBOLS)
   AC_SUBST(ZIP_EXTERNAL_DEBUG_SYMBOLS)
 
-  # Should we enable objcopy debuginfo compression ?
-  UTIL_ARG_ENABLE(NAME: objcopy-debuginfo-compression, DEFAULT: false,
-      RESULT: ENABLE_OBJCOPY_DEBUGINFO_COMPRESSION,
-      DESC: [Set to enable compression in the debuginfo files (Linux only)],
-      CHECKING_MSG: [if debuginfo compression with objcopy is done],
-      IF_ENABLED: [ OBJCOPY_COMPRESS_FLAGS="--compress-debug-sections=zlib-gnu" ])
-  AC_SUBST(OBJCOPY_COMPRESS_FLAGS)
-
   # Should we add external native debug symbols to the shipped bundles?
   AC_MSG_CHECKING([if we should add external native debug symbols to the shipped bundles])
   AC_ARG_WITH([external-symbols-in-bundles],
       [AS_HELP_STRING([--with-external-symbols-in-bundles],
-      [which type of external native debug symbol information shall be shipped with bundles/images (none, public, full).
-      @<:@none in release builds, full otherwise. --with-native-debug-symbols=external/zipped is a prerequisite. public is only supported on Windows@:>@])],
-      [],
-      [with_external_symbols_in_bundles=default])
+      [which type of external native debug symbol information shall be shipped in product bundles (none, public, full)
+      (e.g. ship full/stripped pdbs on Windows) @<:@none@:>@])])
 
   if test "x$with_external_symbols_in_bundles" = x || test "x$with_external_symbols_in_bundles" = xnone ; then
     AC_MSG_RESULT([no])
   elif test "x$with_external_symbols_in_bundles" = xfull || test "x$with_external_symbols_in_bundles" = xpublic ; then
-    if test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external/zipped is used!])
-    elif test "x$with_external_symbols_in_bundles" = xpublic && test "x$OPENJDK_TARGET_OS" != xwindows ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles=public is only supported on Windows!])
-    fi
-
-    if test "x$with_external_symbols_in_bundles" = xfull ; then
+    if test "x$OPENJDK_TARGET_OS" != xwindows ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles currently only works on windows!])
+    elif test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external is used!])
+    elif test "x$with_external_symbols_in_bundles" = xfull ; then
       AC_MSG_RESULT([full])
       SHIP_DEBUG_SYMBOLS=full
     else
       AC_MSG_RESULT([public])
       SHIP_DEBUG_SYMBOLS=public
     fi
-  elif test "x$with_external_symbols_in_bundles" = xdefault ; then
-    if test "x$DEBUG_LEVEL" = xrelease ; then
-      AC_MSG_RESULT([no (default)])
-    elif test "x$COPY_DEBUG_SYMBOLS" = xtrue ; then
-      AC_MSG_RESULT([full (default)])
-      SHIP_DEBUG_SYMBOLS=full
-    else
-      AC_MSG_RESULT([no (default, native debug symbols are not external/zipped)])
-    fi
   else
     AC_MSG_ERROR([$with_external_symbols_in_bundles is an unknown value for --with-external-symbols-in-bundles])
   fi
@@ -604,14 +565,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
   # with an additional define LLVM_SYMBOLIZER, which we set here.
   # To calculate the correct llvm_symbolizer path we can use the location of the compiler, because
   # their relation is fixed.
-  # In the ubsan case we have to link every binary with the C++-compiler as linker, because inherently
-  # the C-Compiler and the C++-compiler used as linker provide a different set of ubsan exports.
-  # Linking an executable with the C-compiler and one of its shared libraries with the C++-compiler
-  # leeds to unresolved symbols.
   if test "x$TOOLCHAIN_TYPE" = "xclang" && test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    UBSAN_CFLAGS="$UBSAN_CFLAGS -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
-    UBSAN_LDFLAGS="$UBSAN_LDFLAGS -Wl,-bbigtoc"
-    LD="$LDCXX"
+      UBSAN_CFLAGS="$UBSAN_CFLAGS -fno-sanitize=function,vptr -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
+      UBSAN_LDFLAGS="$UBSAN_LDFLAGS -fno-sanitize=function,vptr -Wl,-bbigtoc"
   fi
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
       DESC: [enable UndefinedBehaviorSanitizer],
@@ -793,13 +749,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_NOCOH],
+AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH],
 [
-  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)],
-      CHECKING_MSG: [if default CDS archives for no compact object headers should be generated],
+  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)],
+      DEFAULT_DESC: [auto],
+      CHECKING_MSG: [if default CDS archives for compact object headers should be generated],
       CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if CDS archive with no compact object headers is available])
+        AC_MSG_CHECKING([if CDS archive with 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
@@ -816,23 +773,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOH],
           AVAILABLE=true
         fi
       ])
-  AC_SUBST(BUILD_CDS_ARCHIVE_NOCOH)
-])
-
-AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_NOCOOPS],
-[
-  UTIL_ARG_ENABLE(NAME: cds-archive-nocoops, DEFAULT: true, RESULT: BUILD_CDS_ARCHIVE_NOCOOPS,
-      DESC: [enable generation of no compressed oops CDS archives (requires --enable-cds-archive)],
-      CHECKING_MSG: [if default CDS archives for no compressed oops should be generated])
-  AC_SUBST(BUILD_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,
-      DESC: [enable generation of preview CDS archives (requires --enable-cds-archive)],
-      CHECKING_MSG: [if default CDS archives for preview should be generated])
-  AC_SUBST(BUILD_CDS_ARCHIVE_PREVIEW)
+  AC_SUBST(BUILD_CDS_ARCHIVE_COH)
 ])
 
 ################################################################################

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -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 \
-    jvmti link-time-opt management minimal opt-size parallelgc \
+    jvmci jvmti link-time-opt management minimal opt-size parallelgc \
     serialgc services shenandoahgc vm-structs zero zgc \
 ))
 
@@ -62,6 +62,7 @@ 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])
@@ -268,6 +269,26 @@ 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.
 #
@@ -355,6 +376,7 @@ 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
 
@@ -379,17 +401,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 \
-        minimal zgc"
+        jvmci 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 link-time-opt opt-size"
+    JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size"
   elif test "x$variant" = "xminimal"; then
     JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \
-        jfr jni-check jvmti management parallelgc services \
+        jfr jni-check jvmci 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"
@@ -399,7 +421,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
           link-time-opt"
     fi
   elif test "x$variant" = "xcore"; then
-    JVM_FEATURES_VARIANT_FILTER="compiler1 compiler2 \
+    JVM_FEATURES_VARIANT_FILTER="compiler1 compiler2 jvmci \
         link-time-opt opt-size"
   elif test "x$variant" = "xzero"; then
     JVM_FEATURES_VARIANT_FILTER="jfr link-time-opt opt-size"
@@ -495,6 +517,11 @@ 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
@@ -504,6 +531,9 @@ 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
@@ -529,6 +559,7 @@ 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
@@ -568,6 +599,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
   AC_SUBST(JVM_FEATURES_zero)
   AC_SUBST(JVM_FEATURES_custom)
 
+  AC_SUBST(INCLUDE_JVMCI)
   AC_SUBST(INCLUDE_COMPILER2)
 
 ])

make/autoconf/lib-bundled.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -267,8 +267,8 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
   LIBZ_LIBS=""
   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
-    if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix -o "x$OPENJDK_TARGET_OS" = xlinux; then
-        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1"
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
     fi
   else
     LIBZ_LIBS="-lz"

make/autoconf/lib-hsdis.m4

@@ -304,8 +304,6 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       # If we have libsframe add it.
       if test -e $BINUTILS_INSTALL_DIR/lib/libsframe.a; then
         HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib/libsframe.a"
-      elif test -e $BINUTILS_INSTALL_DIR/lib64/libsframe.a; then
-        HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib64/libsframe.a"
       fi
       AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
     else
@@ -417,9 +415,4 @@ AC_DEFUN_ONCE([LIB_SETUP_HSDIS],
     AC_MSG_RESULT([no])
   fi
   AC_SUBST(ENABLE_HSDIS_BUNDLING)
-
-  UTIL_ARG_WITH(NAME: print-assembly-options, TYPE: string,
-      DEFAULT: [], RESULT: DEFAULT_PRINT_ASSEMBLY_OPTIONS,
-      DESC: [default value for the PrintAssemblyOptions diagnostic flag, passed verbatim to the disassembler])
-  AC_SUBST(DEFAULT_PRINT_ASSEMBLY_OPTIONS)
 ])

make/autoconf/lib-tests.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2026, 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=8.3
+JTREG_MINIMUM_VERSION=7.5.2
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################

make/autoconf/libraries.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -42,12 +42,12 @@ m4_include([lib-tests.m4])
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
   # Check if X11 is needed
-  if test "x$OPENJDK_TARGET_OS" = xwindows ||
-     test "x$OPENJDK_TARGET_OS" = xmacosx ||
-     test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+  if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
   else
-    # All other instances need X11 for libawt.
+    # All other instances need X11, even if building headless only, libawt still
+    # needs X11 headers.
     NEEDS_LIB_X11=true
   fi
 
@@ -136,8 +136,12 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBPTHREAD"
   fi
 
-  # librt - for timers (timer_* functions)
+  # librt for legacy clock_gettime
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
+    # Hotspot needs to link librt to get the clock_* functions.
+    # But once our supported minimum build and runtime platform
+    # has glibc 2.17, this can be removed as the functions are
+    # in libc.
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lrt"
   fi
 
@@ -149,7 +153,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib"
+        ws2_32.lib winmm.lib version.lib psapi.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -174,6 +174,18 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=big
       ;;
+    sparc)
+      VAR_CPU=sparc
+      VAR_CPU_ARCH=sparc
+      VAR_CPU_BITS=32
+      VAR_CPU_ENDIAN=big
+      ;;
+    sparcv9|sparc64)
+      VAR_CPU=sparcv9
+      VAR_CPU_ARCH=sparc
+      VAR_CPU_BITS=64
+      VAR_CPU_ENDIAN=big
+      ;;
     *)
       AC_MSG_ERROR([unsupported cpu $1])
       ;;
@@ -299,12 +311,6 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   else
     OPENJDK_BUILD_OS_ENV="$VAR_OS"
   fi
-  # Special handling for MSYS2 that reports a Cygwin triplet as the default host triplet.
-  case `uname` in
-    MSYS*)
-      OPENJDK_BUILD_OS_ENV=windows.msys2
-      ;;
-  esac
   OPENJDK_BUILD_CPU="$VAR_CPU"
   OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
   OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"

make/autoconf/spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -329,8 +329,6 @@ HOTSPOT_OVERRIDE_LIBPATH := @HOTSPOT_OVERRIDE_LIBPATH@
 # Control use of precompiled header in hotspot libjvm build
 USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
 
-ENABLE_JSOUND := @ENABLE_JSOUND@
-
 # Only build headless support or not
 ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
 
@@ -371,9 +369,7 @@ ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
 EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
 
 BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
-BUILD_CDS_ARCHIVE_NOCOH := @BUILD_CDS_ARCHIVE_NOCOH@
-BUILD_CDS_ARCHIVE_NOCOOPS := @BUILD_CDS_ARCHIVE_NOCOOPS@
-BUILD_CDS_ARCHIVE_PREVIEW := @BUILD_CDS_ARCHIVE_PREVIEW@
+BUILD_CDS_ARCHIVE_COH := @BUILD_CDS_ARCHIVE_COH@
 
 ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
 
@@ -385,28 +381,14 @@ HSDIS_CFLAGS := @HSDIS_CFLAGS@
 HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
 HSDIS_LIBS := @HSDIS_LIBS@
 CAPSTONE_ARCH_AARCH64_NAME := @CAPSTONE_ARCH_AARCH64_NAME@
-DEFAULT_PRINT_ASSEMBLY_OPTIONS := @DEFAULT_PRINT_ASSEMBLY_OPTIONS@
 
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.
 BOOT_JDK := @BOOT_JDK@
 
-EXTERNAL_BUILDJDK_PATH := @EXTERNAL_BUILDJDK_PATH@
-
-ifneq ($(EXTERNAL_BUILDJDK_PATH), )
-  EXTERNAL_BUILDJDK := true
-  CREATE_BUILDJDK := false
-  BUILD_JDK := $(EXTERNAL_BUILDJDK_PATH)
-else
-  EXTERNAL_BUILDJDK := false
-  ifeq ($(COMPILE_TYPE), cross)
-    CREATE_BUILDJDK := true
-    BUILD_JDK := $(BUILDJDK_OUTPUTDIR)/jdk
-  else
-    CREATE_BUILDJDK := false
-    BUILD_JDK := $(JDK_OUTPUTDIR)
-  endif
-endif
+BUILD_JDK := @BUILD_JDK@
+CREATE_BUILDJDK := @CREATE_BUILDJDK@
+EXTERNAL_BUILDJDK := @EXTERNAL_BUILDJDK@
 
 # Whether the boot jdk jar supports --date=TIMESTAMP
 BOOT_JDK_JAR_SUPPORTS_DATE := @BOOT_JDK_JAR_SUPPORTS_DATE@
@@ -509,6 +491,7 @@ CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
 # Legacy support
 HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
 
+CC_OUT_OPTION := @CC_OUT_OPTION@
 AS_NON_ASM_EXTENSION_OPTION := @AS_NON_ASM_EXTENSION_OPTION@
 
 # Flags used for overriding the default opt setting for a C/C++ source file.
@@ -518,14 +501,12 @@ C_O_FLAG_HI := @C_O_FLAG_HI@
 C_O_FLAG_NORM := @C_O_FLAG_NORM@
 C_O_FLAG_NONE := @C_O_FLAG_NONE@
 C_O_FLAG_SIZE := @C_O_FLAG_SIZE@
-C_O_FLAG_LTO := @C_O_FLAG_LTO@
 CXX_O_FLAG_HIGHEST_JVM := @CXX_O_FLAG_HIGHEST_JVM@
 CXX_O_FLAG_HIGHEST := @CXX_O_FLAG_HIGHEST@
 CXX_O_FLAG_HI := @CXX_O_FLAG_HI@
 CXX_O_FLAG_NORM := @CXX_O_FLAG_NORM@
 CXX_O_FLAG_NONE := @CXX_O_FLAG_NONE@
 CXX_O_FLAG_SIZE := @CXX_O_FLAG_SIZE@
-CXX_O_FLAG_LTO  := @CXX_O_FLAG_LTO@
 
 GENDEPS_FLAGS := @GENDEPS_FLAGS@
 
@@ -534,7 +515,6 @@ CFLAGS_WARNINGS_ARE_ERRORS := @CFLAGS_WARNINGS_ARE_ERRORS@
 DISABLED_WARNINGS := @DISABLED_WARNINGS@
 DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
 DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
-CFLAGS_CONVERSION_WARNINGS := @CFLAGS_CONVERSION_WARNINGS@
 
 # A global flag (true or false) determining if native warnings are considered errors.
 WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
@@ -595,9 +575,6 @@ LDFLAGS_CXX_JDK := @LDFLAGS_CXX_JDK@
 # LDFLAGS specific to partial linking.
 LDFLAGS_CXX_PARTIAL_LINKING := @LDFLAGS_CXX_PARTIAL_LINKING@
 
-# LDFLAGS specific to link time optimization
-LDFLAGS_LTO := @LDFLAGS_LTO@
-
 # Sometimes a different linker is needed for c++ libs
 LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.
@@ -639,7 +616,6 @@ METALLIB := @METALLIB@
 COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@
 COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
 ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
-OBJCOPY_COMPRESS_FLAGS := @OBJCOPY_COMPRESS_FLAGS@
 
 CFLAGS_DEBUG_SYMBOLS := @CFLAGS_DEBUG_SYMBOLS@
 ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
@@ -648,8 +624,17 @@ ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
 # Compress (or not) jars
 COMPRESS_JARS := @COMPRESS_JARS@
 
+# Options to linker to specify the library name.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@
+
 SHARED_LIBRARY_FLAGS := @SHARED_LIBRARY_FLAGS@
 
+# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
+SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
+
 LIBRARY_PREFIX := @LIBRARY_PREFIX@
 SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
 STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
@@ -672,8 +657,8 @@ JAVA_CMD := @JAVA@
 JAVAC_CMD := @JAVAC@
 JAVADOC_CMD := @JAVADOC@
 JAR_CMD := @JAR@
-JLINK_CMD := @FIXPATH@ $(BUILD_JDK)/bin/jlink
-JMOD_CMD := @FIXPATH@ $(BUILD_JDK)/bin/jmod
+JLINK_CMD := @JLINK@
+JMOD_CMD := @JMOD@
 # These variables are meant to be used. They are defined with = instead of := to make
 # it possible to override only the *_CMD variables.
 JAVA = $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
@@ -848,6 +833,7 @@ PNG_CFLAGS := @PNG_CFLAGS@
 
 # Misc
 INCLUDE_SA := @INCLUDE_SA@
+INCLUDE_JVMCI := @INCLUDE_JVMCI@
 INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
 
 OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
@@ -895,6 +881,14 @@ 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
@@ -904,14 +898,12 @@ JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
 JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
 JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
 JRE_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JDK_MACOSX_BUNDLE_TOP_SUBDIR = jdk-$(VERSION_NUMBER).jdk
-JRE_MACOSX_BUNDLE_TOP_SUBDIR = jre-$(VERSION_NUMBER).jre
-JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_SUBDIR)/Contents
-JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_SUBDIR)/Contents
+JDK_MACOSX_BUNDLE_TOP_DIR = jdk-$(VERSION_NUMBER).jdk
+JRE_MACOSX_BUNDLE_TOP_DIR = jre-$(VERSION_NUMBER).jre
+JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
+JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
 JDK_MACOSX_CONTENTS_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
 JRE_MACOSX_CONTENTS_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
-JDK_MACOSX_BUNDLE_TOP_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_BUNDLE_TOP_SUBDIR)
-JRE_MACOSX_BUNDLE_TOP_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_BUNDLE_TOP_SUBDIR)
 
 # Bundle names
 ifneq ($(VERSION_BUILD), )
@@ -939,6 +931,7 @@ 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)
 

make/autoconf/toolchain.m4

@@ -276,6 +276,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   ORG_CFLAGS="$CFLAGS"
   ORG_CXXFLAGS="$CXXFLAGS"
 
+  # autoconf magic only relies on PATH, so update it if tools dir is specified
+  OLD_PATH="$PATH"
+
   if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
     if test "x$XCODEBUILD" != x; then
       XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2> /dev/null | $HEAD -n 1`
@@ -297,10 +300,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   fi
   AC_SUBST(TOOLCHAIN_VERSION)
 
-  # For the microsoft toolchain the toolchain path needs to be added to the
-  # normal path, or the compiler will not work in some situations in later
-  # configure checks.
-  if test "x$TOOLCHAIN_TYPE" = "xmicrosoft" && test "x$TOOLCHAIN_PATH" != x; then
+  # Finally prepend TOOLCHAIN_PATH to the PATH, to allow --with-tools-dir to
+  # override all other locations.
+  if test "x$TOOLCHAIN_PATH" != x; then
     export PATH=$TOOLCHAIN_PATH:$PATH
   fi
 ])
@@ -308,6 +310,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
 # Restore path, etc
 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 situations in later configure checks.
+  if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
+    PATH="$OLD_PATH"
+  fi
+
   # Restore the flags to the user specified values.
   # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
   CFLAGS="$ORG_CFLAGS"
@@ -516,7 +525,6 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*) .*/\1/'` ]
-      $1_TYPE=gold
     else
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
@@ -692,8 +700,6 @@ 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'])

make/autoconf/toolchain_microsoft.m4

@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2022 2019 2026"
+VALID_VS_VERSIONS="2022 2019"
 
 VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
 VS_VERSION_INTERNAL_2019=142
@@ -57,21 +57,6 @@ VS_SDK_PLATFORM_NAME_2022=
 VS_SUPPORTED_2022=true
 VS_TOOLSET_SUPPORTED_2022=true
 
-VS_DESCRIPTION_2026="Microsoft Visual Studio 2026"
-VS_VERSION_INTERNAL_2026=145
-VS_MSVCR_2026=vcruntime140.dll
-VS_VCRUNTIME_1_2026=vcruntime140_1.dll
-VS_MSVCP_2026=msvcp140.dll
-VS_ENVVAR_2026="VS180COMNTOOLS"
-VS_USE_UCRT_2026="true"
-VS_VS_INSTALLDIR_2026="Microsoft Visual Studio/18"
-VS_EDITIONS_2026="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2026=
-VS_VS_PLATFORM_NAME_2026="v145"
-VS_SDK_PLATFORM_NAME_2026=
-VS_SUPPORTED_2026=true
-VS_TOOLSET_SUPPORTED_2026=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -217,12 +202,10 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
     TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
         [$PROGRAMFILES_X86/$VS_INSTALL_DIR], [well-known name])
   fi
-  # Derive system drive root from CMD (which is at <drive>/windows/system32/cmd.exe)
-  WINSYSDRIVE_ROOT="$(dirname "$(dirname "$(dirname "$CMD")")")"
   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-      [$WINSYSDRIVE_ROOT/program files/$VS_INSTALL_DIR], [well-known name])
+      [c:/program files/$VS_INSTALL_DIR], [well-known name])
   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$TARGET_CPU], [$VS_VERSION],
-      [$WINSYSDRIVE_ROOT/program files (x86)/$VS_INSTALL_DIR], [well-known name])
+      [c:/program files (x86)/$VS_INSTALL_DIR], [well-known name])
   if test "x$SDK_INSTALL_DIR" != x; then
     if test "x$ProgramW6432" != x; then
       TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
@@ -237,9 +220,9 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
           [$PROGRAMFILES/$SDK_INSTALL_DIR], [well-known name])
     fi
     TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$WINSYSDRIVE_ROOT/program files/$SDK_INSTALL_DIR], [well-known name])
+        [c:/program files/$SDK_INSTALL_DIR], [well-known name])
     TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$TARGET_CPU], [$VS_VERSION],
-        [$WINSYSDRIVE_ROOT/program files (x86)/$SDK_INSTALL_DIR], [well-known name])
+        [c:/program files (x86)/$SDK_INSTALL_DIR], [well-known name])
   fi
 
   VCVARS_VER=auto
@@ -340,7 +323,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV],
   OLDPATH="$PATH"
   # Make sure we only capture additions to PATH needed by VS.
   # Clear out path, but need system dir present for vsvars cmd file to be able to run
-  export PATH="$(dirname "$CMD")"
+  export PATH=$WINENV_PREFIX/c/windows/system32
   # The "| cat" is to stop SetEnv.Cmd to mess with system colors on some systems
   # We can't pass -vcvars_ver=$VCVARS_VER here because cmd.exe eats all '='
   # in bat file arguments. :-(

make/autoconf/util_paths.m4

@@ -458,18 +458,17 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
 
 ################################################################################
 # Call UTIL_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool. This will look
-# first for tools using the cross-compilation prefix, and then for tools without
-# this prefix. For each of these name variants, it will look first in the
-# toolchain path, and then in the normal path.
+# first for cross-compilation tools.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
+# $3: [path]
 AC_DEFUN([UTIL_LOOKUP_TOOLCHAIN_PROGS],
 [
   if test "x$ac_tool_prefix" = x; then
-    UTIL_LOOKUP_PROGS($1, $2, [$TOOLCHAIN_PATH:$PATH])
+    UTIL_LOOKUP_PROGS($1, $2, $3)
   else
     prefixed_names=$(for name in $2; do echo ${ac_tool_prefix}${name} $name; done)
-    UTIL_LOOKUP_PROGS($1, $prefixed_names, [$TOOLCHAIN_PATH:$PATH])
+    UTIL_LOOKUP_PROGS($1, $prefixed_names, $3)
   fi
 ])
 
@@ -498,9 +497,10 @@ AC_DEFUN([UTIL_REQUIRE_PROGS],
 # Like UTIL_LOOKUP_PROGS but fails if no tool was found.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
+# $3: [path]
 AC_DEFUN([UTIL_REQUIRE_TOOLCHAIN_PROGS],
 [
-  UTIL_LOOKUP_TOOLCHAIN_PROGS($1, $2)
+  UTIL_LOOKUP_TOOLCHAIN_PROGS($1, $2, $3)
   UTIL_CHECK_NONEMPTY($1)
 ])
 

make/common/Execute.gmk

@@ -82,8 +82,6 @@ ifeq ($(INCLUDE), true)
 #   INFO        : Message to display at LOG=info level when running command (optional)
 #   WARN        : Message to display at LOG=warn level when running command (optional)
 #   DEPS        : Dependencies for the execution to take place
-#   DRYRUN      : Set to true to perform everything but executing the command \
-#                 (defaults to false, primarily intended for debugging)
 #
 
 # Setup make rules for copying files, with an option to do more complex
@@ -148,12 +146,9 @@ define SetupExecuteBody
     $1_INFO := Running commands for $1
   endif
 
-  $1_VARDEPS := $$($1_COMMAND) $$($1_PRE_COMMAND) $$($1_POST_COMMAND)
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BASE)_exec.vardeps)
-
   ifneq ($$($1_PRE_COMMAND), )
 
-    $$($1_PRE_MARKER): $$($1_DEPS) $$($1_VARDEPS_FILE)
+    $$($1_PRE_MARKER): $$($1_DEPS)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif
@@ -166,20 +161,15 @@ define SetupExecuteBody
 	$$(TOUCH) $$@
 
     $$($1_EXEC_RESULT): $$($1_PRE_MARKER)
-        ifneq ($$($1_DRYRUN), true)
-	  $$(call ExecuteWithLog, $$($1_BASE)_exec, \
-	      cd $$($1_WORKING_DIR) && $$($1_COMMAND))
-        else
-	  $$(call LogWarn, DRYRUN enabled for $1, not actually running command)
-	  $$(TOUCH) $$@
-        endif
+	$$(call ExecuteWithLog, $$($1_BASE)_exec, \
+	    cd $$($1_WORKING_DIR) && $$($1_COMMAND))
         ifeq ($$($1_EXEC_RESULT), $$($1_EXEC_MARKER))
 	  $$(TOUCH) $$@
         endif
 
     $1 := $$($1_PRE_MARKER) $$($1_EXEC_RESULT)
   else
-    $$($1_EXEC_RESULT): $$($1_DEPS) $$($1_VARDEPS_FILE)
+    $$($1_EXEC_RESULT): $$($1_DEPS)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif
@@ -187,13 +177,8 @@ define SetupExecuteBody
 	  $$(call LogInfo, $$($1_INFO))
         endif
 	$$(call MakeDir, $$(call EncodeSpace, $$($1_WORKING_DIR)) $$(call EncodeSpace, $$($1_SUPPORT_DIR)) $$(call EncodeSpace, $$($1_OUTPUT_DIR)))
-        ifneq ($$($1_DRYRUN), true)
-	  $$(call ExecuteWithLog, $$($1_BASE)_exec, \
-	      cd $$($1_WORKING_DIR) && $$($1_COMMAND))
-        else
-	  $$(call LogWarn, DRYRUN enabled for $1, not actually running command)
-	  $$(TOUCH) $$@
-        endif
+	$$(call ExecuteWithLog, $$($1_BASE)_exec, \
+	    cd $$($1_WORKING_DIR) && $$($1_COMMAND))
         ifeq ($$($1_EXEC_RESULT), $$($1_EXEC_MARKER))
 	  $$(TOUCH) $$@
         endif

make/common/JdkNativeCompilation.gmk

@@ -30,47 +30,6 @@ ifeq ($(INCLUDE), true)
 
 include NativeCompilation.gmk
 
-ifeq ($(call isCompiler, gcc), true)
-  # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
-  # This protects internal library dependencies within the JDK from being
-  # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
-  SetExecutableOrigin = \
-      -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
-  SetSharedLibraryOrigin = \
-      -Wl,-z,origin -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
-else ifeq ($(call isCompiler, clang), true)
-  ifeq ($(call isTargetOs, macosx), true)
-    SetExecutableOrigin = \
-        -Wl,-rpath,@loader_path$(or $1,/.)
-    SetSharedLibraryOrigin = \
-        -Wl,-rpath,@loader_path$(or $1,/.)
-  else ifeq ($(call isTargetOs, aix), true)
-    SetExecutableOrigin =
-    SetSharedLibraryOrigin =
-  else
-    ifeq ($(call isTargetOs, linux), true)
-      SetExecutableOrigin = \
-          -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
-    else
-      SetExecutableOrigin = \
-          -Wl,-rpath,\$(DOLLAR)ORIGIN$1
-    endif
-
-    ifeq ($(call isTargetOs, arm), true)
-      SetSharedLibraryOrigin = \
-          -Wl,-rpath,\$(DOLLAR)ORIGIN$1
-    else
-      SetSharedLibraryOrigin = \
-          -Wl,-z,origin -Wl,-rpath,\$(DOLLAR)ORIGIN$1
-    endif
-  endif
-else ifeq ($(call isCompiler, microsoft), true)
-  SetExecutableOrigin =
-  SetSharedLibraryOrigin =
-else
-  $(error Unknown toolchain)
-endif
-
 FindSrcDirsForComponent += \
   $(call uniq, $(wildcard \
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \
@@ -485,9 +444,9 @@ define SetupJdkNativeCompilationBody
 
   ifneq ($$($1_LD_SET_ORIGIN), false)
     ifeq ($$($1_TYPE), EXECUTABLE)
-      $1_LDFLAGS += $$(call SetExecutableOrigin)
+      $1_LDFLAGS += $$(call SET_EXECUTABLE_ORIGIN)
     else
-      $1_LDFLAGS += $$(call SetSharedLibraryOrigin)
+      $1_LDFLAGS += $$(call SET_SHARED_LIBRARY_ORIGIN)
     endif
   endif
   # APPEND_LDFLAGS, if it exists, must be set after the origin flags

make/common/MakeBase.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -141,66 +141,6 @@ endef
 # Make sure logging is setup for everyone that includes MakeBase.gmk.
 $(eval $(call SetupLogging))
 
-################################################################################
-# Make does not have support for VARARGS, you can send variable amount
-# of arguments, but you can for example not append a list at the end.
-# It is therefore not easy to send the elements of a list of unknown
-# length as argument to a function. This can somewhat be worked around
-# by sending a list as an argument, and then interpreting each element
-# of the list as an argument to the function. However, Make is
-# limited, and using this method you can not easily send spaces.
-#
-# We need to quote strings for two reasons when sending them as
-# "variable append packs":
-#
-# 1) variable appends can include spaces, and those must be preserved
-# 2) variable appends can include assignment strings ":=", and those
-# must be quoted to a form so that we can recognise the "append pack".
-# We recognise an "append pack" by its lack of strict assignment ":="
-
-Q       := $(HASH)
-SpaceQ  := $(Q)s
-AppendQ := $(Q)+
-AssignQ := $(Q)a
-QQ      := $(Q)$(Q)
-
-# $(call Quote,echo "#trala:=") -> echo#s"##trala#a"
-Quote = $(subst :=,$(AssignQ),$(subst $(SPACE),$(SpaceQ),$(subst $(Q),$(QQ),$1)))
-
-# $(call Unquote,echo#s"##trala#a") -> echo "#trala:="
-Unquote = $(subst $(QQ),$(Q),$(subst $(SpaceQ),$(SPACE),$(subst $(AssignQ),:=,$1)))
-
-# $(call QuoteAppend,name,some value) -> name#+some#svalue
-# $(call QuoteAppend,bad+=name,some value) -> error
-QuoteAppend = $(if $(findstring +=,$1),$(error you can not have += in a variable name: "$1"),$(call Quote,$1)$(AppendQ)$(call Quote,$2))
-
-# $(call UnquoteAppendIndex,name#+some#svalue,1) -> name
-# $(call UnquoteAppendIndex,name#+some#svalue,2) -> some value
-UnquoteAppendIndex = $(call Unquote,$(word $2,$(subst $(AppendQ),$(SPACE),$1)))
-
-# $(call FilterFiles,dir,%.cpp) -> file1.cpp file2.cpp (without path)
-FilterFiles = $(filter $2,$(notdir $(call FindFiles,$1)))
-
-# $(call Unpack module_,file1.cpp_CXXFLAGS#+-Wconversion file2.cpp_CXXFLAGS#+-Wconversion) -> module_file1.cpp_CXXFLAGS += -Wconversion
-#                                                                                             module_file2.cpp_CXXFLAGS += -Wconversion
-Unpack = $(foreach pair,$2,$1$(call UnquoteAppendIndex,$(pair),1) += $(call UnquoteAppendIndex,$(pair),2)$(NEWLINE))
-
-# This macro takes four arguments:
-# $1: directory where to find files (striped), example: $(TOPDIR)/src/hotspot/share/gc/g1
-# $2: filter to match what to keep (striped), example: g1Concurrent%.cpp
-# $3: what flags to override (striped), example: _CXXFLAGS
-# $4: what value to append to the flag (striped), example: $(CFLAGS_CONVERSION_WARNINGS)
-#
-# The result will be a quoted string that can be unpacked to a list of
-# variable appendings (see macro Unpack above). You do not need to take
-# care of unpacking, it is done in NamedParamsMacroTemplate.
-#
-# This feature should only be used for warnings that we want to
-# incrementally add to the rest of the code base.
-#
-# $(call ExtendFlags,dir,%.cpp,_CXXFLAGS,-Wconversion) -> file1.cpp_CXXFLAGS#+-Wconversion file2.cpp_CXXFLAGS#+-Wconversion
-ExtendFlags = $(foreach file,$(call FilterFiles,$(strip $1),$(strip $2)),$(call QuoteAppend,$(file)$(strip $3),$(strip $4)))
-
 ################################################################################
 
 MAX_PARAMS := 96
@@ -226,10 +166,7 @@ define NamedParamsMacroTemplate
       Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk))
   # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix
   $(foreach i, $(PARAM_SEQUENCE), $(if $(strip $($i)), \
-    $(if $(findstring :=,$($i)), \
-      $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE), \
-      $(call Unpack,$(strip $1)_,$($i)))))
-
+    $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE)))
   # Debug print all named parameter names and values
   $(if $(findstring $(LOG_LEVEL), trace), \
     $(info $0 $(strip $1) $(foreach i, $(PARAM_SEQUENCE), \

make/common/Modules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -54,6 +54,13 @@ 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
@@ -68,12 +75,6 @@ GENERATED_SRC_DIRS += \
     $(SUPPORT_OUTPUTDIR)/gensrc \
     #
 
-# Directories in which generated preview classes may exist.
-# Currently this is restricted to generated value classes, but can be extended.
-GENERATED_PREVIEW_SUBDIRS += \
-    $(SUPPORT_OUTPUTDIR)/gensrc-valueclasses \
-    #
-
 TOP_SRC_DIRS += \
     $(TOPDIR)/src \
     #
@@ -143,13 +144,6 @@ FindModuleSrcDirs = \
         $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
 
-# Find preview class source dirs for a particular module.
-# Currently this is restricted to generated value classes, but can be extended.
-# $1 - Module to find source dirs for
-FindModulePreviewSrcDirs = \
-    $(strip $(wildcard \
-        $(addsuffix /$(strip $1), $(GENERATED_PREVIEW_SUBDIRS))))
-
 # Find all specs dirs for a particular module
 # $1 - Module to find specs dirs for
 FindModuleSpecsDirs = \
@@ -172,13 +166,6 @@ GetModuleSrcPath = \
         $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
 
-# Construct the complete module source path for preview classes.
-# Currently this is restricted to generated value classes, but can be extended.
-GetModulePreviewSrcPath = \
-    $(call PathList, \
-        $(addsuffix /*, $(GENERATED_PREVIEW_SUBDIRS) $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
-        $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
-
 ################################################################################
 # Extract module dependencies from module-info.java files, both normal
 # dependencies ("requires"), and indirect exports ("requires transitive").

make/common/NativeCompilation.gmk

@@ -98,7 +98,6 @@ include native/Paths.gmk
 #   SYSROOT_CFLAGS the compiler flags for using the specific sysroot
 #   SYSROOT_LDFLAGS the linker flags for using the specific sysroot
 #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE
-#   LINK_TIME_OPTIMIZATION if set to true, enables link time optimization
 #   DISABLED_WARNINGS_<toolchain> Disable the given warnings for the specified toolchain
 #   DISABLED_WARNINGS_<toolchain>_<OS> Disable the given warnings for the specified
 #       toolchain and target OS

make/common/Utils.gmk

@@ -114,7 +114,7 @@ EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
 
 ################################################################################
 # This macro works just like EscapeDollar above, but for #.
-EscapeHash = $(subst $(HASH),\$(HASH),$(subst \$(HASH),$(HASH),$(strip $1)))
+EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
 
 ################################################################################
 # This macro translates $ into $$ to protect the string from make itself.

make/common/modules/GensrcStreamPreProcessing.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -33,12 +33,9 @@ ifeq ($(INCLUDE), true)
 include Execute.gmk
 include $(TOPDIR)/make/ToolsJdk.gmk
 
-NON_BYTE_INTEGER_TYPES := char short int long
-NON_BYTE_NUMBER_TYPES := $(NON_BYTE_INTEGER_TYPES) float double
+NON_BYTE_NUMBER_TYPES := char short int long float double
 NUMBER_TYPES := byte $(NON_BYTE_NUMBER_TYPES)
-INTEGER_NUMBER_TYPES := byte $(NON_BYTE_INTEGER_TYPES)
 PRIMITIVE_TYPES := boolean $(NUMBER_TYPES)
-BITWISE_PRIMITIVE_TYPES := boolean $(INTEGER_NUMBER_TYPES)
 
 ################################################################################
 # The Conv function converts a type given as first argument (as a normal Java
@@ -119,7 +116,7 @@ Conv_A = \
 
 # Return integer type with same size as the type
 Conv_memtype = \
-  $(if $(filter float, $1), int, $(if $(filter double, $1), long, $(if $(filter boolean, $1), byte, $1)))
+  $(if $(filter float, $1), int, $(if $(filter double, $1), long, $1))
 
 # Return capitalized integer type with same size as the type
 Conv_Memtype = \

make/common/modules/LauncherCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -35,23 +35,14 @@ include ProcessMarkdown.gmk
 include $(TOPDIR)/make/ToolsJdk.gmk
 
 LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
-
 LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
     -I$(TOPDIR)/src/java.base/share/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
     #
-
-ifeq ($(call isTargetOs, aix), true)
-  LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/aix/native/include
-endif
-
 MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
 JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
-INCLUDED_LAUNCHERS_FILE := $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(MODULE)/module-included-launchers.txt
-INCLUDED_LAUNCHERS :=
-
 ################################################################################
 # Build standard launcher.
 
@@ -83,29 +74,18 @@ define SetupBuildLauncherBody
 
   $1_MAIN_MODULE := $(MODULE)
 
-  $1_RELAUNCHER_ARGUMENTS :=
-
   ifneq ($$($1_MAIN_CLASS), )
     $1_JAVA_ARGS += -Xms8m
     $1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
   endif
 
-  ifeq ($$($1_ENABLE_ARG_FILES), true)
-    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_FALSE
-  else
-    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_TRUE
-    # This must be the first argument given, if it should be present
-    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherArgFiles=false
-  endif
-
   ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
-    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_TRUE
-  else
-    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_FALSE
-    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherWildcards=false
+    $1_CFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
   endif
 
-  $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherProgname=$1
+  ifeq ($$($1_ENABLE_ARG_FILES), true)
+    $1_CFLAGS += -DENABLE_ARG_FILES
+  endif
 
   ifeq ($(call isTargetOs, windows), true)
     ifeq ($$($1_WINDOWS_JAVAW), true)
@@ -114,14 +94,9 @@ define SetupBuildLauncherBody
   endif
 
   ifneq ($$($1_JAVA_ARGS), )
-    $1_PREFIXED_JAVA_ARGS := $$(addprefix -J, $$($1_JAVA_ARGS)) \
-        $$($1_LAUNCHER_CLASS)
-    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, $$($1_PREFIXED_JAVA_ARGS), \
-        "$$a"$(COMMA) )) }'
+    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
+        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
-    # To preserve spaces, substitute them with a hopefully unique pattern
-    $1_RELAUNCHER_ARGUMENTS += \
-        -DjavaLauncherArgs=$$(subst $$(SPACE),||||,$$($1_PREFIXED_JAVA_ARGS))
   endif
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -181,8 +156,8 @@ define SetupBuildLauncherBody
       DISABLED_WARNINGS_gcc := unused-function unused-variable, \
       DISABLED_WARNINGS_clang := unused-function, \
       LDFLAGS := $$($1_LDFLAGS), \
-      LDFLAGS_linux := $$(call SetExecutableOrigin,/../lib), \
-      LDFLAGS_macosx := $$(call SetExecutableOrigin,/../lib), \
+      LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
+      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
       LDFLAGS_FILTER_OUT := $$($1_LDFLAGS_FILTER_OUT), \
       JDK_LIBS := $$($1_JDK_LIBS), \
       JDK_LIBS_windows := $$($1_JDK_LIBS_windows), \
@@ -197,28 +172,8 @@ define SetupBuildLauncherBody
   ))
 
   $1 += $$(BUILD_LAUNCHER_$1)
-
-  $1_RELAUNCHER_ARGUMENTS_FILE := \
-      $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$$(MODULE)/$1-relauncher-arguments.txt
-
-  $1_VARDEPS := $$($1_RELAUNCHER_ARGUMENTS)
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_RELAUNCHER_ARGUMENTS_FILE).vardeps)
-
-  $$($1_RELAUNCHER_ARGUMENTS_FILE):
-	$$(call MakeDir, $$(@D))
-	$$(ECHO) '$$($1_RELAUNCHER_ARGUMENTS)' > $$@
-
-  $1 += $$($1_RELAUNCHER_ARGUMENTS_FILE)
-
   TARGETS += $$($1)
 
-  # Record the fact that this launcher is part of the current module.
-  INCLUDED_LAUNCHERS += $1
-
-  # Add a dependency from this launcher to the launcher list
-  $$(INCLUDED_LAUNCHERS_FILE): $$($1)
-
   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -287,14 +242,5 @@ endif
 
 ################################################################################
 
-# We need to keep track of which launchers are created by this module. This
-# information is required for static builds, to know which relaunchers to
-# create. The file module-included-launchers.txt is then read in StaticLibs.gmk.
-$(INCLUDED_LAUNCHERS_FILE):
-	$(call MakeDir, $(@D))
-	$(ECHO) $(INCLUDED_LAUNCHERS) > $@
-
-TARGETS += $(INCLUDED_LAUNCHERS_FILE)
-
 endif # include guard
 include MakeIncludeEnd.gmk

make/common/native/CompileFile.gmk

@@ -93,14 +93,6 @@ DEPENDENCY_TARGET_SED_PATTERN := \
     -e 's/$$$$/ :/' \
     #
 
-################################################################################
-# Setup compiler-specific argument to specify output file
-ifeq ($(call isCompiler, microsoft), true)
-  CC_OUT_OPTION := -Fo
-else
-  CC_OUT_OPTION := -o$(SPACE)
-endif
-
 ################################################################################
 # Create the recipe needed to compile a single native source file.
 #
@@ -342,7 +334,7 @@ define CreateWindowsResourceFile
 		$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$($1_BASENAME)))
 		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
 		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) -Fo$$@ \
+		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
 		    $$($1_VERSIONINFO_RESOURCE) 2>&1 ))
                 # Windows RC compiler does not support -showIncludes, so we mis-use CL
                 # for this. Filter out RC specific arguments that are unknown to CL.
@@ -352,7 +344,7 @@ define CreateWindowsResourceFile
 		$$(call ExecuteWithLog, $$($1_RES_DEPS_FILE)$(OBJ_SUFFIX), \
 		    $$($1_CC) $$(filter-out -l%, $$($1_RCFLAGS)) \
 		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
-		        -Fo$$($1_RES_DEPS_FILE)$(OBJ_SUFFIX) -P -Fi$$($1_RES_DEPS_FILE).pp \
+		        $(CC_OUT_OPTION)$$($1_RES_DEPS_FILE)$(OBJ_SUFFIX) -P -Fi$$($1_RES_DEPS_FILE).pp \
 		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \
 		    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 		        -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \

make/common/native/Flags.gmk

@@ -194,11 +194,6 @@ define SetupCompilerFlags
     $1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
   endif
 
-  ifeq (true, $$($1_LINK_TIME_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_LTO)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_LTO)
-  endif
-
   ifeq (NONE, $$($1_OPTIMIZATION))
     $1_OPT_CFLAGS := $(C_O_FLAG_NONE)
     $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE)
@@ -227,18 +222,6 @@ define SetupLinkerFlags
   # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE
   # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent
   # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
-  ifeq ($$($1_LINK_TIME_OPTIMIZATION), true)
-    $1_EXTRA_LDFLAGS += $(LDFLAGS_LTO)
-    # Instruct the ld64 linker not to delete the temporary object file
-    # generated during Link Time Optimization
-    ifeq ($(call isTargetOs, macosx), true)
-      $1_EXTRA_LDFLAGS += -Wl,-object_path_lto,$$($1_OBJECT_DIR)/$$($1_NAME)_lto_helper.o
-    endif
-    ifeq ($(TOOLCHAIN_TYPE), microsoft)
-      $1_EXTRA_LDFLAGS += -LTCGOUT:$$($1_OBJECT_DIR)/$$($1_NAME).iobj
-    endif
-  endif
-
   $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \
       $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
   $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \

make/common/native/Link.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -50,26 +50,6 @@ GetEntitlementsFile = \
       $(if $(wildcard $f), $f, $(DEFAULT_ENTITLEMENTS_FILE)) \
     )
 
-ifeq ($(call isCompiler, gcc), true)
-  SetSharedLibraryName = \
-      -Wl,-soname=$1
-else ifeq ($(call isCompiler, clang), true)
-  ifeq ($(call isTargetOs, macosx), true)
-    SetSharedLibraryName = \
-        -Wl,-install_name,@rpath/$1
-  else ifeq ($(call isTargetOs, aix), true)
-    SetSharedLibraryName =
-  else
-    # Default works for linux, might work on other platforms as well.
-    SetSharedLibraryName = \
-        -Wl,-soname=$1
-  endif
-else ifeq ($(call isCompiler, microsoft), true)
-  SetSharedLibraryName =
-else
-  $(error Unknown toolchain)
-endif
-
 ################################################################################
 define SetupLinking
   # Unless specifically set, stripping should only happen if symbols are also
@@ -151,7 +131,7 @@ define CreateDynamicLibraryOrExecutable
   # A shared dynamic library or an executable binary has been specified
   ifeq ($$($1_TYPE), LIBRARY)
     # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS += $$(call SetSharedLibraryName,$$($1_BASENAME))
+    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
   endif
 
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)
@@ -189,7 +169,7 @@ define CreateDynamicLibraryOrExecutable
             # This cannot be run separately since it updates the original target
             # file.
 	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_create_debuginfo, \
-	        $$($1_OBJCOPY) $(OBJCOPY_COMPRESS_FLAGS) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES))
+	        $$($1_OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES))
 	    $$(CHMOD) -x $$($1_DEBUGINFO_FILES)
           else ifeq ($(call isTargetOs, aix), true)
             # AIX does not provide the equivalent of objcopy to extract debug

make/conf/build-module-sets.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2021, 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,4 +45,5 @@ LANGTOOLS_MODULES= \
 # These models require buildtools-hotspot to process for gensrc
 HOTSPOT_MODULES= \
     jdk.hotspot.agent \
+    jdk.internal.vm.ci \
     #

make/conf/github-actions.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2026, 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,32 +26,24 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=8.3+1
+JTREG_VERSION=7.5.2+1
 
 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
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=88b090fa80c6c1d084ec9a755233967458788e2c0777ae2e172230c5c692d7ef
 
 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
+ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz
+ALPINE_LINUX_X64_BOOT_JDK_SHA256=a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb
 
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/35/GPL/openjdk-26_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=254586bcd1bf6dcd125ad667ac32562cb1e2ab1abf3a61fb117b6fabb571e765
+MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=f7133238a12714a62c5ad2bd4da6741130be1a82512065da9ca23dee26b2d3d3
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/35/GPL/openjdk-26_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=8642b89d889c14ede2c446fd5bbe3621c8a3082e3df02013fd1658e39f52929a
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=6bbfb1d01741cbe55ab90299cb91464b695de9a3ace85c15131aa2f50292f321
 
 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
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=11d1d9f6ac272d5361c8a0bef01894364081c7fb1a6914c2ad2fc312ae83d63b

make/conf/jib-profiles.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -387,8 +387,8 @@ var getJibProfilesCommon = function (input, data) {
         };
     };
 
-    common.boot_jdk_version = "26";
-    common.boot_jdk_build_number = "35";
+    common.boot_jdk_version = "24";
+    common.boot_jdk_build_number = "36";
     common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -644,7 +644,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     // Bootcycle profiles runs the build with itself as the boot jdk. This can
     // be done in two ways. Either using the builtin bootcycle target in the
     // build system. Or by supplying the main jdk build as bootjdk to configure.
-    [ "linux-x64", "macosx-aarch64", "macosx-x64", "windows-x64", "linux-aarch64" ]
+    [ "linux-x64", "macosx-x64", "windows-x64", "linux-aarch64" ]
         .forEach(function (name) {
             var bootcycleName = name + "-bootcycle";
             var bootcyclePrebuiltName = name + "-bootcycle-prebuilt";
@@ -1174,9 +1174,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "8.3",
+            version: "7.5.2",
             build_number: "1",
-            file: "bundles/jtreg-8.3+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"),
@@ -1192,8 +1192,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: "3",
+            file: "bundles/jcov-3.0+3.zip",
             environment_name: "JCOV_HOME",
         },
 

make/conf/module-loader-map.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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 @@
 # PLATFORM_MODULES are modules defined by the platform loader
 #
 # All other modules not declared below are defined by the application loader
-# and are not included in the JDK runtime image.
+# and are not included in JRE.
 
 BOOT_MODULES= \
     java.base \
@@ -44,6 +44,7 @@ BOOT_MODULES= \
     java.security.sasl \
     java.xml \
     jdk.incubator.vector \
+    jdk.internal.vm.ci \
     jdk.jfr \
     jdk.management \
     jdk.management.jfr \
@@ -52,12 +53,15 @@ BOOT_MODULES= \
     jdk.nio.mapmode \
     jdk.sctp \
     jdk.unsupported \
+    jdk.naming.rmi \
     #
 
 # Modules that directly or indirectly requiring upgradeable 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= \
@@ -77,7 +81,6 @@ PLATFORM_MODULES= \
     jdk.httpserver \
     jdk.localedata \
     jdk.naming.dns \
-    jdk.naming.rmi \
     jdk.security.auth \
     jdk.security.jgss \
     jdk.xml.dom \
@@ -104,6 +107,7 @@ NATIVE_ACCESS_MODULES= \
     jdk.crypto.mscapi \
     jdk.hotspot.agent \
     jdk.internal.le \
+    jdk.internal.vm.ci \
     jdk.jdi \
     jdk.jfr \
     jdk.jpackage \

make/conf/version-numbers.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=28
+DEFAULT_VERSION_FEATURE=26
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2027-03-23
-DEFAULT_VERSION_CLASSFILE_MAJOR=72  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2026-03-17
+DEFAULT_VERSION_CLASSFILE_MAJOR=70  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="26 27 28"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=28
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25 26"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=26
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/charsetmapping/IBM930.c2b

@@ -32,6 +32,11 @@
 547d    92ca
 53da    9b7e
 446e    f86f
+#
+# we should use this one instead of the 4260<-ff0d
+#4260	2212  
+4260	ff0d
+#
 426A	00A6
 43A1	301C
 444A	2014

make/data/charsetmapping/IBM930.map

@@ -25,6 +25,13 @@
 #      4260 <--> 2212
 #      426A <--> 00A6
 #
+#      Warning:
+#      "our old" implementation seems agree with above "new" mappings
+#      except the entries   4260 <-> 2212. To keep the "compatbility"
+#      with the "old" implementation, I changed the entries "temporarily"
+#      4260 <-> 2212
+#      4260 <-  ff0d
+#
 00	0000
 01	0001
 02	0002
@@ -400,7 +407,8 @@ FF	009F
 425D	FF09
 425E	FF1B
 425F	FFE2
-4260	FF0D
+#4260	FF0D
+4260	2212
 4261	FF0F
 426A	FFE4
 426B	FF0C

make/data/cldr/LICENSE

@@ -1,4 +1,4 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 

make/data/cldr/common/bcp47/calendar.xml

@@ -45,8 +45,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
 			<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
 			<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
-			<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
-			<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
 		</key>
     </keyword>
 </ldmlBCP47>