Skip to content

Commit 19ceeca

Browse files
author
Vicente Romero
committed
Merge lworld
2 parents 2017def + 619ef43 commit 19ceeca

File tree

1,383 files changed

+56172
-25628
lines changed

Some content is hidden

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

1,383 files changed

+56172
-25628
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ on:
5959
jobs:
6060
build-linux:
6161
name: build
62-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6363
container:
6464
image: alpine:3.20
6565

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,49 +48,49 @@ on:
4848
jobs:
4949
build-cross-compile:
5050
name: build
51-
runs-on: ubuntu-22.04
51+
runs-on: ubuntu-24.04
5252

5353
strategy:
5454
fail-fast: false
5555
matrix:
5656
target-cpu:
5757
- aarch64
58-
- arm
59-
- s390x
60-
- ppc64le
61-
- riscv64
58+
# - arm
59+
# - s390x
60+
# - ppc64le
61+
# - riscv64
6262
include:
6363
- target-cpu: aarch64
6464
gnu-arch: aarch64
6565
debian-arch: arm64
6666
debian-repository: https://httpredir.debian.org/debian/
6767
debian-version: trixie
6868
tolerate-sysroot-errors: false
69-
- target-cpu: arm
70-
gnu-arch: arm
71-
debian-arch: armhf
72-
debian-repository: https://httpredir.debian.org/debian/
73-
debian-version: trixie
74-
tolerate-sysroot-errors: false
75-
gnu-abi: eabihf
76-
- target-cpu: s390x
77-
gnu-arch: s390x
78-
debian-arch: s390x
79-
debian-repository: https://httpredir.debian.org/debian/
80-
debian-version: trixie
81-
tolerate-sysroot-errors: false
82-
- target-cpu: ppc64le
83-
gnu-arch: powerpc64le
84-
debian-arch: ppc64el
85-
debian-repository: https://httpredir.debian.org/debian/
86-
debian-version: trixie
87-
tolerate-sysroot-errors: false
88-
- target-cpu: riscv64
89-
gnu-arch: riscv64
90-
debian-arch: riscv64
91-
debian-repository: https://httpredir.debian.org/debian/
92-
debian-version: trixie
93-
tolerate-sysroot-errors: false
69+
# - target-cpu: arm
70+
# gnu-arch: arm
71+
# debian-arch: armhf
72+
# debian-repository: https://httpredir.debian.org/debian/
73+
# debian-version: trixie
74+
# tolerate-sysroot-errors: false
75+
# gnu-abi: eabihf
76+
# - target-cpu: s390x
77+
# gnu-arch: s390x
78+
# debian-arch: s390x
79+
# debian-repository: https://httpredir.debian.org/debian/
80+
# debian-version: trixie
81+
# tolerate-sysroot-errors: false
82+
# - target-cpu: ppc64le
83+
# gnu-arch: powerpc64le
84+
# debian-arch: ppc64el
85+
# debian-repository: https://httpredir.debian.org/debian/
86+
# debian-version: trixie
87+
# tolerate-sysroot-errors: false
88+
# - target-cpu: riscv64
89+
# gnu-arch: riscv64
90+
# debian-arch: riscv64
91+
# debian-repository: https://httpredir.debian.org/debian/
92+
# debian-version: trixie
93+
# tolerate-sysroot-errors: false
9494

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

.github/workflows/build-linux.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ on:
7575
jobs:
7676
build-linux:
7777
name: build
78-
runs-on: ubuntu-22.04
78+
runs-on: ubuntu-24.04
7979

8080
strategy:
8181
fail-fast: false
@@ -115,9 +115,21 @@ jobs:
115115
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
116116
sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
117117
fi
118-
sudo apt-get update
119-
sudo apt-get install --only-upgrade apt
120-
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 }}
118+
sudo apt update
119+
sudo apt install --only-upgrade apt
120+
sudo apt install \
121+
gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
122+
g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
123+
libasound2-dev${{ steps.arch.outputs.suffix }} \
124+
libcups2-dev${{ steps.arch.outputs.suffix }} \
125+
libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
126+
libx11-dev${{ steps.arch.outputs.suffix }} \
127+
libxext-dev${{ steps.arch.outputs.suffix }} \
128+
libxrandr-dev${{ steps.arch.outputs.suffix }} \
129+
libxrender-dev${{ steps.arch.outputs.suffix }} \
130+
libxt-dev${{ steps.arch.outputs.suffix }} \
131+
libxtst-dev${{ steps.arch.outputs.suffix }} \
132+
${{ inputs.apt-extra-packages }}
121133
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 }}
122134
123135
- name: 'Configure'
@@ -131,6 +143,7 @@ jobs:
131143
--with-gtest=${{ steps.gtest.outputs.path }}
132144
--with-zlib=system
133145
--with-jmod-compress=zip-1
146+
--disable-jvm-feature-shenandoahgc
134147
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
135148
echo "Dumping config.log:" &&
136149
cat config.log &&

.github/workflows/build-macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
--with-gtest=${{ steps.gtest.outputs.path }}
111111
--with-zlib=system
112112
--with-jmod-compress=zip-1
113+
--disable-jvm-feature-shenandoahgc
113114
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
114115
echo "Dumping config.log:" &&
115116
cat config.log &&

