[crac] RFR: Merge jdk:jdk-25+26 [v2]
Dmitry Cherepanov
dcherepanov at openjdk.org
Fri Jul 25 07:08:01 UTC 2025
> 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...
Dmitry Cherepanov has updated the pull request incrementally with one additional commit since the last revision:
zgc part cleanup
-------------
Changes:
- all: https://git.openjdk.org/crac/pull/248/files
- new: https://git.openjdk.org/crac/pull/248/files/5035f463..df444e46
Webrevs:
- full: https://webrevs.openjdk.org/?repo=crac&pr=248&range=01
- incr: https://webrevs.openjdk.org/?repo=crac&pr=248&range=00-01
Stats: 20 lines in 2 files changed: 2 ins; 11 del; 7 mod
Patch: https://git.openjdk.org/crac/pull/248.diff
Fetch: git fetch https://git.openjdk.org/crac.git pull/248/head:pull/248
PR: https://git.openjdk.org/crac/pull/248
More information about the crac-dev
mailing list