Skip to content

Commit

Permalink
Merge branch 'openjdk:master' into backport-8164119
Browse files Browse the repository at this point in the history
  • Loading branch information
yaqsun authored Nov 14, 2024
2 parents 5096551 + ed3d731 commit 0e09efa
Show file tree
Hide file tree
Showing 209 changed files with 7,598 additions and 27,857 deletions.
250 changes: 131 additions & 119 deletions .github/workflows/submit.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .jcheck/conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[general]
project=jdk8u
jbs=JDK
version=openjdk8u432
version=openjdk8u442

[checks]
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace
Expand Down
3 changes: 3 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# JDK Vulnerabilities

Please follow the process outlined in the [OpenJDK Vulnerability Policy](https://openjdk.org/groups/vulnerability/report) to disclose vulnerabilities in the JDK.
2 changes: 1 addition & 1 deletion THIRD_PARTY_README
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,7 @@ THE SOFTWARE.

-------------------------------------------------------------------------------

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

--- begin of LICENSE ---
Expand Down
44 changes: 29 additions & 15 deletions common/autoconf/flags.m4
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
fi
# Propagate the sysroot args to hotspot
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
LEGACY_HOST_CFLAGS="$LEGACY_EXTRA_CFLAGS"
LEGACY_HOST_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS"
LEGACY_HOST_LDFLAGS="$LEGACY_EXTRA_LDFLAGS"
LEGACY_TARGET_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
LEGACY_TARGET_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
LEGACY_TARGET_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
fi
AC_SUBST(SYSROOT_CFLAGS)
AC_SUBST(SYSROOT_LDFLAGS)
Expand Down Expand Up @@ -431,11 +434,14 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
if test "x$OPENJDK_TARGET_OS" != xmacosx; then
LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
fi
$2CXXSTD_CXXFLAG="-std=gnu++98"
FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror],
Expand Down Expand Up @@ -479,15 +485,23 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
# Hotspot needs these set in their legacy form
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
AC_SUBST(LEGACY_EXTRA_CFLAGS)
AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
AC_SUBST(LEGACY_EXTRA_LDFLAGS)
AC_SUBST(LEGACY_EXTRA_ASFLAGS)
LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS $with_extra_cflags"
LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS $with_extra_cflags"
LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS $with_extra_cxxflags"
LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS $with_extra_cxxflags"
LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS $with_extra_ldflags"
LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS $with_extra_ldflags"
LEGACY_HOST_ASFLAGS="$with_extra_asflags"
LEGACY_TARGET_ASFLAGS="$with_extra_asflags"
AC_SUBST(LEGACY_HOST_CFLAGS)
AC_SUBST(LEGACY_HOST_CXXFLAGS)
AC_SUBST(LEGACY_HOST_LDFLAGS)
AC_SUBST(LEGACY_HOST_ASFLAGS)
AC_SUBST(LEGACY_TARGET_CFLAGS)
AC_SUBST(LEGACY_TARGET_CXXFLAGS)
AC_SUBST(LEGACY_TARGET_LDFLAGS)
AC_SUBST(LEGACY_TARGET_ASFLAGS)
###############################################################################
#
Expand Down
Loading

0 comments on commit 0e09efa

Please sign in to comment.