Skip to content

Commit 6d3f779

Browse files
vpaprotskvpaprotsk
committed
Merge remote-tracking branch 'origin/master' into avx2-ntt
2 parents f4f84b6 + 7d3c66f commit 6d3f779

File tree

6,105 files changed

+318901
-133741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,105 files changed

+318901
-133741
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ runs:
6565
with:
6666
name: bundles-jtreg-${{ steps.version.outputs.value }}
6767
path: jtreg/installed
68-
retention-days: 1
68+
retention-days: 5

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ runs:
3030
using: composite
3131
steps:
3232
- name: 'Install MSYS2'
33-
uses: msys2/setup-msys2@v2.22.0
33+
id: msys2
34+
uses: msys2/setup-msys2@v2.28.0
3435
with:
3536
install: 'autoconf tar unzip zip make'
3637
path-type: minimal
37-
location: ${{ runner.tool_cache }}/msys2
38+
release: false
3839

3940
# We can't run bash until this is completed, so stick with pwsh
4041
- name: 'Set MSYS2 path'
4142
run: |
42-
# Prepend msys2/msys64/usr/bin to the PATH
43-
echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
43+
echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
4444
shell: pwsh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ runs:
9191
with:
9292
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
9393
path: bundles
94-
retention-days: 1
94+
retention-days: 5
9595
if: steps.bundles.outputs.bundles-found == 'true'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,33 @@ jobs:
6464
gnu-arch: aarch64
6565
debian-arch: arm64
6666
debian-repository: https://httpredir.debian.org/debian/
67-
debian-version: bullseye
67+
debian-version: trixie
6868
tolerate-sysroot-errors: false
6969
- target-cpu: arm
7070
gnu-arch: arm
7171
debian-arch: armhf
7272
debian-repository: https://httpredir.debian.org/debian/
73-
debian-version: bullseye
73+
debian-version: trixie
7474
tolerate-sysroot-errors: false
7575
gnu-abi: eabihf
7676
- target-cpu: s390x
7777
gnu-arch: s390x
7878
debian-arch: s390x
7979
debian-repository: https://httpredir.debian.org/debian/
80-
debian-version: bullseye
80+
debian-version: trixie
8181
tolerate-sysroot-errors: false
8282
- target-cpu: ppc64le
8383
gnu-arch: powerpc64le
8484
debian-arch: ppc64el
8585
debian-repository: https://httpredir.debian.org/debian/
86-
debian-version: bullseye
86+
debian-version: trixie
8787
tolerate-sysroot-errors: false
8888
- target-cpu: riscv64
8989
gnu-arch: riscv64
9090
debian-arch: riscv64
9191
debian-repository: https://httpredir.debian.org/debian/
92-
debian-version: sid
93-
tolerate-sysroot-errors: true
92+
debian-version: trixie
93+
tolerate-sysroot-errors: false
9494

9595
steps:
9696
- name: 'Checkout the JDK source'

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ jobs:
327327
uses: ./.github/workflows/build-macos.yml
328328
with:
329329
platform: macos-x64
330-
runs-on: 'macos-13'
331-
xcode-toolset-version: '14.3.1'
330+
runs-on: 'macos-15-intel'
331+
xcode-toolset-version: '16.4'
332332
configure-arguments: ${{ github.event.inputs.configure-arguments }}
333333
make-arguments: ${{ github.event.inputs.make-arguments }}
334334
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -340,8 +340,8 @@ jobs:
340340
uses: ./.github/workflows/build-macos.yml
341341
with:
342342
platform: macos-aarch64
343-
runs-on: 'macos-14'
344-
xcode-toolset-version: '15.4'
343+
runs-on: 'macos-15'
344+
xcode-toolset-version: '16.4'
345345
configure-arguments: ${{ github.event.inputs.configure-arguments }}
346346
make-arguments: ${{ github.event.inputs.make-arguments }}
347347
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -432,9 +432,9 @@ jobs:
432432
with:
433433
platform: macos-aarch64
434434
bootjdk-platform: macos-aarch64
435-
runs-on: macos-14
435+
runs-on: macos-15
436436
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
437-
xcode-toolset-version: '15.4'
437+
xcode-toolset-version: '16.4'
438438
debug-suffix: -debug
439439

440440
test-windows-x64:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ NashornProfile.txt
2525
**/core.[0-9]*
2626
*.rej
2727
*.orig
28+
test/benchmarks/**/target

‎make/scripts/generate-symbol-data.sh‎ renamed to ‎bin/generate-symbol-data.sh‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -52,12 +52,39 @@
5252
# include the SCM state that was used to build it, which can be found in ${JDK_N_INSTALL}/release,
5353
# in property "SOURCE".
5454

55+
source_path="$(dirname ${0})"
56+
this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
57+
if test -z "${this_script_dir}"; then
58+
echo "Error: Could not determine location of this script"
59+
exit 1
60+
fi
61+
62+
symbols_dir="$(dirname $this_script_dir)/src/jdk.compiler/share/data/symbols"
63+
if [ ! -d $symbols_dir ] ; then
64+
echo "Cannot locate symbols directory: $symbols_dir" >&2
65+
exit 1
66+
fi
67+
68+
generator_dir="$(dirname $this_script_dir)/make/langtools/src/classes/build/tools/symbolgenerator"
69+
5570
if [ "$1x" = "x" ] ; then
5671
echo "Must provide the target JDK as a parameter:" >&2
5772
echo "$0 <target-jdk>" >&2
5873
exit 1
5974
fi;
6075

76+
if [ ! -d $1 ] ; then
77+
echo "Target JDK argument is not a directory:" $1 >&2
78+
exit 1
79+
fi;
80+
81+
if [ ! -x $1/bin/java ] ; then
82+
echo "Target JDK argument is not a valid JDK: $1" >&2
83+
exit 1
84+
fi;
85+
86+
cd $symbols_dir
87+
6188
if [ ! -f symbols ] ; then
6289
echo "Must run inside the src/jdk.compiler/share/data/symbols directory" >&2
6390
exit 1
@@ -72,5 +99,5 @@ $1/bin/java --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
7299
--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
73100
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
74101
--add-modules jdk.jdeps \
75-
../../../../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java \
102+
$generator_dir/CreateSymbols.java \
76103
build-description-incremental symbols include.list

‎bin/idea.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
125125
VCS_TYPE="hg4idea"
126126
fi
127127

128-
if [ -d "$TOPLEVEL_DIR/.git" ] ; then
128+
# Git worktrees use a '.git' file rather than directory, so test both.
129+
if [ -d "$TOPLEVEL_DIR/.git" -o -f "$TOPLEVEL_DIR/.git" ] ; then
129130
VCS_TYPE="Git"
130131
fi
131132

‎make/scripts/lic_check.sh‎ renamed to ‎bin/lic_check.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh -f
22
#
3-
# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ B=`basename "${script_directory}"`
6262
script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
6363

6464
# set up a variable for the template directory
65-
template_dir=${script_dir}/../data/license-templates
65+
template_dir=${script_dir}/../make/data/license-templates
6666

6767
# Check existence of the template directory.
6868
if [ ! -d ${template_dir} ] ; then

‎make/scripts/normalizer.pl‎ renamed to ‎bin/normalizer.pl‎

File renamed without changes.

0 commit comments

Comments
 (0)