Skip to content

Commit 16aa7c2

Browse files
keithc-cakeithc-ca
authored
Merge pull request #738 from JasonFengJ9/mergestaging
Merge master jdk8u412-b05 into openj9-staging
2 parents 5160cba + 91b8d5b commit 16aa7c2

File tree

130 files changed

+4033
-4155
lines changed

Some content is hidden

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

130 files changed

+4033
-4155
lines changed

‎closed/openjdk-tag.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OPENJDK_TAG := jdk8u412-b04
1+
OPENJDK_TAG := jdk8u412-b05

‎common/autoconf/build-aux/config.guess‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,13 @@ if [ "x$OUT" = x ]; then
8686
fi
8787
fi
8888

89+
# Test and fix LoongArch64.
90+
if [ "x$OUT" = x ]; then
91+
if [ `uname -s` = Linux ]; then
92+
if [ `uname -m` = loongarch64 ]; then
93+
OUT=loongarch64-unknown-linux-gnu
94+
fi
95+
fi
96+
fi
97+
8998
echo $OUT

‎common/autoconf/generated-configure.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ infodir
10181018
docdir
10191019
oldincludedir
10201020
includedir
1021-
runstatedir
10221021
localstatedir
10231022
sharedstatedir
10241023
sysconfdir
@@ -1266,7 +1265,6 @@ datadir='${datarootdir}'
12661265
sysconfdir='${prefix}/etc'
12671266
sharedstatedir='${prefix}/com'
12681267
localstatedir='${prefix}/var'
1269-
runstatedir='${localstatedir}/run'
12701268
includedir='${prefix}/include'
12711269
oldincludedir='/usr/include'
12721270
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1519,15 +1517,6 @@ do
15191517
| -silent | --silent | --silen | --sile | --sil)
15201518
silent=yes ;;
15211519

1522-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1523-
| --runstate | --runstat | --runsta | --runst | --runs \
1524-
| --run | --ru | --r)
1525-
ac_prev=runstatedir ;;
1526-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1527-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1528-
| --run=* | --ru=* | --r=*)
1529-
runstatedir=$ac_optarg ;;
1530-
15311520
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
15321521
ac_prev=sbindir ;;
15331522
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1665,7 +1654,7 @@ fi
16651654
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
16661655
datadir sysconfdir sharedstatedir localstatedir includedir \
16671656
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1668-
libdir localedir mandir runstatedir
1657+
libdir localedir mandir
16691658
do
16701659
eval ac_val=\$$ac_var
16711660
# Remove trailing slashes.
@@ -1818,7 +1807,6 @@ Fine tuning of the installation directories:
18181807
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
18191808
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
18201809
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1821-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
18221810
--libdir=DIR object code libraries [EPREFIX/lib]
18231811
--includedir=DIR C header files [PREFIX/include]
18241812
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -4467,7 +4455,7 @@ VS_TOOLSET_SUPPORTED_2022=true
44674455
#CUSTOM_AUTOCONF_INCLUDE
44684456

44694457
# Do not change or remove the following line, it is needed for consistency checks:
4470-
DATE_WHEN_GENERATED=1700680489
4458+
DATE_WHEN_GENERATED=1709065899
44714459

44724460
###############################################################################
44734461
#
@@ -13957,6 +13945,12 @@ test -n "$target_alias" &&
1395713945
VAR_CPU_BITS=64
1395813946
VAR_CPU_ENDIAN=big
1395913947
;;
13948+
loongarch64)
13949+
VAR_CPU=loongarch64
13950+
VAR_CPU_ARCH=loongarch
13951+
VAR_CPU_BITS=64
13952+
VAR_CPU_ENDIAN=little
13953+
;;
1396013954
*)
1396113955
as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
1396213956
;;
@@ -14095,6 +14089,12 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
1409514089
VAR_CPU_BITS=64
1409614090
VAR_CPU_ENDIAN=big
1409714091
;;
14092+
loongarch64)
14093+
VAR_CPU=loongarch64
14094+
VAR_CPU_ARCH=loongarch
14095+
VAR_CPU_BITS=64
14096+
VAR_CPU_ENDIAN=little
14097+
;;
1409814098
*)
1409914099
as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
1410014100
;;

‎common/autoconf/platform.m4‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
9696
VAR_CPU_BITS=64
9797
VAR_CPU_ENDIAN=big
9898
;;
99+
loongarch64)
100+
VAR_CPU=loongarch64
101+
VAR_CPU_ARCH=loongarch
102+
VAR_CPU_BITS=64
103+
VAR_CPU_ENDIAN=little
104+
;;
99105
*)
100106
AC_MSG_ERROR([unsupported cpu $1])
101107
;;

‎jdk/THIRD_PARTY_README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3371,7 +3371,7 @@ claims in such list are, in fact, Essential Claims.]
33713371
-------------------------------------------------------------------------------
33723372

