Mercurial > hg > icedtea8-forest
changeset 2510:10c71c9fba23 jdk8u202-b06
Merge
| author | aefimov |
|---|---|
| date | Wed, 05 Dec 2018 11:26:37 +0000 |
| parents | ade79b29d360 (current diff) fb2d87afd9f8 (diff) |
| children | 715e81a4a7bc |
| files | THIRD_PARTY_README common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
| diffstat | 3 files changed, 39 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/THIRD_PARTY_README Fri Nov 30 12:04:19 2018 +0000 +++ b/THIRD_PARTY_README Wed Dec 05 11:26:37 2018 +0000 @@ -1668,13 +1668,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.7, which may be +%% This notice is provided with respect to Little CMS 2.9, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2015 Marti Maria Saguer +Copyright (c) 1998-2011 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
--- a/common/autoconf/flags.m4 Fri Nov 30 12:04:19 2018 +0000 +++ b/common/autoconf/flags.m4 Wed Dec 05 11:26:37 2018 +0000 @@ -388,6 +388,20 @@ 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 + case $OPENJDK_TARGET_CPU_ARCH in + x86 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + x86_64 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + esac + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi $2CXXSTD_CXXFLAG="-std=gnu++98" FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror], [], [$2CXXSTD_CXXFLAG=""]) @@ -450,6 +464,10 @@ ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; + x86 ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" + ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
--- a/common/autoconf/generated-configure.sh Fri Nov 30 12:04:19 2018 +0000 +++ b/common/autoconf/generated-configure.sh Wed Dec 05 11:26:37 2018 +0000 @@ -4342,7 +4342,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1540846365 +DATE_WHEN_GENERATED=1544009140 ############################################################################### # @@ -41333,6 +41333,20 @@ 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 + case $OPENJDK_TARGET_CPU_ARCH in + x86 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + x86_64 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + esac + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi CXXSTD_CXXFLAG="-std=gnu++98" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5 @@ -41447,6 +41461,10 @@ ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; + x86 ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" + ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"