Skip to content

Commit 3da3701

Browse files
[GR-64422] Merge in tag jdk-25+19
PullRequest: labsjdk-ce/167
2 parents b3178ed + b636b84 commit 3da3701

File tree

641 files changed

+26350
-175681
lines changed

Some content is hidden

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

641 files changed

+26350
-175681
lines changed

ci.jsonnet

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local labsjdk_builder_version = "181ae3a6077f9bf0a117cc34562c33e871cd4ede";
77
local contains(str, needle) = std.findSubstr(needle, str) != [];
88

99
{
10-
overlay: "616937561244a0b2c6ff8e001b11b4e304a85a8a",
10+
overlay: "71bd3aa4622661dda0587fdf9000de4bb1029438",
1111
specVersion: "3",
1212

1313
mxDependencies:: {
@@ -77,21 +77,25 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
7777
},
7878
packages+: if for_jdk_build then {
7979
# devkit_platform_revisions in make/conf/jib-profiles.js
80-
"devkit:gcc13.2.0-OL6.4+1" : "==0"
80+
"devkit:gcc14.2.0-OL6.4+1" : "==0"
8181
} else {
8282
# When building/testing GraalVM, do not use a devkit as it is known not to
8383
# work well when dynamically linking libstdc++.
8484
devtoolset: "==7"
8585
},
8686
},
87-
LinuxAArch64(for_jdk_build):: self.Linux + self.AArch64 {
87+
LinuxAArch64(defs, for_jdk_build):: self.Linux + self.AArch64 {
8888
packages+: if for_jdk_build then {
8989
# devkit_platform_revisions in make/conf/jib-profiles.js
90-
"devkit:gcc13.2.0-OL7.6+1" : "==0"
90+
"devkit:gcc14.2.0-OL7.6+1" : "==0"
9191
} else {
9292
# See GR-26071 as well as comment in self.LinuxAMD64
9393
devtoolset: "==7"
9494
},
95+
docker:{
96+
image: defs.linux_docker_image_amd64,
97+
mount_modules: true
98+
},
9599
},
96100
Darwin:: self.OSBase + {
97101
jdk_home(java_home):: java_home + "/../..",
@@ -370,15 +374,15 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
370374

371375
local build_confs(defs) = [
372376
self.LinuxAMD64(defs, true),
373-
self.LinuxAArch64(true),
377+
self.LinuxAArch64(defs, true),
374378
self.DarwinAMD64,
375379
self.DarwinAArch64,
376380
self.Windows + self.AMD64
377381
],
378382

379383
local graal_confs(defs) = [
380384
self.LinuxAMD64(defs, false),
381-
self.LinuxAArch64(false),
385+
self.LinuxAArch64(defs, false),
382386
self.DarwinAMD64,
383387
self.DarwinAArch64,
384388
self.Windows + self.AMD64

doc/building.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
586586
<tbody>
587587
<tr class="odd">
588588
<td>Linux</td>
589-
<td>gcc 13.2.0</td>
589+
<td>gcc 14.2.0</td>
590590
</tr>
591591
<tr class="even">
592592
<td>macOS</td>
@@ -604,7 +604,7 @@ <h3 id="gcc">gcc</h3>
604604
<p>The minimum accepted version of gcc is 10.0. Older versions will not
605605
be accepted by <code>configure</code>.</p>
606606
<p>The JDK is currently known to compile successfully with gcc version
607-
13.2 or newer.</p>
607+
14.2 or newer.</p>
608608
<p>In general, any version between these two should be usable.</p>
609609
<h3 id="clang">clang</h3>
610610
<p>The minimum accepted version of clang is 13. Older versions will not

doc/building.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ issues.
392392

393393
| Operating system | Toolchain version |
394394
| ------------------ | ------------------------------------------- |
395-
| Linux | gcc 13.2.0 |
395+
| Linux | gcc 14.2.0 |
396396
| macOS | Apple Xcode 14.3.1 (using clang 14.0.3) |
397397
| Windows | Microsoft Visual Studio 2022 version 17.6.5 |
398398

@@ -404,7 +404,7 @@ C, and C++14 for C++.
404404
The minimum accepted version of gcc is 10.0. Older versions will not be accepted
405405
by `configure`.
406406

407-
The JDK is currently known to compile successfully with gcc version 13.2 or
407+
The JDK is currently known to compile successfully with gcc version 14.2 or
408408
newer.
409409

410410
In general, any version between these two should be usable.

make/Docs.gmk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ JAVADOC_TAGS := \
7979
-tag see \
8080
-taglet build.tools.taglet.ExtLink \
8181
-taglet build.tools.taglet.Incubating \
82+
-taglet build.tools.taglet.PreviewNote \
83+
--preview-note-tag previewNote \
8284
-tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
8385
$(CUSTOM_JAVADOC_TAGS) \
8486
#

make/RunTests.gmk

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -534,22 +534,21 @@ define SetupRunGtestTestBody
534534
$$(eval $1_PASSED := $$(shell $$(AWK) '/\[ PASSED \] .* tests?./ \
535535
{ print $$$$4 }' $$($1_RESULT_FILE))) \
536536
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
537-
$$(eval $1_SKIPPED := $$(shell $$(AWK) \
538-
'/YOU HAVE [0-9]+ DISABLED TEST/ { \
539-
if (match($$$$0, /[0-9]+/, arr)) { \
540-
print arr[0]; \
541-
found=1; \
542-
} \
543-
} \
544-
END { if (!found) print 0; }' \
545-
$$($1_RESULT_FILE))) \
537+
$$(eval $1_GTEST_DISABLED := $$(shell $$(AWK) '/YOU HAVE .* DISABLED TEST/ \
538+
{ print $$$$3 }' $$($1_RESULT_FILE))) \
539+
$$(if $$($1_GTEST_DISABLED), , $$(eval $1_GTEST_DISABLED := 0)) \
540+
$$(eval $1_GTEST_SKIPPED := $$(shell $$(AWK) '/\[ SKIPPED \] .* tests?.*/ \
541+
{ print $$$$4 }' $$($1_RESULT_FILE))) \
542+
$$(if $$($1_GTEST_SKIPPED), , $$(eval $1_GTEST_SKIPPED := 0)) \
543+
$$(eval $1_SKIPPED := $$(shell \
544+
$$(EXPR) $$($1_GTEST_DISABLED) + $$($1_GTEST_SKIPPED))) \
546545
$$(eval $1_FAILED := $$(shell $$(AWK) '/\[ FAILED \] .* tests?, \
547546
listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \
548547
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
549548
$$(eval $1_ERROR := $$(shell \
550-
$$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED))) \
549+
$$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED) - $$($1_GTEST_SKIPPED))) \
551550
$$(eval $1_TOTAL := $$(shell \
552-
$$(EXPR) $$($1_RUN) + $$($1_SKIPPED))) \
551+
$$(EXPR) $$($1_RUN) + $$($1_GTEST_DISABLED))) \
553552
, \
554553
$$(eval $1_PASSED := 0) \
555554
$$(eval $1_FAILED := 0) \

make/autoconf/basic_tools.m4

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,15 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
468468
AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
469469
if $PANDOC --list-extensions | $GREP -q '+smart'; then
470470
AC_MSG_RESULT([yes])
471-
PANDOC_MARKDOWN_FLAG="markdown-smart"
471+
PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-smart"
472+
else
473+
AC_MSG_RESULT([no])
474+
fi
475+
476+
AC_MSG_CHECKING([if the pandoc tex_math_dollars extension needs to be disabled for markdown])
477+
if $PANDOC --list-extensions | $GREP -q '+tex_math_dollars'; then
478+
AC_MSG_RESULT([yes])
479+
PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-tex_math_dollars"
472480
else
473481
AC_MSG_RESULT([no])
474482
fi

make/autoconf/flags-cflags.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
721721
$1_CFLAGS_CPU="-fsigned-char -Wno-psabi $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS -DJDK_ARCH_ABI_PROP_NAME='\"\$(JDK_ARCH_ABI_PROP_NAME)\"'"
722722
$1_CFLAGS_CPU_JVM="-DARM"
723723
elif test "x$FLAGS_CPU_ARCH" = xppc; then
724-
$1_CFLAGS_CPU_JVM="-minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
724+
$1_CFLAGS_CPU_JVM="-mno-multiple -mno-string"
725725
if test "x$FLAGS_CPU" = xppc64; then
726726
# -mminimal-toc fixes `relocation truncated to fit' error for gcc 4.1.
727727
# Use ppc64 instructions, but schedule for power5

make/conf/github-actions.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8
3333
LINUX_X64_BOOT_JDK_SHA256=88b090fa80c6c1d084ec9a755233967458788e2c0777ae2e172230c5c692d7ef
3434

3535
ALPINE_LINUX_X64_BOOT_JDK_EXT=tar.gz
36-
ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24_36.tar.gz
37-
ALPINE_LINUX_X64_BOOT_JDK_SHA256=4a673456aa6e726b86108a095a21868b7ebcdde050a92b3073d50105ff92f07f
36+
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
37+
ALPINE_LINUX_X64_BOOT_JDK_SHA256=a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb
3838

3939
MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
4040
MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz

make/conf/jib-profiles.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,14 +1097,14 @@ var getJibProfilesProfiles = function (input, common, data) {
10971097
var getJibProfilesDependencies = function (input, common) {
10981098

10991099
var devkit_platform_revisions = {
1100-
linux_x64: "gcc13.2.0-OL6.4+1.0",
1100+
linux_x64: "gcc14.2.0-OL6.4+1.0",
11011101
macosx: "Xcode14.3.1+1.0",
11021102
windows_x64: "VS2022-17.6.5+1.0",
1103-
linux_aarch64: "gcc13.2.0-OL7.6+1.0",
1103+
linux_aarch64: "gcc14.2.0-OL7.6+1.0",
11041104
linux_arm: "gcc8.2.0-Fedora27+1.0",
1105-
linux_ppc64le: "gcc13.2.0-Fedora_41+1.0",
1106-
linux_s390x: "gcc13.2.0-Fedora_41+1.0",
1107-
linux_riscv64: "gcc13.2.0-Fedora_41+1.0"
1105+
linux_ppc64le: "gcc14.2.0-Fedora_41+1.0",
1106+
linux_s390x: "gcc14.2.0-Fedora_41+1.0",
1107+
linux_riscv64: "gcc14.2.0-Fedora_41+1.0"
11081108
};
11091109

11101110
var devkit_platform = (input.target_cpu == "x86"

make/data/cldr/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UNICODE LICENSE V3
1+
UNICODE LICENSE V3
22

33
COPYRIGHT AND PERMISSION NOTICE
44

0 commit comments

Comments
 (0)