Skip to content

Commit 6397e2e

Browse files
authored
Merge branch 'openjdk:master' into backport-mrserb-bc0379ea-master
2 parents d4fbf3a + 42c6c17 commit 6397e2e

File tree

184 files changed

+6447
-27837
lines changed

Some content is hidden

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

184 files changed

+6447
-27837
lines changed

.github/workflows/submit.yml

Lines changed: 116 additions & 119 deletions
Large diffs are not rendered by default.

.jcheck/conf

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

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

SECURITY.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# JDK Vulnerabilities
2+
3+
Please follow the process outlined in the [OpenJDK Vulnerability Policy](https://openjdk.org/groups/vulnerability/report) to disclose vulnerabilities in the JDK.

THIRD_PARTY_README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ THE SOFTWARE.
17251725

17261726
-------------------------------------------------------------------------------
17271727

1728-
%% This notice is provided with respect to Little CMS 2.11, which may be
1728+
%% This notice is provided with respect to Little CMS 2.12, which may be
17291729
included with JRE 8, JDK 8, and OpenJDK 8.
17301730

17311731
--- begin of LICENSE ---

common/autoconf/flags.m4

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
139139
SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
140140
fi
141141
# Propagate the sysroot args to hotspot
142-
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
143-
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
144-
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
142+
LEGACY_HOST_CFLAGS="$LEGACY_EXTRA_CFLAGS"
143+
LEGACY_HOST_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS"
144+
LEGACY_HOST_LDFLAGS="$LEGACY_EXTRA_LDFLAGS"
145+
LEGACY_TARGET_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
146+
LEGACY_TARGET_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
147+
LEGACY_TARGET_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
145148
fi
146149
AC_SUBST(SYSROOT_CFLAGS)
147150
AC_SUBST(SYSROOT_LDFLAGS)
@@ -431,11 +434,14 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
431434
CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
432435
CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
433436
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
434-
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
435-
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
437+
LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
438+
LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
439+
LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
440+
LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
436441
if test "x$OPENJDK_TARGET_OS" != xmacosx; then
437442
LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
438-
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
443+
LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
444+
LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
439445
fi
440446
$2CXXSTD_CXXFLAG="-std=gnu++98"
441447
FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror],
@@ -479,15 +485,23 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
479485
LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
480486
481487
# Hotspot needs these set in their legacy form
482-
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
483-
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
484-
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
485-
LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
486-
487-
AC_SUBST(LEGACY_EXTRA_CFLAGS)
488-
AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
489-
AC_SUBST(LEGACY_EXTRA_LDFLAGS)
490-
AC_SUBST(LEGACY_EXTRA_ASFLAGS)
488+
LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS $with_extra_cflags"
489+
LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS $with_extra_cflags"
490+
LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS $with_extra_cxxflags"
491+
LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS $with_extra_cxxflags"
492+
LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS $with_extra_ldflags"
493+
LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS $with_extra_ldflags"
494+
LEGACY_HOST_ASFLAGS="$with_extra_asflags"
495+
LEGACY_TARGET_ASFLAGS="$with_extra_asflags"
496+
497+
AC_SUBST(LEGACY_HOST_CFLAGS)
498+
AC_SUBST(LEGACY_HOST_CXXFLAGS)
499+
AC_SUBST(LEGACY_HOST_LDFLAGS)
500+
AC_SUBST(LEGACY_HOST_ASFLAGS)
501+
AC_SUBST(LEGACY_TARGET_CFLAGS)
502+
AC_SUBST(LEGACY_TARGET_CXXFLAGS)
503+
AC_SUBST(LEGACY_TARGET_LDFLAGS)
504+
AC_SUBST(LEGACY_TARGET_ASFLAGS)
491505
492506
###############################################################################
493507
#

0 commit comments

Comments
 (0)