Mercurial > hg > icedtea8-forest
changeset 2492:9edccdd36f81 icedtea-3.11.0 icedtea-3.12.0pre00
Merge jdk8u201-ga
author | andrew |
---|---|
date | Fri, 15 Feb 2019 06:44:16 +0000 |
parents | b594ac1daf67 (current diff) 9250f6917113 (diff) |
children | e69c739a85d1 |
files | .hgtags common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
diffstat | 4 files changed, 63 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 24 19:13:07 2019 +0000 +++ b/.hgtags Fri Feb 15 06:44:16 2019 +0000 @@ -929,6 +929,7 @@ 2e8a34249a2d897021c1020a2bf3c6e44985de68 icedtea-3.10.0pre01 ead7f893fb2c4a919820497f39a51fa640f4753e jdk8u181-b13 c87c3a9a789e8bad94fb39bc3c2c7c4a532f7330 jdk8u191-b01 +d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u201-b00 d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u191-b02 99395ddbb670d9621c9755afa330c579a57dfd9b jdk8u191-b03 25e7fdd40996864b76cce08ba688f6e8281097a6 jdk8u191-b04 @@ -943,6 +944,8 @@ 90de74e82bfbbd45ce8e195e18899c929126cdfb icedtea-3.10.0 90de74e82bfbbd45ce8e195e18899c929126cdfb icedtea-3.11.0pre00 5814556a874108d647f6ec9f9e5dd9e44cad7622 icedtea-3.11.0pre01 +6432b2dd408c2e31cbf02acd41e87e4c63f4c69a jdk8u191-b12 +3322b7fdc03fcbef2ee5328ef75f613a1f71e340 jdk8u191-b26 3b5b53db61f2aaa5a94fd9ca51162d83565faabe jdk8u182-b00 dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00 7abd14dd301d8a927450a7623c2e5913a5bfa891 jdk8u192-b01 @@ -962,3 +965,24 @@ 940952a0d50ffb71692f6a4bc03987296e89706e jdk8u192-b25 5d4431231254f3ee61ae17c22fcb2b6ca2a09aa3 jdk8u192-b11 c995f80cfe5b9b42376a435cc4e22fc898bcdd49 icedtea-3.11.0pre02 +4d3fefdd2f98b55eaad22525ccf10b9d437b6cdb jdk8u192-b12 +e131417abf593b920e685f83a744029b340a637e jdk8u192-b26 +fbe47c49e7ee48e42b3a08a877983dd4e1a7b672 jdk8u181-b31 +0296aef8d561d049ba4a18496e8f0d6c1da9b0bc jdk8u181-b32 +f15cbd32f132b25f16ecaf9c203612a1107a0042 jdk8u181-b33 +2d56732bb1b83e698fd082f09d091df0f29ddd38 jdk8u181-b34 +56562c6fe999746dc706e2e79f2315c88899ff4b jdk8u181-b35 +f5e8607118bad66d200f7d440e4c83fe6f7c0396 jdk8u181-b36 +6be7467c0f3b0921eb85eaf7384cc918215d694b jdk8u181-b37 +6b45574a5596e814463844e2175b7cb4730206ae jdk8u201-b01 +df6617cb20387a493cf8202ec3fdbee909bb36fa jdk8u201-b02 +09dcb0ab23d07492437faad66fcafd6b6cc91250 jdk8u201-b03 +0506fb60784e2ca0dc60561cd84f2a99a092a497 jdk8u201-b04 +93019419c535620bd8be589079bfa1bcb5b56ac0 jdk8u201-b74 +d5f2a8d71e5096ab2c1abe24712b31843d2cd8d7 jdk8u201-b05 +3ce64f831a362e1fd41513882d859fd826fd2065 jdk8u201-b75 +6815d9894b3070506afa32b86a9239975ccf8044 jdk8u201-b06 +065b4b9247bd820061f750e49ea4369418a94ea2 jdk8u201-b76 +fb2d87afd9f84753f1b4c052737823e1003a82bc jdk8u201-b07 +97ecc454983b0f4bcde98ade9b1b6c2afe4f1dd6 jdk8u201-b77 +4b734c44eee9ca06bf1b0078aab8e0d248b10ad4 jdk8u201-b08
--- a/THIRD_PARTY_README Thu Jan 24 19:13:07 2019 +0000 +++ b/THIRD_PARTY_README Fri Feb 15 06:44:16 2019 +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 Thu Jan 24 19:13:07 2019 +0000 +++ b/common/autoconf/flags.m4 Fri Feb 15 06:44:16 2019 +0000 @@ -381,6 +381,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=""]) @@ -461,6 +475,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 Thu Jan 24 19:13:07 2019 +0000 +++ b/common/autoconf/generated-configure.sh Fri Feb 15 06:44:16 2019 +0000 @@ -4418,7 +4418,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1548184176 +DATE_WHEN_GENERATED=1550035505 ############################################################################### # @@ -41488,6 +41488,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 @@ -41711,6 +41725,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"