.github/workflows/build-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ jobs:
134134
--with-gtest=${{ steps.gtest.outputs.path }}
135135
--with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
136136
--with-jmod-compress=zip-1
137+
--disable-jvm-feature-shenandoahgc
137138
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
138139
echo "Dumping config.log:" &&
139140
cat config.log &&

.github/workflows/main.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
prepare:
5959
name: 'Prepare the run'
60-
runs-on: ubuntu-22.04
60+
runs-on: ubuntu-24.04
6161
env:
6262
# List of platforms to exclude by default
6363
EXCLUDED_PLATFORMS: 'alpine-linux-x64'
@@ -216,20 +216,20 @@ jobs:
216216
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
217217
if: needs.prepare.outputs.linux-x64-variants == 'true'
218218

219-
build-linux-x64-hs-zero:
220-
name: linux-x64-hs-zero
221-
needs: prepare
222-
uses: ./.github/workflows/build-linux.yml
223-
with:
224-
platform: linux-x64
225-
make-target: 'hotspot'
226-
debug-levels: '[ "debug" ]'
227-
gcc-major-version: '10'
228-
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
229-
configure-arguments: ${{ github.event.inputs.configure-arguments }}
230-
make-arguments: ${{ github.event.inputs.make-arguments }}
231-
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
232-
if: needs.prepare.outputs.linux-x64-variants == 'true'
219+
# build-linux-x64-hs-zero:
220+
# name: linux-x64-hs-zero
221+
# needs: prepare
222+
# uses: ./.github/workflows/build-linux.yml
223+
# with:
224+
# platform: linux-x64
225+
# make-target: 'hotspot'
226+
# debug-levels: '[ "debug" ]'
227+
# gcc-major-version: '10'
228+
# extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
229+
# configure-arguments: ${{ github.event.inputs.configure-arguments }}
230+
# make-arguments: ${{ github.event.inputs.make-arguments }}
231+
# dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
232+
# if: needs.prepare.outputs.linux-x64-variants == 'true'
233233

234234
build-linux-x64-hs-minimal:
235235
name: linux-x64-hs-minimal
@@ -405,7 +405,7 @@ jobs:
405405
with:
406406
platform: linux-x64
407407
bootjdk-platform: linux-x64
408-
runs-on: ubuntu-22.04
408+
runs-on: ubuntu-24.04
409409
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
410410
debug-suffix: -debug
411411

@@ -419,7 +419,7 @@ jobs:
419419
with:
420420
platform: linux-x64
421421
bootjdk-platform: linux-x64
422-
runs-on: ubuntu-22.04
422+
runs-on: ubuntu-24.04
423423
dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
424424
static-suffix: "-static"
425425

bin/generate-symbol-data.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# directory.
3939
# - open a terminal program and run these commands:
4040
# cd "${JDK_CHECKOUT}"/src/jdk.compiler/share/data/symbols
41-
# bash ../../../../../make/scripts/generate-symbol-data.sh "${JDK_N_INSTALL}"
41+
# bash ../../../../../bin/generate-symbol-data.sh "${JDK_N_INSTALL}"
4242
# - this command will generate or update data for "--release N" into the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols
4343
# directory, updating all registration necessary. If the goal was to update the data, and there are no
4444
# new or changed files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory after running this script,

doc/building.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,11 @@ <h3 id="macos">macOS</h3>
541541
this.</p>
542542
<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
543543
earlier versions may also work.</p>
544+
<p>Starting with Xcode 26, introduced in macOS 26, the Metal toolchain
545+
no longer comes bundled with Xcode, so it needs to be installed
546+
separately. This can either be done via the Xcode's Settings/Components
547+
UI, or in the command line calling
548+
<code>xcodebuild -downloadComponent metalToolchain</code>.</p>
544549
<p>The standard macOS environment contains the basic tooling needed to
545550
build, but for external libraries a package manager is recommended. The
546551
JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but

doc/building.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,11 @@ on some strategies to deal with this.
352352
It is recommended that you use at least macOS 14 and Xcode 15.4, but
353353
earlier versions may also work.
354354

355+
Starting with Xcode 26, introduced in macOS 26, the Metal toolchain no longer
356+
comes bundled with Xcode, so it needs to be installed separately. This can
357+
either be done via the Xcode's Settings/Components UI, or in the command line
358+
calling `xcodebuild -downloadComponent metalToolchain`.
359+
355360
The standard macOS environment contains the basic tooling needed to build, but
356361
for external libraries a package manager is recommended. The JDK uses
357362
[homebrew](https://brew.sh/) in the examples, but feel free to use whatever

doc/hotspot-style.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,8 @@ <h3 id="variable-templates-and-inline-variables">Variable Templates and
10371037
<p>Some of the approaches used in HotSpot to avoid dynamic
10381038
initialization include:</p>
10391039
<ul>
1040-
<li><p>Use the <code>Deferred&lt;T&gt;</code> class template. Add a call
1041-
to its initialization function at an appropriate place during VM
1040+
<li><p>Use the <code>DeferredStatic&lt;T&gt;</code> class template. Add
1041+
a call to its initialization function at an appropriate place during VM
10421042
initialization. The underlying object is never destroyed.</p></li>
10431043
<li><p>For objects of class type, use a variable whose value is a
10441044
pointer to the class, initialized to <code>nullptr</code>. Provide an

0 commit comments

Comments
 (0)