merge master to openEuler-24.03-LTS-SP4-openjdk-11-AtomGit

已合并

merge master to openEuler-24.03-LTS-SP4 #469

DXwangg创建于 4月27日从master 合入到 openEuler-24.03-LTS-SP4

merge master to openEuler-24.03-LTS-SP4 #469

已合并

DXwangg创建于 4月27日

从master合入到openEuler-24.03-LTS-SP4

共 12 个文件变更+177-667

D8373476-tz-Update-Timezone-Data-to-2025c.patch+0-463

	@@ -1,463 +0,0 @@
1	-From 3a8ef2bc1aeedb848fcd78beea88c88339aa2fbe Mon Sep 17 00:00:00 2001
2	-From: easyly <wly_easy@163.com>
3	-Date: Thu, 5 Feb 2026 11:08:25 +0800
4	-Subject: [PATCH] 8373476: (tz) Update Timezone Data to 2025c
5	-
6	----
7	- make/data/tzdata/VERSION \| 2 +-
8	- make/data/tzdata/africa \| 9 ++--
9	- make/data/tzdata/antarctica \| 12 ++---
10	- make/data/tzdata/asia \| 6 +--
11	- make/data/tzdata/australasia \| 10 ++--
12	- make/data/tzdata/europe \| 52 ++++++++++++------
13	- make/data/tzdata/iso3166.tab \| 18 +++----
14	- make/data/tzdata/leapseconds \| 19 ++++---
15	- make/data/tzdata/northamerica \| 53 +++++++++++++++----
16	- make/data/tzdata/southamerica \| 6 +--
17	- .../java/util/TimeZone/TimeZoneData/VERSION \| 2 +-
18	- 11 files changed, 124 insertions(+), 65 deletions(-)
19	-
20	-diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
21	-index 4bd54efbc..ce25e7653 100644
22	---- a/make/data/tzdata/VERSION
23	-+++ b/make/data/tzdata/VERSION
24	-@@ -21,4 +21,4 @@
25	- # or visit www.oracle.com if you need additional information or have any
26	- # questions.
27	- #
28	--tzdata2025b
29	-+tzdata2025c
30	-diff --git a/make/data/tzdata/africa b/make/data/tzdata/africa
31	-index 8098f4bea..cf1247ee3 100644
32	---- a/make/data/tzdata/africa
33	-+++ b/make/data/tzdata/africa
34	-@@ -27,9 +27,9 @@
35	- # 2009-05-17 by Arthur David Olson.
36	-
37	- # This file is by no means authoritative; if you think you know better,
38	--# go ahead and edit the file (and please send any changes to
39	--# tz@iana.org for general use in the future). For more, please see
40	--# the file CONTRIBUTING in the tz distribution.
41	-+# go ahead and edit the file, and please send any changes to
42	-+# the public mailing list tz@iana.org for general use in the future.
43	-+# For more, please see the file CONTRIBUTING in the tz distribution.
44	-
45	- # From Paul Eggert (2018-05-27):
46	- #
47	-@@ -138,8 +138,9 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
48	- -1:00 - %z
49	-
50	- # Chad
51	-+# Fort-Lamy was renamed to N’Djamena on 1973-04-06.
52	- # Zone NAME STDOFF RULES FORMAT [UNTIL]
53	--Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # N'Djamena
54	-+Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # Fort-Lamy
55	- 1:00 - WAT 1979 Oct 14
56	- 1:00 1:00 WAST 1980 Mar 8
57	- 1:00 - WAT
58	-diff --git a/make/data/tzdata/antarctica b/make/data/tzdata/antarctica
59	-index 87787d31c..b3c186851 100644
60	---- a/make/data/tzdata/antarctica
61	-+++ b/make/data/tzdata/antarctica
62	-@@ -26,13 +26,10 @@
63	- # This file is in the public domain, so clarified as of
64	- # 2009-05-17 by Arthur David Olson.
65	-
66	--# From Paul Eggert (1999-11-15):
67	--# To keep things manageable, we list only locations occupied year-round; see
68	--# COMNAP - Stations and Bases
69	--# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
70	--# and
71	--# Summary of the Peri-Antarctic Islands (1998-07-23)
72	--# http://www.spri.cam.ac.uk/bob/periant.htm
73	-+# From Paul Eggert (2025-08-16):
74	-+# To keep things manageable, list only locations occupied year-round; see
75	-+# Antarctic Facilities Information
76	-+# https://www.comnap.aq/antarctic-facilities-information
77	- # for information.
78	- # Unless otherwise specified, we have no time zone information.
79	-
80	-@@ -167,6 +164,7 @@ Zone Antarctica/Mawson 0 - -00 1954 Feb 13
81	- # China - year-round bases
82	- # Great Wall, King George Island, -6213-05858, since 1985-02-20
83	- # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
84	-+# Qinling, Inexpressible I, Terra Nova Bay, -7456+16343, since 2024-02-07
85	-
86	- # France - year-round bases (also see "France & Italy")
87	- #
88	-diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia
89	-index 55b13134f..005abd017 100644
90	---- a/make/data/tzdata/asia
91	-+++ b/make/data/tzdata/asia
92	-@@ -27,9 +27,9 @@
93	- # 2009-05-17 by Arthur David Olson.
94	-
95	- # This file is by no means authoritative; if you think you know better,
96	--# go ahead and edit the file (and please send any changes to
97	--# tz@iana.org for general use in the future). For more, please see
98	--# the file CONTRIBUTING in the tz distribution.
99	-+# go ahead and edit the file, and please send any changes to
100	-+# the public mailing list tz@iana.org for general use in the future.
101	-+# For more, please see the file CONTRIBUTING in the tz distribution.
102	-
103	- # From Paul Eggert (2019-07-11):
104	- #
105	-diff --git a/make/data/tzdata/australasia b/make/data/tzdata/australasia
106	-index d659d1fb4..638789f42 100644
107	---- a/make/data/tzdata/australasia
108	-+++ b/make/data/tzdata/australasia
109	-@@ -960,9 +960,9 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
110	- # NOTES
111	-
112	- # This file is by no means authoritative; if you think you know better,
113	--# go ahead and edit the file (and please send any changes to
114	--# tz@iana.org for general use in the future). For more, please see
115	--# the file CONTRIBUTING in the tz distribution.
116	-+# go ahead and edit the file, and please send any changes to
117	-+# the public mailing list tz@iana.org for general use in the future.
118	-+# For more, please see the file CONTRIBUTING in the tz distribution.
119	-
120	- # From Paul Eggert (2018-11-18):
121	- #
122	-@@ -2011,6 +2011,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
123	- # From Paul Eggert (2018-11-19):
124	- # The 1921-01-15 introduction of standard time is in Shanks; it is also in
125	- # "Standard Time Throughout the World", US National Bureau of Standards (1935),
126	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular406.pdf
127	- # page 3, which does not give the UT offset. In response to a comment by
128	- # Phake Nick I set the Nauru time of occupation by Japan to
129	- # 1942-08-29/1945-09-08 by using dates from:
130	-@@ -2078,9 +2079,10 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
131	- # https://webspace.science.uu.nl/~gent0113/idl/idl_alaska_samoa.htm
132	-
133	- # Although Shanks & Pottenger says they both switched to UT -11:30
134	--# in 1911, and to -11 in 1950. many earlier sources give -11
135	-+# in 1911, and to -11 in 1950, many earlier sources give -11
136	- # for American Samoa, e.g., the US National Bureau of Standards
137	- # circular "Standard Time Throughout the World", 1932.
138	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular399.pdf
139	- # Assume American Samoa switched to -11 in 1911, not 1950,
140	- # and that after 1950 they agreed until (western) Samoa skipped a
141	- # day in 2011. Assume also that the Samoas follow the US and New
142	-diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe
143	-index 7ba6c6796..b82ca6f67 100644
144	---- a/make/data/tzdata/europe
145	-+++ b/make/data/tzdata/europe
146	-@@ -27,9 +27,9 @@
147	- # 2009-05-17 by Arthur David Olson.
148	-
149	- # This file is by no means authoritative; if you think you know better,
150	--# go ahead and edit the file (and please send any changes to
151	--# tz@iana.org for general use in the future). For more, please see
152	--# the file CONTRIBUTING in the tz distribution.
153	-+# go ahead and edit the file, and please send any changes to
154	-+# the public mailing list tz@iana.org for general use in the future.
155	-+# For more, please see the file CONTRIBUTING in the tz distribution.
156	-
157	- # From Paul Eggert (2017-02-10):
158	- #
159	-@@ -65,7 +65,7 @@
160	- # <https://www.jstor.org/stable/1774359>. He writes:
161	- # "It is requested that corrections and additions to these tables
162	- # may be sent to Mr. John Milne, Royal Geographical Society,
163	--# Savile Row, London." Nowadays please email them to tz@iana.org.
164	-+# Savile Row, London." Nowadays please see the file CONTRIBUTING.
165	- #
166	- # Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
167	- # This Russian-language source was consulted by Vladimir Karpinsky; see
168	-@@ -77,7 +77,7 @@
169	- # Десятая гос. тип., 1919.
170	- # http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
171	- #
172	--# Brazil's Divisão Serviço da Hora (DSHO),
173	-+# Brazil's Divisão de Serviços da Hora (DISHO)
174	- # History of Summer Time
175	- # <http://pcdsh01.on.br/HISTHV.htm>
176	- # (1998-09-21, in Portuguese)
177	-@@ -937,7 +937,7 @@ Rule Belgium 1922 1927 - Oct Sat>=1 23:00s 0 -
178	- Rule Belgium 1923 only - Apr 21 23:00s 1:00 S
179	- Rule Belgium 1924 only - Mar 29 23:00s 1:00 S
180	- Rule Belgium 1925 only - Apr 4 23:00s 1:00 S
181	--# DSH writes that a royal decree of 1926-02-22 specified the Sun following 3rd
182	-+# DISHO writes that a royal decree of 1926-02-22 specified the Sun following 3rd
183	- # Sat in Apr (except if it's Easter, in which case it's one Sunday earlier),
184	- # to Sun following 1st Sat in Oct, and that a royal decree of 1928-09-15
185	- # changed the transition times to 02:00 GMT.
186	-@@ -1333,6 +1333,13 @@ Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31
187	- # France
188	- # Monaco
189	-
190	-+# From Robert H. van Gent (2025-07-21):
191	-+# The most recent issue of the Annuaire [par le Bureau des Longitudes]
192	-+# on Gallica (2021) ... lists information for France
193	-+# https://gallica.bnf.fr/ark:/12148/bpt6k9127672b/f52.item
194	-+# From Paul Eggert (2025-07-21):
195	-+# Go with the 2020 Annuaire (published 2021) except as noted below.
196	-+
197	- # From Ciro Discepolo (2000-12-20):
198	- #
199	- # Henri Le Corre, Régimes horaires pour le monde entier, Éditions
200	-@@ -1394,7 +1401,6 @@ Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31
201	- # problems in Algiers, Monaco and Tunis.
202	-
203	- #
204	--# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
205	- # Rule NAME FROM TO - IN ON AT SAVE LETTER/S
206	- Rule France 1916 only - Jun 14 23:00s 1:00 S
207	- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
208	-@@ -1406,9 +1412,25 @@ Rule France 1920 only - Oct 23 23:00s 0 -
209	- Rule France 1921 only - Mar 14 23:00s 1:00 S
210	- Rule France 1921 only - Oct 25 23:00s 0 -
211	- Rule France 1922 only - Mar 25 23:00s 1:00 S
212	--# DSH writes that a law of 1923-05-24 specified 3rd Sat in Apr at 23:00 to 1st
213	--# Sat in Oct at 24:00; and that in 1930, because of Easter, the transitions
214	--# were Apr 12 and Oct 5. Go with Shanks & Pottenger.
215	-+# From Robert H. van Gent (2025-07-22):
216	-+# There is a curious history behind the erroneous date for the start of
217	-+# daylight saving in France in 1923 as listed in the current issues of
218	-+# the Annuaire du Bureau des Longitudes. [See:]
219	-+# https://lists.iana.org/hyperkitty/list/tz@iana.org/message/MYQEJMSXO2AIEZ3UIXZKMTTAIPY7KNT2/
220	-+# From Brian Inglis (2025-07-23):
221	-+# Légifrance JORF No. 0073 du 15 mars 1922
222	-+# https://www.legifrance.gouv.fr/jorf/jo/id/JORFCONT000000008324
223	-+# Légifrance JORF No. 0139 du 25 mai 1923
224	-+# https://www.legifrance.gouv.fr/jorf/jo/id/JORFCONT000000008416
225	-+# From Paul Eggert (2025-07-23):
226	-+# The latter specifies March's last Saturday at 23:00 to October's first
227	-+# Saturday at 24:00, except that if neighboring allies agree the dates
228	-+# can be moved to April's third Saturday and September's third Saturday.
229	-+# Apparently spring 1923 was tricky. DISHO writes that in 1930,
230	-+# because of Easter, the transitions were Apr 12 and Oct 5.
231	-+# Use the 2020 Annuaire dates, except for spring 1923 where
232	-+# Shanks & Pottenger's May 26 matches the dates given in the 1924 and
233	-+# 1961-2001 issues of the Annuaire.
234	- Rule France 1922 1938 - Oct Sat>=1 23:00s 0 -
235	- Rule France 1923 only - May 26 23:00s 1:00 S
236	- Rule France 1924 only - Mar 29 23:00s 1:00 S
237	-@@ -2119,12 +2141,10 @@ Zone Europe/Warsaw 1:24:00 - LMT 1880
238	- # all clocks therefore having to be advanced or set back correspondingly ...
239	-
240	- # Rule NAME FROM TO - IN ON AT SAVE LETTER/S
241	--# From Tim Parenti (2024-07-01), per Paul Eggert (1999-01-30):
242	--# DSH writes in their history that Decreto 1469 of 1915-03-30 established
243	--# summer time and that, "despite" this, the change to the clocks was not done
244	--# every year, depending on what Spain did, because of railroad schedules.
245	--# In fact, that decree had nothing to do with DST; rather, it regulated the
246	--# sending of time signals. But we do see linkage to Spain in the 1920s below.
247	-+# From Tim Parenti (2024-07-01):
248	-+# Decreto 1469 of 1915-03-30 ... had nothing to do with DST;
249	-+# rather it regulated the sending of time signals.
250	-+# But we do see linkage to Spain in the 1920s below.
251	- # https://dre.pt/dr/detalhe/decreto/1469-1915-285721
252	- # https://dre.pt/application/conteudo/285721
253	- #
254	-diff --git a/make/data/tzdata/iso3166.tab b/make/data/tzdata/iso3166.tab
255	-index 7fa350ecb..ddcc841fe 100644
256	---- a/make/data/tzdata/iso3166.tab
257	-+++ b/make/data/tzdata/iso3166.tab
258	-@@ -26,22 +26,22 @@
259	- # This file is in the public domain, so clarified as of
260	- # 2009-05-17 by Arthur David Olson.
261	- #
262	--# From Paul Eggert (2023-09-06):
263	-+# From Paul Eggert (2025-07-01):
264	- # This file contains a table of two-letter country codes. Columns are
265	--# separated by a single tab. Lines beginning with '#' are comments.
266	-+# separated by a single tab. Lines beginning with ‘#’ are comments.
267	- # All text uses UTF-8 encoding. The columns of the table are as follows:
268	- #
269	- # 1. ISO 3166-1 alpha-2 country code, current as of
270	--# ISO/TC 46 N1108 (2023-04-05). See: ISO/TC 46 Documents
271	-+# ISO/TC 46 N1127 (2024-02-29). See: ISO/TC 46 Documents
272	- # https://www.iso.org/committee/48750.html?view=documents
273	- # 2. The usual English name for the coded region. This sometimes
274	- # departs from ISO-listed names, sometimes so that sorted subsets
275	--# of names are useful (e.g., "Samoa (American)" and "Samoa
276	--# (western)" rather than "American Samoa" and "Samoa"),
277	-+# of names are useful (e.g., “Samoa (American)” and “Samoa
278	-+# (western)” rather than “American Samoa” and “Samoa”),
279	- # sometimes to avoid confusion among non-experts (e.g.,
280	--# "Czech Republic" and "Turkey" rather than "Czechia" and "Türkiye"),
281	--# and sometimes to omit needless detail or churn (e.g., "Netherlands"
282	--# rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
283	-+# “Czech Republic” and “Turkey” rather than “Czechia” and “Türkiye”),
284	-+# and sometimes to omit needless detail or churn (e.g., “Netherlands”
285	-+# rather than “Netherlands (the)” or “Netherlands (Kingdom of the)”).
286	- #
287	- # The table is sorted by country code.
288	- #
289	-@@ -94,7 +94,7 @@ CD Congo (Dem. Rep.)
290	- CF Central African Rep.
291	- CG Congo (Rep.)
292	- CH Switzerland
293	--CI Côte d'Ivoire
294	-+CI Côte d’Ivoire
295	- CK Cook Islands
296	- CL Chile
297	- CM Cameroon
298	-diff --git a/make/data/tzdata/leapseconds b/make/data/tzdata/leapseconds
299	-index 042a32b05..9426b40f0 100644
300	---- a/make/data/tzdata/leapseconds
301	-+++ b/make/data/tzdata/leapseconds
302	-@@ -28,7 +28,8 @@
303	- # This file is generated automatically from the data in the public-domain
304	- # NIST/IERS format leap-seconds.list file, which can be copied from
305	- # <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
306	--# or, in a variant with different comments, from
307	-+# or via a less-secure protocol and with different comments and
308	-+# less volatile last-modified and expiration timestamps, from
309	- # <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
310	- # For more about leap-seconds.list, please see
311	- # The NTP Timescale and Leap Seconds
312	-@@ -92,11 +93,17 @@ Leap 2016 Dec 31 23:59:60 + S
313	- # Any additional leap seconds will come after this.
314	- # This Expires line is commented out for now,
315	- # so that pre-2020a zic implementations do not reject this file.
316	--#Expires 2025 Dec 28 00:00:00
317	-+#Expires 2026 Jun 28 00:00:00
318	-
319	--# POSIX timestamps for the data in this file:
320	--#updated 1736208000 (2025-01-07 00:00:00 UTC)
321	--#expires 1766880000 (2025-12-28 00:00:00 UTC)
322	-+# Here are POSIX timestamps for the data in this file.
323	-+# "#updated" gives the last time the leap seconds data changed
324	-+# or, if this file was derived from the IERS leap-seconds.list,
325	-+# the last time that file changed in any way.
326	-+# "#expires" gives the first time this file might be wrong;
327	-+# if this file was derived from the IERS leap-seconds.list,
328	-+# this is typically a bit less than one year after "updated".
329	-+#updated 1751846400 (2025-07-07 00:00:00 UTC)
330	-+#expires 1782604800 (2026-06-28 00:00:00 UTC)
331	-
332	- # Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
333	--# File expires on 28 December 2025
334	-+# File expires on 28 June 2026
335	-diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
336	-index 21f178ee8..f20879e90 100644
337	---- a/make/data/tzdata/northamerica
338	-+++ b/make/data/tzdata/northamerica
339	-@@ -29,9 +29,9 @@
340	- # also includes Central America and the Caribbean
341	-
342	- # This file is by no means authoritative; if you think you know better,
343	--# go ahead and edit the file (and please send any changes to
344	--# tz@iana.org for general use in the future). For more, please see
345	--# the file CONTRIBUTING in the tz distribution.
346	-+# go ahead and edit the file, and please send any changes to
347	-+# the public mailing list tz@iana.org for general use in the future.
348	-+# For more, please see the file CONTRIBUTING in the tz distribution.
349	-
350	- # From Paul Eggert (1999-03-22):
351	- # A reliable and entertaining source about time zones is
352	-@@ -1241,6 +1241,16 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
353	- # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
354	- # Jimmy Skaggs, _The Great Guano Rush_ (1994).
355	-
356	-+# From Rob van Gent (2025-07-23):
357	-+# Another useful source for historical time zone information appears to be
358	-+# a series of circulars with the title "Standard Time Throughout the World"
359	-+# issued between 1925 and 1950 by the U.S. Bureau of Standards.
360	-+# I found the following issues online:
361	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular280.pdf (1925)
362	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular399.pdf (1932)
363	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular406.pdf (1935)
364	-+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular496.pdf (1950)
365	-+
366	- ################################################################################
367	-
368	-
369	-@@ -2457,12 +2467,35 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
370	- # on the same dates or with a difference of one day.
371	- # So it may be easier to implement these changes as DST with rule CA
372	- # during this whole period.
373	--#
374	--# From Paul Eggert (2024-08-18):
375	--# For now, maintain the slightly-different history for Baja California,
376	-+
377	-+# From Alois Treindl (2025-07-29):
378	-+# I did a quick newspaper archive research on https://hndm.iib.unam.mx/
379	-+# and found that Periódico Oficial del Estado de Baja California Norte
380	-+# (1973-04-20) states clearly that DST was observed from last Sunday
381	-+# in April to last Sunday in October.... I have a few more data from the
382	-+# official bulletin for DST begin or end in Baja California 1964 1967 1969
383	-+# 1972 1973 (already sent) 1974 1975 1976 I do not know whether it is safe to
384	-+# assume that it also applied in the years where I did not yet find proof.
385	-+# The 1974 end of DST contains a reference to an Acuerdo of 1973-dec-20 which
386	-+# I could not find.... One might assume that Baja California, which followed
387	-+# US-CA in all these other yours, did the same.
388	-+#
389	-+# From Paul Eggert (2025-08-04):
390	-+# Assume that Tijuana agreed with San Diego from 1953 through 1996,
391	-+# as this agrees with Alois Treindl's data and with Shanks.
392	-+# For now, keep the slightly-different 1948/1952 history for Baja California,
393	- # as we have no information on whether 1948/1952 clocks in Tijuana followed
394	- # the decrees or followed San Diego.
395	-
396	-+# From Mark Schapiro, writing in The Nation (2002-10-28):
397	-+# https://www.thenation.com/article/archive/sowing-disaster/
398	-+# When Mexican clocks were turned back for daylight saving time in the spring,
399	-+# the Zapotecs refused to make the adjustment, insisting that they live in
400	-+# "God's time," not in what they derisively call "Fox time," referring to
401	-+# President Vicente Fox in far-off Mexico City.
402	-+# From Paul Eggert (2025-08-04):
403	-+# Unfortunately we have no data to track this informal practice.
404	-+
405	- # From Alan Perry (1996-02-15):
406	- # A guy from our Mexico subsidiary finally found the Presidential Decree
407	- # outlining the timezone changes in Mexico.
408	-@@ -2728,7 +2761,7 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
409	- # Chihuahua (near US border - western side)
410	- # This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and
411	- # Práxedis G Guerrero.
412	--# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
413	-+# https://gaceta.diputados.gob.mx/PDF/65/2022/nov/20221124-VII.pdf
414	- Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u
415	- -7:00 - MST 1927 Jun 10
416	- -6:00 - CST 1930 Nov 15
417	-@@ -2743,7 +2776,7 @@ Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u
418	- # Chihuahua (near US border - eastern side)
419	- # This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel
420	- # Benavides.
421	--# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
422	-+# https://gaceta.diputados.gob.mx/PDF/65/2022/nov/20221124-VII.pdf
423	- Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
424	- -7:00 - MST 1927 Jun 10
425	- -6:00 - CST 1930 Nov 15
426	-@@ -2840,9 +2873,7 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u
427	- -8:00 1:00 PDT 1951 Sep 30 2:00
428	- -8:00 - PST 1952 Apr 27 2:00
429	- -8:00 1:00 PDT 1952 Sep 28 2:00
430	-- -8:00 - PST 1954
431	-- -8:00 CA P%sT 1961
432	-- -8:00 - PST 1976
433	-+ -8:00 CA P%sT 1967
434	- -8:00 US P%sT 1996
435	- -8:00 Mexico P%sT 2001
436	- -8:00 US P%sT 2002 Feb 20
437	-diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica
438	-index 06fee598b..bcd4abdfa 100644
439	---- a/make/data/tzdata/southamerica
440	-+++ b/make/data/tzdata/southamerica
441	-@@ -4,9 +4,9 @@
442	- # 2009-05-17 by Arthur David Olson.
443	-
444	- # This file is by no means authoritative; if you think you know better,
445	--# go ahead and edit the file (and please send any changes to
446	--# tz@iana.org for general use in the future). For more, please see
447	--# the file CONTRIBUTING in the tz distribution.
448	-+# go ahead and edit the file, and please send any changes to
449	-+# the public mailing list tz@iana.org for general use in the future.
450	-+# For more, please see the file CONTRIBUTING in the tz distribution.
451	-
452	- # From Paul Eggert (2016-12-05):
453	- #
454	-diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
455	-index 750d9fae2..76d146afc 100644
456	---- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
457	-+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
458	-@@ -1 +1 @@
459	--tzdata2025b
460	-+tzdata2025c
461	---
462	-2.34.1
463	-

