Skip to content

Commit b17cf67

Browse files
Merge pull request #631 from dragonwell-project/dragonwell_extended-8.19.20
Merge remote-tracking branch 'upstream/master' into dragonwell
2 parents e2d640a + 23504ff commit b17cf67

File tree

158 files changed

+4062
-10046
lines changed

Some content is hidden

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

158 files changed

+4062
-10046
lines changed

.jcheck/conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk8u
33
jbs=JDK
4-
version=openjdk8u402
4+
version=openjdk8u412
55

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

README

-10
This file was deleted.

common/autoconf/build-aux/config.guess

+9
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

+26-2
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ infodir
10171017
docdir
10181018
oldincludedir
10191019
includedir
1020+
runstatedir
10201021
localstatedir
10211022
sharedstatedir
10221023
sysconfdir
@@ -1262,6 +1263,7 @@ datadir='${datarootdir}'
12621263
sysconfdir='${prefix}/etc'
12631264
sharedstatedir='${prefix}/com'
12641265
localstatedir='${prefix}/var'
1266+
runstatedir='${localstatedir}/run'
12651267
includedir='${prefix}/include'
12661268
oldincludedir='/usr/include'
12671269
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1514,6 +1516,15 @@ do
15141516
| -silent | --silent | --silen | --sile | --sil)
15151517
silent=yes ;;
15161518

1519+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1520+
| --runstate | --runstat | --runsta | --runst | --runs \
1521+
| --run | --ru | --r)
1522+
ac_prev=runstatedir ;;
1523+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1524+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1525+
| --run=* | --ru=* | --r=*)
1526+
runstatedir=$ac_optarg ;;
1527+
15171528
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
15181529
ac_prev=sbindir ;;
15191530
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1651,7 +1662,7 @@ fi
16511662
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
16521663
datadir sysconfdir sharedstatedir localstatedir includedir \
16531664
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1654-
libdir localedir mandir
1665+
libdir localedir mandir runstatedir
16551666
do
16561667
eval ac_val=\$$ac_var
16571668
# Remove trailing slashes.
@@ -1804,6 +1815,7 @@ Fine tuning of the installation directories:
18041815
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
18051816
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
18061817
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1818+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
18071819
--libdir=DIR object code libraries [EPREFIX/lib]
18081820
--includedir=DIR C header files [PREFIX/include]
18091821
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -4428,7 +4440,7 @@ VS_TOOLSET_SUPPORTED_2022=true
44284440
#CUSTOM_AUTOCONF_INCLUDE
44294441

44304442
# Do not change or remove the following line, it is needed for consistency checks:
4431-
DATE_WHEN_GENERATED=1694011184
4443+
DATE_WHEN_GENERATED=1704508692
44324444

44334445
###############################################################################
44344446
#
@@ -13918,6 +13930,12 @@ test -n "$target_alias" &&
1391813930
VAR_CPU_BITS=64
1391913931
VAR_CPU_ENDIAN=big
1392013932
;;
13933+
loongarch64)
13934+
VAR_CPU=loongarch64
13935+
VAR_CPU_ARCH=loongarch
13936+
VAR_CPU_BITS=64
13937+
VAR_CPU_ENDIAN=little
13938+
;;
1392113939
*)
1392213940
as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
1392313941
;;
@@ -14056,6 +14074,12 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
1405614074
VAR_CPU_BITS=64
1405714075
VAR_CPU_ENDIAN=big
1405814076
;;
14077+
loongarch64)
14078+
VAR_CPU=loongarch64
14079+
VAR_CPU_ARCH=loongarch
14080+
VAR_CPU_BITS=64
14081+
VAR_CPU_ENDIAN=little
14082+
;;
1405914083
*)
1406014084
as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
1406114085
;;

common/autoconf/platform.m4

+6
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
;;

common/autoconf/version-numbers

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
JDK_MAJOR_VERSION=1
2727
JDK_MINOR_VERSION=8
2828
JDK_MICRO_VERSION=0
29-
JDK_UPDATE_VERSION=402
29+
JDK_UPDATE_VERSION=412
3030
LAUNCHER_NAME=openjdk
3131
PRODUCT_NAME=OpenJDK
3232
PRODUCT_SUFFIX="Runtime Environment"

0 commit comments

Comments
 (0)