[crac] Integrated: Merge jdk:jdk-25+26

[Dmitry Cherepanov]

On Wed, 23 Jul 2025 17:58:09 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> Since the merge for [JDK-8352675](https://bugs.openjdk.org/browse/JDK-8352675) is split into a separate PR (https://github.com/openjdk/crac/pull/247), I cherry-picked the current version and merging other changes on top of it. It will likely require rebase on top of the final version later.
> 
> Attaching output of `--diff-merges=remerge`
> 
> <details>
> 
> <summary>Conflicts</summary>
> 
> 
> commit 5035f463900712ae47b7e1adfeff609bc1d66116 (HEAD -> merge-jdk, dmitry-crac/merge-jdk)
> Merge: d61227fe01d c59e44a7aa2
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Tue Jul 22 13:30:47 2025 +0400
> 
>     Merge with jdk-25+26
> 
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> remerge CONFLICT (content): Merge conflict in .github/workflows/main.yml
> index 8cf745c1cff..02c6f3d2668 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -310,11 +310,7 @@ jobs:
>      uses: ./.github/workflows/build-windows.yml
>      with:
>        platform: windows-x64
> -<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
>        msvc-toolset-version: '14.44'
> -=======
> -      msvc-toolset-version: '14.43'
> ->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)
>        msvc-toolset-architecture: 'x86.x64'
>        configure-arguments: ${{ github.event.inputs.configure-arguments }}
>        make-arguments: ${{ github.event.inputs.make-arguments }}
> @@ -326,11 +322,7 @@ jobs:
>      uses: ./.github/workflows/build-windows.yml
>      with:
>        platform: windows-aarch64
> -<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
>        msvc-toolset-version: '14.44'
> -=======
> -      msvc-toolset-version: '14.43'
> ->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)
>        msvc-toolset-architecture: 'arm64'
>        make-target: 'hotspot'
>        extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
> @@ -369,17 +361,17 @@ jobs:
>        runs-on: ubuntu-22.04
>        debug-suffix: -debug
>  
> -  test-linux-x64-static:
> -    name: linux-x64-static
> -    needs:
> -      - build-linux-x64
> -      - build-linux-x64-static
> -    uses: ./.github/workflows/test.yml
> -    with:
> -      platform: linux-x64
> -      bootjdk-platform: linux-x64
> -      runs-on: ubuntu-22.04
> -      static-suffix: "-static"
> +#  test-linux-x64-static:
> +#    name: linux-x64-static
> +#    needs:
> +#      - build-linux-x64
> +#      - build-lin...

This pull request has now been integrated.

Changeset: dddb8e0d
Author:    Dmitry Cherepanov <dcherepanov at openjdk.org>
Committer: Timofei Pushkin <tpushkin at openjdk.org>
URL:       https://git.openjdk.org/crac/commit/dddb8e0dcd64ce4a6d325bca551ff22ca9c266c3
Stats:     167455 lines in 2905 files changed: 99582 ins; 45998 del; 21875 mod

Merge jdk:jdk-25+26

Co-authored-by: Jan Kratochvil <jkratochvil at openjdk.org>
Co-authored-by: Timofei Pushkin <tpushkin at openjdk.org>
Reviewed-by: tpushkin

-------------

PR: https://git.openjdk.org/crac/pull/248