MAdd-riscv64-support.patch+4-4

	@@ -3690,7 +3690,7 @@ index 0000000000..9e7d271860
3690	+ static const unsigned long branch_range = 1 * M;	3690	+ static const unsigned long branch_range = 1 * M;
3691	+	3691	+
3692	+ static bool reachable_from_branch_at(address branch, address target) {	3692	+ static bool reachable_from_branch_at(address branch, address target) {
3693	-+ return uabs(target - branch) < branch_range;	3693	++ return g_uabs(target - branch) < branch_range;
3694	+ }	3694	+ }
3695	+	3695	+
3696	+ virtual ~Assembler() {}	3696	+ virtual ~Assembler() {}
	@@ -41838,7 +41838,7 @@ index 0000000000..9970229c5c
41838	+ * goto copy_8_bytes;	41838	+ * goto copy_8_bytes;
41839	+ * }	41839	+ * }
41840	+ * bool is_backwards = step < 0;	41840	+ * bool is_backwards = step < 0;
41841	-+ * int granularity = uabs(step);	41841	++ * int granularity = g_uabs(step);
41842	+ * count = count * granularity; * count bytes	41842	+ * count = count * granularity; * count bytes
41843	+ *	41843	+ *
41844	+ * if (is_backwards) {	41844	+ * if (is_backwards) {
	@@ -41865,7 +41865,7 @@ index 0000000000..9970229c5c
41865	+	41865	+
41866	+ void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) {	41866	+ void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) {
41867	+ bool is_backward = step < 0;	41867	+ bool is_backward = step < 0;
41868	-+ int granularity = uabs(step);	41868	++ int granularity = g_uabs(step);
41869	+	41869	+
41870	+ const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17;	41870	+ const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17;
41871	+ assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2);	41871	+ assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2);
	@@ -41914,7 +41914,7 @@ index 0000000000..9970229c5c