33733373
%% This notice is provided with respect to the FreeType 2 font engine,
3374-
version 2.13.0, which may be included with JRE 8, and JDK 8, and OpenJDK 8.
3374+
version 2.13.2, which may be included with JRE 8, and JDK 8, and OpenJDK 8.
33753375

33763376
--- begin of LICENSE ---
33773377

‎jdk/make/closed/autoconf/generated-configure.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,6 @@ infodir
10561056
docdir
10571057
oldincludedir
10581058
includedir
1059-
runstatedir
10601059
localstatedir
10611060
sharedstatedir
10621061
sysconfdir
@@ -1330,7 +1329,6 @@ datadir='${datarootdir}'
13301329
sysconfdir='${prefix}/etc'
13311330
sharedstatedir='${prefix}/com'
13321331
localstatedir='${prefix}/var'
1333-
runstatedir='${localstatedir}/run'
13341332
includedir='${prefix}/include'
13351333
oldincludedir='/usr/include'
13361334
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1583,15 +1581,6 @@ do
15831581
| -silent | --silent | --silen | --sile | --sil)
15841582
silent=yes ;;
15851583

1586-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1587-
| --runstate | --runstat | --runsta | --runst | --runs \
1588-
| --run | --ru | --r)
1589-
ac_prev=runstatedir ;;
1590-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1591-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1592-
| --run=* | --ru=* | --r=*)
1593-
runstatedir=$ac_optarg ;;
1594-
15951584
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
15961585
ac_prev=sbindir ;;
15971586
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1729,7 +1718,7 @@ fi
17291718
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
17301719
datadir sysconfdir sharedstatedir localstatedir includedir \
17311720
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1732-
libdir localedir mandir runstatedir
1721+
libdir localedir mandir
17331722
do
17341723
eval ac_val=\$$ac_var
17351724
# Remove trailing slashes.
@@ -1882,7 +1871,6 @@ Fine tuning of the installation directories:
18821871
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
18831872
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
18841873
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1885-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
18861874
--libdir=DIR object code libraries [EPREFIX/lib]
18871875
--includedir=DIR C header files [PREFIX/include]
18881876
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -4637,7 +4625,7 @@ VS_TOOLSET_SUPPORTED_2022=true
46374625

46384626

46394627
# Do not change or remove the following line, it is needed for consistency checks:
4640-
DATE_WHEN_GENERATED=1700680489
4628+
DATE_WHEN_GENERATED=1709065899
46414629

46424630
###############################################################################
46434631
#
@@ -14127,6 +14115,12 @@ test -n "$target_alias" &&
1412714115
VAR_CPU_BITS=64
1412814116
VAR_CPU_ENDIAN=big
1412914117
;;
14118+
loongarch64)
14119+
VAR_CPU=loongarch64
14120+
VAR_CPU_ARCH=loongarch
14121+
VAR_CPU_BITS=64
14122+
VAR_CPU_ENDIAN=little
14123+
;;
1413014124
*)
1413114125
as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
1413214126
;;
@@ -14265,6 +14259,12 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
1426514259
VAR_CPU_BITS=64
1426614260
VAR_CPU_ENDIAN=big
1426714261
;;
14262+
loongarch64)
14263+
VAR_CPU=loongarch64
14264+
VAR_CPU_ARCH=loongarch
14265+
VAR_CPU_BITS=64
14266+
VAR_CPU_ENDIAN=little
14267+
;;
1426814268
*)
1426914269
as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
1427014270
;;

‎jdk/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-
tzdata2023d
24+
tzdata2024a

‎jdk/make/data/tzdata/africa‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
5454
# https://www.jstor.org/stable/1774359
5555
#
56+
# For the 1911/1912 establishment of standard time in French possessions, see:
57+
# Société Française de Physique, Recueil de constantes physiques (1913),
58+
# page 752, 18b.
59+
#
5660
# European-style abbreviations are commonly used along the Mediterranean.
5761
# For sub-Saharan Africa abbreviations were less standardized.
5862
# Previous editions of this database used WAT, CAT, SAT, and EAT
@@ -136,7 +140,7 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
136140

137141
# Chad
138142
# Zone NAME STDOFF RULES FORMAT [UNTIL]
139-
Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
143+
Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # N'Djamena
140144
1:00 - WAT 1979 Oct 14
141145
1:00 1:00 WAST 1980 Mar 8
142146
1:00 - WAT
@@ -162,7 +166,7 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
162166
# Inaccessible, Nightingale: uninhabited
163167

164168
# Zone NAME STDOFF RULES FORMAT [UNTIL]
165-
Zone Africa/Abidjan -0:16:08 - LMT 1912
169+
Zone Africa/Abidjan -0:16:08 - LMT 1912 Jan 1
166170
0:00 - GMT
167171

168172
###############################################################################

0 commit comments

Comments
 (0)