From 8ff79a268afc739ff8cfa967c72055242b446b3c Mon Sep 17 00:00:00 2001
From: alvdavi <unknown>
Date: Thu, 20 Feb 2020 14:05:38 -0800
Subject: [PATCH] 8238960: linux-i586 builds are inconsistent as the newly
 build jdk is not able to reserve enough space for object heap Reviewed-by:
 andrew

---
 common/autoconf/flags.m4               | 6 +++++-
 common/autoconf/generated-configure.sh | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
index 1f3b255..077efa2 100644
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -747,7 +747,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
       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)
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index a743a5b..5e71c50 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4379,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #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 @@ $as_echo "$supports" >&6; }
       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
 
-- 
GitLab