Skip to content

Commit 63ab92f

Browse files
syqq-qsyqq-q
authored
Merge pull request #981 from dragonwell-project/dragonwell_standard-11.0.31.27.11
Merge tag 'jdk-11.0.31+11' into dragonwell_standard-11.0.31.27.11
2 parents 52b5290 + e86616d commit 63ab92f

649 files changed

Lines changed: 30626 additions & 25130 deletions

File tree

Some content is hidden

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

‎.jcheck/conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk-updates
33
jbs=JDK
4-
version=11.0.30
4+
version=11.0.31
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

‎make/autoconf/lib-alsa.m4‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,25 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
7070
PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
7171
fi
7272
fi
73+
if test "x$ALSA_FOUND" = xno; then
74+
# If we have sysroot set, and no explicit library location is set,
75+
# look at known locations in sysroot.
76+
if test "x$SYSROOT" != "x" && test "x${with_alsa_lib}" == x; then
77+
if test -f "$SYSROOT/usr/lib64/libasound.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
78+
ALSA_LIBS="-L$SYSROOT/usr/lib64 -lasound"
79+
ALSA_FOUND=yes
80+
elif test -f "$SYSROOT/usr/lib/libasound.so"; then
81+
ALSA_LIBS="-L$SYSROOT/usr/lib -lasound"
82+
ALSA_FOUND=yes
83+
elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
84+
ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
85+
ALSA_FOUND=yes
86+
elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
87+
ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
88+
ALSA_FOUND=yes
89+
fi
90+
fi
91+
fi
7392
if test "x$ALSA_FOUND" = xno; then
7493
AC_CHECK_HEADERS([alsa/asoundlib.h],
7594
[

‎make/autoconf/lib-x11.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
7171
elif test -f "$SYSROOT/usr/lib/libX11.so"; then
7272
x_libraries="$SYSROOT/usr/lib"
7373
elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
74-
x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
74+
x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
7575
elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
76-
x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
76+
x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
7777
fi
7878
fi
7979
fi

‎make/autoconf/version-numbers‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
DEFAULT_VERSION_FEATURE=11
3030
DEFAULT_VERSION_INTERIM=0
31-
DEFAULT_VERSION_UPDATE=30
31+
DEFAULT_VERSION_UPDATE=31
3232
DEFAULT_VERSION_PATCH=0
3333
DEFAULT_VERSION_EXTRA1=0
3434
DEFAULT_VERSION_EXTRA2=0
3535
DEFAULT_VERSION_EXTRA3=0
36-
DEFAULT_VERSION_DATE=2026-01-20
36+
DEFAULT_VERSION_DATE=2026-04-21
3737
DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

‎make/data/tzdata/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# or visit www.oracle.com if you need additional information or have any
2222
# questions.
2323
#
24-
tzdata2025b
24+
tzdata2026a

‎make/data/tzdata/africa‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
# 2009-05-17 by Arthur David Olson.
2828

2929
# This file is by no means authoritative; if you think you know better,
30-
# go ahead and edit the file (and please send any changes to
31-
# tz@iana.org for general use in the future). For more, please see
32-
# the file CONTRIBUTING in the tz distribution.
30+
# go ahead and edit the file, and please send any changes to
31+
# the public mailing list tz@iana.org for general use in the future.
32+
# For more, please see the file CONTRIBUTING in the tz distribution.
3333

3434
# From Paul Eggert (2018-05-27):
3535
#
@@ -138,8 +138,9 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
138138
-1:00 - %z
139139

140140
# Chad
141+
# Fort-Lamy was renamed to N’Djamena on 1973-04-06.
141142
# Zone NAME STDOFF RULES FORMAT [UNTIL]
142-
Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # N'Djamena
143+
Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # Fort-Lamy
143144
1:00 - WAT 1979 Oct 14
144145
1:00 1:00 WAST 1980 Mar 8
145146
1:00 - WAT

‎make/data/tzdata/antarctica‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@
2626
# This file is in the public domain, so clarified as of
2727
# 2009-05-17 by Arthur David Olson.
2828

29-
# From Paul Eggert (1999-11-15):
30-
# To keep things manageable, we list only locations occupied year-round; see
31-
# COMNAP - Stations and Bases
32-
# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
33-
# and
34-
# Summary of the Peri-Antarctic Islands (1998-07-23)
35-
# http://www.spri.cam.ac.uk/bob/periant.htm
29+
# From Paul Eggert (2025-08-16):
30+
# To keep things manageable, list only locations occupied year-round; see
31+
# Antarctic Facilities Information
32+
# https://www.comnap.aq/antarctic-facilities-information
3633
# for information.
3734
# Unless otherwise specified, we have no time zone information.
3835

@@ -167,6 +164,7 @@ Zone Antarctica/Mawson 0 - -00 1954 Feb 13
167164
# China - year-round bases
168165
# Great Wall, King George Island, -6213-05858, since 1985-02-20
169166
# Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
167+
# Qinling, Inexpressible I, Terra Nova Bay, -7456+16343, since 2024-02-07
170168

171169
# France - year-round bases (also see "France & Italy")
172170
#

‎make/data/tzdata/asia‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
# 2009-05-17 by Arthur David Olson.
2828

2929
# This file is by no means authoritative; if you think you know better,
30-
# go ahead and edit the file (and please send any changes to
31-
# tz@iana.org for general use in the future). For more, please see
32-
# the file CONTRIBUTING in the tz distribution.
30+
# go ahead and edit the file, and please send any changes to
31+
# the public mailing list tz@iana.org for general use in the future.
32+
# For more, please see the file CONTRIBUTING in the tz distribution.
3333

3434
# From Paul Eggert (2019-07-11):
3535
#

‎make/data/tzdata/australasia‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -960,9 +960,9 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
960960
# NOTES
961961

962962
# This file is by no means authoritative; if you think you know better,
963-
# go ahead and edit the file (and please send any changes to
964-
# tz@iana.org for general use in the future). For more, please see
965-
# the file CONTRIBUTING in the tz distribution.
963+
# go ahead and edit the file, and please send any changes to
964+
# the public mailing list tz@iana.org for general use in the future.
965+
# For more, please see the file CONTRIBUTING in the tz distribution.
966966

967967
# From Paul Eggert (2018-11-18):
968968
#
@@ -2011,6 +2011,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
20112011
# From Paul Eggert (2018-11-19):
20122012
# The 1921-01-15 introduction of standard time is in Shanks; it is also in
20132013
# "Standard Time Throughout the World", US National Bureau of Standards (1935),
2014+
# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular406.pdf
20142015
# page 3, which does not give the UT offset. In response to a comment by
20152016
# Phake Nick I set the Nauru time of occupation by Japan to
20162017
# 1942-08-29/1945-09-08 by using dates from:
@@ -2078,9 +2079,10 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
20782079
# https://webspace.science.uu.nl/~gent0113/idl/idl_alaska_samoa.htm
20792080

20802081
# Although Shanks & Pottenger says they both switched to UT -11:30
2081-
# in 1911, and to -11 in 1950. many earlier sources give -11
2082+
# in 1911, and to -11 in 1950, many earlier sources give -11
20822083
# for American Samoa, e.g., the US National Bureau of Standards
20832084
# circular "Standard Time Throughout the World", 1932.
2085+
# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular399.pdf
20842086
# Assume American Samoa switched to -11 in 1911, not 1950,
20852087
# and that after 1950 they agreed until (western) Samoa skipped a
20862088
# day in 2011. Assume also that the Samoas follow the US and New

‎make/data/tzdata/etcetera‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
# which load the "UTC" file to handle seconds properly.
4444
Zone Etc/UTC 0 - UTC
4545

46-
# Functions like gmtime load the "GMT" file to handle leap seconds properly.
46+
# If leap second support is enabled, functions like gmtime
47+
# load the "GMT" file to handle leap seconds properly.
4748
# Vanguard section, which works with most .zi parsers.
4849
#Zone GMT 0 - GMT
4950
# Rearguard section, for TZUpdater 2.3.2 and earlier.

0 commit comments

Comments
 (0)