41914	+ }	41914	+ }
41915	+	41915	+
41916	+ bool is_backwards = step < 0;	41916	+ bool is_backwards = step < 0;
41917	-+ int granularity = uabs(step);	41917	++ int granularity = g_uabs(step);
41918	+	41918	+
41919	+ const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17;	41919	+ const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17;
41920	+	41920	+

MG1-iterate-region-by-bitmap-rather-than-obj-size-in.patch+1-1

	@@ -367,4 +367,4 @@ index 000000000..85b49171c
367	--- /dev/null	367	--- /dev/null
368	+++ b/version.txt	368	+++ b/version.txt
369	@@ -0,0 +1 @@	369	@@ -0,0 +1 @@
370	-+11.0.30.0.13	370	++11.0.31.0.13

AOpenJDK11U-jdk_aarch64_linux_hotspot_11.0.30_7.tar.xz+0-0

Binary files do not support preview

AOpenJDK11U-jdk_x64_linux_hotspot_11.0.30_7.tar.xz+0-0

Binary files do not support preview

AUse-stlr-for-putOrdered.patch+96-0

@@ -0,0 +1,96 @@
	1	+From c192f6b3076b52e2ef34bcfcc2ae61cd43371f44 Mon Sep 17 00:00:00 2001
	2	+From: xiejf2020 <xiejunfeng3@huawei.com>
	3	+Date: Sat, 18 Apr 2026 15:59:35 +0800
	4	+Subject: [PATCH] Use stlr for putOrdered
	5	+
	6	+---
	7	+ src/hotspot/cpu/aarch64/aarch64.ad \| 8 ++++++--
	8	+ src/hotspot/cpu/aarch64/globals_aarch64.hpp \| 4 +++-
	9	+ src/hotspot/share/gc/shared/c2/barrierSetC2.cpp \| 5 +++++
	10	+ src/hotspot/share/opto/memnode.hpp \| 7 +++++++
	11	+ 4 files changed, 21 insertions(+), 3 deletions(-)
	12	+
	13	+diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
	14	+index 50b39f784..17509c05c 100644
	15	+--- a/src/hotspot/cpu/aarch64/aarch64.ad
	16	++++ b/src/hotspot/cpu/aarch64/aarch64.ad
	17	+@@ -1744,7 +1744,11 @@ bool unnecessary_release(const Node *n)
	18	+
	19	+ MemBarNode *barrier = n->as_MemBar();
	20	+ if (!barrier->leading()) {
	21	+- return false;
	22	++ // Standalone MemBarRelease marked by C2AccessFence for release stores
	23	++ // (e.g. Unsafe.putOrderedX / VarHandle.setRelease).
	24	++ // When UseStlrForRelease is true, the store already uses stlr which
	25	++ // provides the release ordering, so the dmb ish is unnecessary.
	26	++ return UseStlrForRelease && barrier->standalone_release();
	27	+ } else {
	28	+ Node* trailing = barrier->trailing_membar();
	29	+ MemBarNode* trailing_mb = trailing->as_MemBar();
	30	+@@ -1801,7 +1805,7 @@ bool needs_releasing_store(const Node *n)
	31	+
	32	+ StoreNode *st = n->as_Store();
	33	+
	34	+- return st->trailing_membar() != NULL;
	35	++ return st->trailing_membar() != NULL \|\| (UseStlrForRelease && st->is_release());
	36	+ }
	37	+
	38	+ // predicate controlling translation of CAS
	39	+diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
	40	+index d8b198a0b..e5831f15d 100644
	41	+--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
	42	++++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
	43	+@@ -122,6 +122,8 @@ define_pd_global(intx, InlineSmallCode, 1000);
	44	+ product(int, SoftwarePrefetchHintDistance, -1, \
	45	+ "Use prfm hint with specified distance in compiled code." \
	46	+ "Value -1 means off.") \
	47	+- range(-1, 4096)
	48	++ range(-1, 4096) \
	49	++ product(bool, UseStlrForRelease, false, \
	50	++ "Use stlr instead of dmb ish + str for release stores") \
	51	+
	52	+ #endif // CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
	53	+diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
	54	+index 48fe04b08..a2f15416b 100644
	55	+--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
	56	++++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
	57	+@@ -166,6 +166,11 @@ public:
	58	+ // another volatile read.
	59	+ if (is_volatile \|\| is_release) {
	60	+ _leading_membar = kit->insert_mem_bar(Op_MemBarRelease);
	61	++#ifdef AARCH64
	62	++ if (UseStlrForRelease && is_release && !is_volatile) {
	63	++ _leading_membar->as_MemBar()->set_standalone_release();
	64	++ }
	65	++#endif
	66	+ }
	67	+ } else {
	68	+ // Memory barrier to prevent normal and 'unsafe' accesses from
	69	+diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
	70	+index 259b4343f..4cb1e9435 100644
	71	+--- a/src/hotspot/share/opto/memnode.hpp
	72	++++ b/src/hotspot/share/opto/memnode.hpp
	73	+@@ -1183,6 +1183,9 @@ class MemBarNode: public MultiNode {
	74	+ LeadingStore,
	75	+ TrailingLoadStore,
	76	+ LeadingLoadStore
	77	++#ifdef AARCH64
	78	++ , StandaloneRelease
	79	++#endif // AARCH64
	80	+ } _kind;
	81	+
	82	+ #ifdef ASSERT
	83	+@@ -1219,6 +1222,10 @@ public:
	84	+ bool trailing() const { return _kind == TrailingLoad \|\| _kind == TrailingStore \|\| _kind == TrailingLoadStore; }
	85	+ bool leading() const { return _kind == LeadingStore \|\| _kind == LeadingLoadStore; }
	86	+ bool standalone() const { return _kind == Standalone; }
	87	++#ifdef AARCH64
	88	++ void set_standalone_release() { _kind = StandaloneRelease; }
	89	++ bool standalone_release() const { return _kind == StandaloneRelease; }
	90	++#endif // AARCH64
	91	+
	92	+ static void set_store_pair(MemBarNode* leading, MemBarNode* trailing);
	93	+ static void set_load_store_pair(MemBarNode* leading, MemBarNode* trailing);
	94	+--
	95	+2.34.1
	96	+

Madd-sw_64-support.patch+14-13

	@@ -1,3 +1,4 @@
		1	+warning: refname 'jdk-11.0.30-ga' is ambiguous.
1	diff --git a/Changelog.md b/Changelog.md	2	diff --git a/Changelog.md b/Changelog.md
2	new file mode 100644	3	new file mode 100644
3	index 0000000000..506556df23	4	index 0000000000..506556df23
	@@ -234,7 +235,7 @@ index 0000000000..faacaf6a2c
234	+git update-index --assume-unchanged compile_commands.json	235	+git update-index --assume-unchanged compile_commands.json
235	+	236	+
236	diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk	237	diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
237	-index 46fb9b4219..b1ec753d94 100644	238	+index 3795dc87f2..81c3553419 100644
238	--- a/make/CompileJavaModules.gmk	239	--- a/make/CompileJavaModules.gmk
239	+++ b/make/CompileJavaModules.gmk	240	+++ b/make/CompileJavaModules.gmk
240	@@ -430,6 +430,7 @@ jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConca	241	@@ -430,6 +430,7 @@ jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConca
	@@ -278,7 +279,7 @@ index 46fb9b4219..b1ec753d94 100644
278	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \	279	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \
279	--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \	280	--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
280	diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk	281	diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
281	-index 918140fb5d..fb937b9c34 100644	282	+index c33ecd7673..ac69754a05 100644
282	--- a/make/RunTestsPrebuilt.gmk	283	--- a/make/RunTestsPrebuilt.gmk
283	+++ b/make/RunTestsPrebuilt.gmk	284	+++ b/make/RunTestsPrebuilt.gmk
284	@@ -225,6 +225,10 @@ endif	285	@@ -225,6 +225,10 @@ endif
	@@ -307,7 +308,7 @@ index 15ee438926..05659616a5 100644
307	eval $set_cc_for_build	308	eval $set_cc_for_build
308	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \	309	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
309	diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4	310	diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4
310	-index 7892b4001a..b428f2721b 100644	311	+index 940c9eaaca..d223418cd4 100644
311	--- a/make/autoconf/build-performance.m4	312	--- a/make/autoconf/build-performance.m4
312	+++ b/make/autoconf/build-performance.m4	313	+++ b/make/autoconf/build-performance.m4
313	@@ -32,6 +32,10 @@ AC_DEFUN([BPERF_CHECK_CORES],	314	@@ -32,6 +32,10 @@ AC_DEFUN([BPERF_CHECK_CORES],
	@@ -322,7 +323,7 @@ index 7892b4001a..b428f2721b 100644
322	elif test -x /usr/sbin/psrinfo; then	323	elif test -x /usr/sbin/psrinfo; then
323	# Looks like a Solaris system	324	# Looks like a Solaris system
324	diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4	325	diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
325	-index 8ead0e22d6..be7586b76d 100644	326	+index cb86f3acf0..2c2732d80c 100644
326	--- a/make/autoconf/flags-cflags.m4	327	--- a/make/autoconf/flags-cflags.m4
327	+++ b/make/autoconf/flags-cflags.m4	328	+++ b/make/autoconf/flags-cflags.m4
328	@@ -289,9 +289,9 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],	329	@@ -289,9 +289,9 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
	@@ -386,7 +387,7 @@ index 5d1d9efa39..fb732e25ea 100644
386	# The cpu defines below are for zero, we don't support them directly.	387	# The cpu defines below are for zero, we don't support them directly.
387	elif test "x$OPENJDK_$1_CPU" = xsparc; then	388	elif test "x$OPENJDK_$1_CPU" = xsparc; then
388	diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js	389	diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
389	-index 3b7194e425..f4c18d9dc0 100644	390	+index 8910c33506..4674afe0b9 100644
390	--- a/make/conf/jib-profiles.js	391	--- a/make/conf/jib-profiles.js
391	+++ b/make/conf/jib-profiles.js	392	+++ b/make/conf/jib-profiles.js
392	@@ -233,7 +233,7 @@ var getJibProfilesCommon = function (input, data) {	393	@@ -233,7 +233,7 @@ var getJibProfilesCommon = function (input, data) {
	@@ -1069,7 +1070,7 @@ index 0000000000..e748c76f48
1069		1070
1070	diff --git a/src/hotspot/cpu/sw64/assembler_sw64.hpp b/src/hotspot/cpu/sw64/assembler_sw64.hpp	1071	diff --git a/src/hotspot/cpu/sw64/assembler_sw64.hpp b/src/hotspot/cpu/sw64/assembler_sw64.hpp
1071	new file mode 100644	1072	new file mode 100644
1072	-index 0000000000..8ca7c18414	1073	+index 0000000000..1e9f3ec28a
1073	--- /dev/null	1074	--- /dev/null
1074	+++ b/src/hotspot/cpu/sw64/assembler_sw64.hpp	1075	+++ b/src/hotspot/cpu/sw64/assembler_sw64.hpp
1075	@@ -0,0 +1,2005 @@	1076	@@ -0,0 +1,2005 @@
	@@ -1698,7 +1699,7 @@ index 0000000000..8ca7c18414
1698	+ static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);	1699	+ static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
1699	+	1700	+
1700	+ static bool reachable_from_branch_at(address branch, address target) {	1701	+ static bool reachable_from_branch_at(address branch, address target) {
1701	-+ return uabs(target - branch) < branch_range;	1702	++ return g_uabs(target - branch) < branch_range;
1702	+ }	1703	+ }
1703	+	1704	+
1704	+ // Floating-point Move (immediate)	1705	+ // Floating-point Move (immediate)
	@@ -65522,7 +65523,7 @@ index 0000000000..2a00a5a26f
65522	+ return icache_line_size;	65523	+ return icache_line_size;
65523	+}	65524	+}
65524	diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp	65525	diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
65525	-index 2842a11f92..5698ae88d9 100644	65526	+index ac9d5ac190..bc129cba69 100644
65526	--- a/src/hotspot/os/linux/os_linux.cpp	65527	--- a/src/hotspot/os/linux/os_linux.cpp
65527	+++ b/src/hotspot/os/linux/os_linux.cpp	65528	+++ b/src/hotspot/os/linux/os_linux.cpp
65528	@@ -430,7 +430,7 @@ void os::init_system_properties_values() {	65529	@@ -430,7 +430,7 @@ void os::init_system_properties_values() {
	@@ -65567,7 +65568,7 @@ index 2842a11f92..5698ae88d9 100644
65567	#elif (defined MIPSEL)	65568	#elif (defined MIPSEL)
65568	static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;	65569	static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
65569	#elif (defined PARISC)	65570	#elif (defined PARISC)
65570	-@@ -3232,9 +3243,13 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,	65571	+@@ -3234,9 +3245,13 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
65571	}	65572	}
65572		65573
65573	// Define MAP_HUGETLB here so we can build HotSpot on old systems.	65574	// Define MAP_HUGETLB here so we can build HotSpot on old systems.
	@@ -65581,7 +65582,7 @@ index 2842a11f92..5698ae88d9 100644
65581		65582
65582	// Define MADV_HUGEPAGE here so we can build HotSpot on old systems.	65583	// Define MADV_HUGEPAGE here so we can build HotSpot on old systems.
65583	#ifndef MADV_HUGEPAGE	65584	#ifndef MADV_HUGEPAGE
65584	-@@ -3243,6 +3258,22 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,	65585	+@@ -3245,6 +3260,22 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
65585		65586
65586	int os::Linux::commit_memory_impl(char* addr, size_t size,	65587	int os::Linux::commit_memory_impl(char* addr, size_t size,
65587	size_t alignment_hint, bool exec) {	65588	size_t alignment_hint, bool exec) {
	@@ -65604,7 +65605,7 @@ index 2842a11f92..5698ae88d9 100644
65604	int err = os::Linux::commit_memory_impl(addr, size, exec);	65605	int err = os::Linux::commit_memory_impl(addr, size, exec);
65605	if (err == 0) {	65606	if (err == 0) {
65606	realign_memory(addr, size, alignment_hint);	65607	realign_memory(addr, size, alignment_hint);
65607	-@@ -4058,6 +4089,7 @@ size_t os::Linux::find_large_page_size() {	65608	+@@ -4060,6 +4091,7 @@ size_t os::Linux::find_large_page_size() {
65608	ARM32_ONLY(2 * M)	65609	ARM32_ONLY(2 * M)
65609	IA32_ONLY(4 * M)	65610	IA32_ONLY(4 * M)
65610	IA64_ONLY(256 * M)	65611	IA64_ONLY(256 * M)
	@@ -68136,7 +68137,7 @@ index 37bf331e91..6fc66e468f 100644
68136		68137
68137	// Test if x is within unsigned immediate range for width.	68138	// Test if x is within unsigned immediate range for width.
68138	diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp	68139	diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
68139	-index 65b414a38c..0f11b0cf40 100644	68140	+index 1f6718d3e3..a08b52df08 100644
68140	--- a/src/hotspot/share/asm/codeBuffer.cpp	68141	--- a/src/hotspot/share/asm/codeBuffer.cpp
68141	+++ b/src/hotspot/share/asm/codeBuffer.cpp	68142	+++ b/src/hotspot/share/asm/codeBuffer.cpp
68142	@@ -1190,7 +1190,11 @@ void CodeStrings::free() {	68143	@@ -1190,7 +1190,11 @@ void CodeStrings::free() {
	@@ -68427,7 +68428,7 @@ index e01a242a57..d17e03002d 100644
68427	#else	68428	#else
68428	#warning "Unconfigured platform"	68429	#warning "Unconfigured platform"
68429	diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp	68430	diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
68430	-index 9fa79d4488..778e18f8ff 100644	68431	+index 16b2c8b970..3aec3e515a 100644
68431	--- a/src/hotspot/share/oops/method.cpp	68432	--- a/src/hotspot/share/oops/method.cpp
68432	+++ b/src/hotspot/share/oops/method.cpp	68433	+++ b/src/hotspot/share/oops/method.cpp
68433	@@ -1504,9 +1504,11 @@ vmSymbols::SID Method::klass_id_for_intrinsics(const Klass* holder) {	68434	@@ -1504,9 +1504,11 @@ vmSymbols::SID Method::klass_id_for_intrinsics(const Klass* holder) {

Dfix-libpng-API-allow-reading-up-to-1012-bytes-beyond-the-png-sRGB-bbase-array-bug.patch+0-96

	@@ -1,96 +0,0 @@
1	-From 8c0e8bd1cfe752a3582b5206332c46d3616d9a13 Mon Sep 17 00:00:00 2001
2	-From: douyiwang <douyiwang@huawei.com>
3	-Date: Tue, 13 Jan 2026 21:00:44 +0800
4	-Subject: [PATCH] fix libpng API allow reading up to 1012 bytes beyond the png
5	- sRGB bbase[512] array bug
6	-
7	----
8	- .../native/libsplashscreen/libpng/pngread.c \| 51 ++++++++++++++-----
9	- .../native/libsplashscreen/libpng/pngrtran.c \| 1 +
10	- 2 files changed, 39 insertions(+), 13 deletions(-)
11	-
12	-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
13	-index 8a6381e1b..9e5e81dcb 100644
14	---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
15	-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
16	-@@ -3182,6 +3182,7 @@ png_image_read_composite(png_voidp argument)
17	- ptrdiff_t step_row = display->row_bytes;
18	- unsigned int channels =
19	- (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
20	-+ int optimize_alpha = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
21	- int pass;
22	-
23	- for (pass = 0; pass < passes; ++pass)
24	-@@ -3238,20 +3239,44 @@ png_image_read_composite(png_voidp argument)
25	-
26	- if (alpha < 255) /* else just use component */
27	- {
28	-- /* This is PNG_OPTIMIZED_ALPHA, the component value
29	-- * is a linear 8-bit value. Combine this with the
30	-- * current outrow[c] value which is sRGB encoded.
31	-- * Arithmetic here is 16-bits to preserve the output
32	-- * values correctly.
33	-- */
34	-- component = 257255; /* =65535 */
35	-- component += (255-alpha)*png_sRGB_table[outrow[c]];
36	-+ if (optimize_alpha != 0)
37	-+ {
38	-+ /* This is PNG_OPTIMIZED_ALPHA, the component value
39	-+ * is a linear 8-bit value. Combine this with the
40	-+ * current outrow[c] value which is sRGB encoded.
41	-+ * Arithmetic here is 16-bits to preserve the output
42	-+ * values correctly.
43	-+ */
44	-+ component = 257255; /* =65535 */
45	-+ component += (255-alpha)*png_sRGB_table[outrow[c]];
46	-
47	-- /* So 'component' is scaled by 255*65535 and is
48	-- * therefore appropriate for the sRGB to linear
49	-- * conversion table.
50	-- */
51	-- component = PNG_sRGB_FROM_LINEAR(component);
52	-+ /* Clamp to the valid range to defend against
53	-+ * unforeseen cases where the data might be sRGB
54	-+ * instead of linear premultiplied.
55	-+ * (Belt-and-suspenders for GitHub Issue #764.)
56	-+ */
57	-+ if (component > 255*65535)
58	-+ component = 255*65535;
59	-+
60	-+ /* So 'component' is scaled by 255*65535 and is
61	-+ * therefore appropriate for the sRGB-to-linear
62	-+ * conversion table.
63	-+ */
64	-+ component = PNG_sRGB_FROM_LINEAR(component);
65	-+ }
66	-+ else
67	-+ {
68	-+ /* Compositing was already done on the palette
69	-+ * entries. The data is sRGB premultiplied on black.
70	-+ * Composite with the background in sRGB space.
71	-+ * This is not gamma-correct, but matches what was
72	-+ * done to the palette.
73	-+ */
74	-+ png_uint_32 background = outrow[c];
75	-+ component += ((255-alpha) * background + 127) / 255;
76	-+ if (component > 255)
77	-+ component = 255;
78	-+ }
79	- }
80	-
81	- outrow[c] = (png_byte)component;
82	-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
83	-index 4f31f8f07..16afbe677 100644
84	---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
85	-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
86	-@@ -1827,6 +1827,7 @@ png_init_read_transformations(png_structrp png_ptr)
87	- * transformations elsewhere.
88	- */
89	- png_ptr->transformations &= ~(PNG_COMPOSE \| PNG_GAMMA);
90	-+ png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
91	- } /* color_type == PNG_COLOR_TYPE_PALETTE */
92	-
93	- /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
94	---
95	-GitCode
96	-

Dfix-libpng-CVE-2026-22695.patch+0-37

	@@ -1,37 +0,0 @@
1	-From 40b866e11e9a36a028ebcac24ee93093f81fc21a Mon Sep 17 00:00:00 2001
2	-From: wuyafang <wuyafang@huawei.com>
3	-Date: Thu, 22 Jan 2026 17:26:14 +0800
4	-Subject: [PATCH] libpng: fix CVE-2026-22695
5	-
6	----
7	- .../share/native/libsplashscreen/libpng/pngread.c \| 4 +++-
8	- 1 file changed, 3 insertions(+), 1 deletion(-)
9	-
10	-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
11	-index b7d9d94ac..f7b7bea8b 100644
12	---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
13	-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
14	-@@ -3166,9 +3166,11 @@ png_image_read_direct_scaled(png_voidp argument)
15	- argument);
16	- png_imagep image = display->image;
17	- png_structrp png_ptr = image->opaque->png_ptr;
18	-+ png_inforp info_ptr = image->opaque->info_ptr;
19	- png_bytep local_row = png_voidcast(png_bytep, display->local_row);
20	- png_bytep first_row = png_voidcast(png_bytep, display->first_row);
21	- ptrdiff_t row_bytes = display->row_bytes;
22	-+ size_t copy_bytes = png_get_rowbytes(png_ptr, info_ptr);
23	- int passes;
24	-
25	- /* Handle interlacing. */
26	-@@ -3198,7 +3200,7 @@ png_image_read_direct_scaled(png_voidp argument)
27	- png_read_row(png_ptr, local_row, NULL);
28	-
29	- /* Copy from local_row to user buffer. */
30	-- memcpy(output_row, local_row, (size_t)row_bytes);
31	-+ memcpy(output_row, local_row, copy_bytes);
32	- output_row += row_bytes;
33	- }
34	- }
35	---
36	-2.43.0.windows.1
37	-

Dfix-libpng-CVE-2026-25646.patch+0-36

	@@ -1,36 +0,0 @@
1	-From e3443f1b3e3666febf081447843945caf80bb3dd Mon Sep 17 00:00:00 2001
2	-From: Henry Yang <yangyudong3@huawei.com>
3	-Date: Thu, 12 Feb 2026 16:00:07 +0800
4	-Subject: [PATCH 1/1] libpng: fix CVE-2026-25646
5	-
6	----
7	- .../share/native/libsplashscreen/libpng/pngrtran.c \| 6 +++---
8	- 1 file changed, 3 insertions(+), 3 deletions(-)
9	-
10	-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
11	-index f11fec553..33074aeb9 100644
12	---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
13	-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
14	-@@ -29,7 +29,7 @@
15	- * However, the following notice accompanied the original version of this
16	- * file and, per its terms, should not be removed:
17	- *
18	-- * Copyright (c) 2018-2025 Cosmin Truta
19	-+ * Copyright (c) 2018-2026 Cosmin Truta
20	- * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
21	- * Copyright (c) 1996-1997 Andreas Dilger
22	- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
23	-@@ -737,8 +737,8 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
24	- break;
25	-
26	- t->next = hash[d];
27	-- t->left = (png_byte)i;
28	-- t->right = (png_byte)j;
29	-+ t->left = png_ptr->palette_to_index[i];
30	-+ t->right = png_ptr->palette_to_index[j];
31	- hash[d] = t;
32	- }
33	- }
34	---
35	-2.43.0.windows.1
36	-

Rjdk-updates-jdk11u-jdk-11.0.30-ga.tar.xz→jdk-updates-jdk11u-jdk-11.0.31-ga.tar.xz+0-0

Binary files do not support preview

Mopenjdk-11.spec+62-17

	@@ -131,7 +131,7 @@
131		131
132	# New Version-String scheme-style defines	132	# New Version-String scheme-style defines
133	%global majorver 11	133	%global majorver 11
134	-%global securityver 30	134	+%global securityver 31
135	# buildjdkver is usually same as %%{majorver},	135	# buildjdkver is usually same as %%{majorver},
136	# but in time of bootstrap of next jdk, it is majorver-1,	136	# but in time of bootstrap of next jdk, it is majorver-1,
137	# and this it is better to change it here, on single place	137	# and this it is better to change it here, on single place
	@@ -152,12 +152,12 @@
152	%global origin_nice OpenJDK	152	%global origin_nice OpenJDK
153	%global top_level_dir_name %{origin}	153	%global top_level_dir_name %{origin}
154	%global minorver 0	154	%global minorver 0
155	-%global buildver 7	155	+%global buildver 11
156	%global patchver 0	156	%global patchver 0
157		157
158	%global project jdk-updates	158	%global project jdk-updates
159	%global repo jdk11u	159	%global repo jdk11u
160	-%global revision jdk-11.0.30-ga	160	+%global revision jdk-11.0.31-ga
161	%global full_revision %{project}-%{repo}-%{revision}	161	%global full_revision %{project}-%{repo}-%{revision}
162	# priority must be 7 digits in total	162	# priority must be 7 digits in total
163	# setting to 1, so debug ones can have 0	163	# setting to 1, so debug ones can have 0
	@@ -674,7 +674,7 @@ Requires: ca-certificates
674	# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros	674	# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
675	Requires: javapackages-filesystem	675	Requires: javapackages-filesystem
676	# Require zone-info data provided by tzdata-java sub-package	676	# Require zone-info data provided by tzdata-java sub-package
677	-Requires: tzdata-java >= 2019c	677	+# Requires: tzdata-java >= 2019c
678	# for support of kernel stream control	678	# for support of kernel stream control
679	# libsctp.so.1 is being `dlopen`ed on demand	679	# libsctp.so.1 is being `dlopen`ed on demand
680	Requires: lksctp-tools%{?_isa}	680	Requires: lksctp-tools%{?_isa}
	@@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
773		773
774	Name: java-%{javaver}-%{origin}	774	Name: java-%{javaver}-%{origin}
775	Version: %{newjavaver}.%{buildver}	775	Version: %{newjavaver}.%{buildver}
776	-Release: 4	776	+Release: 0
777	# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons	777	# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
778	# and this change was brought into RHEL-4. java-1.5.0-ibm packages	778	# and this change was brought into RHEL-4. java-1.5.0-ibm packages
779	# also included the epoch in their virtual provides. This created a	779	# also included the epoch in their virtual provides. This created a
	@@ -819,6 +819,10 @@ Source9: jconsole.desktop.in
819	# nss configuration file	819	# nss configuration file
820	Source11: nss.cfg.in	820	Source11: nss.cfg.in
821		821
		822	+# Boot JDK
		823	+Source12: OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.30_7.tar.xz
		824	+Source13: OpenJDK11U-jdk_x64_linux_hotspot_11.0.30_7.tar.xz
		825	+
822	############################################	826	############################################
823	#	827	#
824	# LoongArch64 specific patches	828	# LoongArch64 specific patches
	@@ -918,14 +922,13 @@ Patch100: huawei-remove-provides-in-kaeprovider-module-info.patch
918		922
919	# 11.0.29	923	# 11.0.29
920	Patch101: Enable-optimizations-upon-detecting-Phytium-CPU.patch	924	Patch101: Enable-optimizations-upon-detecting-Phytium-CPU.patch
921	-Patch102: fix-libpng-API-allow-reading-up-to-1012-bytes-beyond-the-png-sRGB-bbase-array-bug.patch
922		925
923	# 11.0.30	926	# 11.0.30
924	-patch103: fix-libpng-CVE-2026-22695.patch
925	-patch104: 8373476-tz-Update-Timezone-Data-to-2025c.patch
926	-patch105: fix-libpng-CVE-2026-25646.patch
927	patch106: fix-zlib-CVE-2026-27171.patch	927	patch106: fix-zlib-CVE-2026-27171.patch
928		928
		929	+# 11.0.31
		930	+patch107: Use-stlr-for-putOrdered.patch
		931	+
929	############################################	932	############################################
930	#	933	#
931	# riscv64 specific patches	934	# riscv64 specific patches
	@@ -974,7 +977,7 @@ BuildRequires: zip
974	BuildRequires: unzip	977	BuildRequires: unzip
975	BuildRequires: javapackages-filesystem	978	BuildRequires: javapackages-filesystem
976	BuildRequires: java-%{buildjdkver}-openjdk-devel	979	BuildRequires: java-%{buildjdkver}-openjdk-devel
977	-BuildRequires: tzdata-java >= 2020a	980	+# BuildRequires: tzdata-java >= 2020a
978	# Earlier versions have a bug in tree vectorization on PPC	981	# Earlier versions have a bug in tree vectorization on PPC
979	BuildRequires: gcc >= 4.8.3-8	982	BuildRequires: gcc >= 4.8.3-8
980	# Build requirements for SunEC system NSS support	983	# Build requirements for SunEC system NSS support
	@@ -1231,11 +1234,8 @@ pushd %{top_level_dir_name}
1231	%patch99 -p1	1234	%patch99 -p1
1232	%patch100 -p1	1235	%patch100 -p1
1233	%patch101 -p1	1236	%patch101 -p1
1234	-%patch102 -p1
1235	-%patch103 -p1
1236	-%patch104 -p1
1237	-%patch105 -p1
1238	%patch106 -p1	1237	%patch106 -p1
		1238	+%patch107 -p1
1239	%endif	1239	%endif
1240	%endif	1240	%endif
1241	%ifarch loongarch64	1241	%ifarch loongarch64
	@@ -1325,6 +1325,29 @@ fi
1325	# Variable used in hs_err hook on build failures	1325	# Variable used in hs_err hook on build failures
1326	top_dir_abs_path=$(pwd)/%{top_level_dir_name}	1326	top_dir_abs_path=$(pwd)/%{top_level_dir_name}
1327		1327
		1328	+ARCH=$(uname -m)
		1329	+BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
		1330	+# In time of bootstrap of next jdk, we may use
		1331	+# majorver-1 as bootjdkver.
		1332	+if [ "$ARCH" = "x86_64" ]; then
		1333	+ tar -xf %{SOURCE13} -C $RPM_BUILD_DIR
		1334	+ BOOTJDKPATH=$RPM_BUILD_DIR/jdk-11.0.30+7
		1335	+elif [ "$ARCH" = "aarch64" ]; then
		1336	+ tar -xf %{SOURCE12} -C $RPM_BUILD_DIR
		1337	+ BOOTJDKPATH=$RPM_BUILD_DIR/jdk-11.0.30+7
		1338	+elif [ "$ARCH" = "riscv64" ]; then
		1339	+ :
		1340	+elif [ "$ARCH" = "loongarch64" ]; then
		1341	+ :
		1342	+elif [ "$ARCH" = "ppc64le" ]; then
		1343	+ :
		1344	+else
		1345	+ echo " Failed to set BOOTJDKPATH "
		1346	+ exit 18
		1347	+fi
		1348	+
		1349	+echo $BOOTJDKPATH
		1350	+
1328	mkdir -p %{buildoutputdir -- $suffix}	1351	mkdir -p %{buildoutputdir -- $suffix}
1329	pushd %{buildoutputdir -- $suffix}	1352	pushd %{buildoutputdir -- $suffix}
1330		1353
	@@ -1344,7 +1367,7 @@ bash ../configure \
1344	--with-vendor-url="https://openeuler.org/" \	1367	--with-vendor-url="https://openeuler.org/" \
1345	--with-vendor-bug-url="https://gitcode.com/src-openeuler/openjdk-11/issues/" \	1368	--with-vendor-bug-url="https://gitcode.com/src-openeuler/openjdk-11/issues/" \
1346	--with-vendor-vm-bug-url="https://gitcode.com/src-openeuler/openjdk-11/issues/" \	1369	--with-vendor-vm-bug-url="https://gitcode.com/src-openeuler/openjdk-11/issues/" \
1347	- --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \	1370	+ --with-boot-jdk=$BOOTJDKPATH \
1348	--with-debug-level=$debugbuild \	1371	--with-debug-level=$debugbuild \
1349	--with-native-debug-symbols=internal \	1372	--with-native-debug-symbols=internal \
1350	%ifarch sw_64	1373	%ifarch sw_64
	@@ -1405,8 +1428,8 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
1405	install -m 644 nss.cfg $JAVA_HOME/conf/security/	1428	install -m 644 nss.cfg $JAVA_HOME/conf/security/
1406		1429
1407	# Use system-wide tzdata	1430	# Use system-wide tzdata
1408	-rm $JAVA_HOME/lib/tzdb.dat	1431	+# rm $JAVA_HOME/lib/tzdb.dat
1409	-ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/lib/tzdb.dat	1432	+# ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/lib/tzdb.dat
1410		1433
1411	# build cycles	1434	# build cycles
1412	done	1435	done
	@@ -1773,6 +1796,28 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
1773		1796
1774		1797
1775	%changelog	1798	%changelog
		1799	+* Sat Apr 18 2026 yangyingqing <yangyingqing@h-partners.com> -1:11.0.31.11-0
		1800	+- update to 11.0.31+11(GA)
		1801	+- modify G1-interate-region-by-bitmap-rather-than-obj-size-in.patch
		1802	+- delete fix-libpng-API-allow-reading-up-to-1012-bytes-beyond-the-png-sRGB-bbase-array-bug.patch
		1803	+- delete fix-libpng-CVE-2026-22695.patch
		1804	+- delete 8373476-tz-Update-Timezone-Data-to-2025c.patch
		1805	+- delete fix-libpng-CVE-2026-25646.patch
		1806	+- add Use-stlr-for-putOrdered.patch
		1807	+
		1808	+* Tue Apr 14 2026 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.30.7-8
		1809	+- Fix build error on riscv64 due to JDK-8354941
		1810	+- Remove useless source file
		1811	+
		1812	+* Wed Apr 8 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-7
		1813	+- remove tzdata-java dependencies
		1814	+
		1815	+* Thu Apr 2 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-6
		1816	+- change boot-jdk to avoid tzdata-java limit
		1817	+
		1818	+* Thu Mar 26 2026 lc-compiler <lc@wxiat.com> -1:11.0.30.7-5
		1819	+- swjdk-11.0.30-ga update
		1820	+
1776	* Tue Feb 24 2026 yangyudong <yangyudong3@huawei.com> -1:11.0.30.7-4	1821	* Tue Feb 24 2026 yangyudong <yangyudong3@huawei.com> -1:11.0.30.7-4
1777	- add fix-zlib-CVE-2026-27171.patch	1822	- add fix-zlib-CVE-2026-27171.patch
1778		1823