Mercurial > hg > openjdk > jdk8u
changeset 2444:343c4ea489d5 jdk8u252-b09 jdk8u252-ga
8238960: linux-i586 builds are inconsistent as the newly build jdk is not able to reserve enough space for object heap
Reviewed-by: andrew
author | alvdavi |
---|---|
date | Thu, 20 Feb 2020 14:05:38 -0800 |
parents | f2715985987e |
children | acfa27ed408d |
files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Mon Apr 06 01:58:35 2020 +0100 +++ b/common/autoconf/flags.m4 Thu Feb 20 14:05:38 2020 -0800 @@ -747,7 +747,11 @@ LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined" fi if test "x$TOOLCHAIN_TYPE" = xgcc; then - LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + fi fi fi AC_SUBST(LDFLAGS_JDKLIB)
--- a/common/autoconf/generated-configure.sh Mon Apr 06 01:58:35 2020 +0100 +++ b/common/autoconf/generated-configure.sh Thu Feb 20 14:05:38 2020 -0800 @@ -4379,7 +4379,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1585090811 +DATE_WHEN_GENERATED=1585090987 ############################################################################### # @@ -42177,7 +42177,11 @@ LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined" fi if test "x$TOOLCHAIN_TYPE" = xgcc; then - LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + fi fi fi