stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8139813: Base heap size on type of boot jdk, not architecture of build machine

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2015-10-20 17:29:53 +02:00
parent 9430e43da3
commit 1cc8d80a4c
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/autoconf/boot-jdk.m4
View File

@ -305,6 +305,16 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
BOOT_JDK_SOURCETARGET="-source 8 -target 8" BOOT_JDK_SOURCETARGET="-source 8 -target 8"
AC_SUBST(BOOT_JDK_SOURCETARGET) AC_SUBST(BOOT_JDK_SOURCETARGET)
AC_SUBST(JAVAC_FLAGS) AC_SUBST(JAVAC_FLAGS)
# Check if the boot jdk is 32 or 64 bit
if "$JAVA" -d64 -version > /dev/null 2>&1; then
BOOT_JDK_BITS="64"
else
BOOT_JDK_BITS="32"
fi
AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
AC_MSG_RESULT([$BOOT_JDK_BITS])
AC_SUBST(BOOT_JDK_BITS)
]) ])
AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
@ -341,7 +351,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
# Maximum amount of heap memory. # Maximum amount of heap memory.
# Maximum stack size. # Maximum stack size.
JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2` JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2`
if test "x$BUILD_NUM_BITS" = x32; then if test "x$BOOT_JDK_BITS" = "x32"; then
if test "$JVM_MAX_HEAP" -gt "1100"; then if test "$JVM_MAX_HEAP" -gt "1100"; then
JVM_MAX_HEAP=1100 JVM_MAX_HEAP=1100
elif test "$JVM_MAX_HEAP" -lt "512"; then elif test "$JVM_MAX_HEAP" -lt "512"; then
@ -349,10 +359,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
fi fi
STACK_SIZE=768 STACK_SIZE=768
else else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit # Running a 64 bit JVM allows for and requires a bigger heap
# pointers are used. Apparently, we need to increase the heap and stack
# space for the jvm. More specifically, when running javac to build huge
# jdk batch
if test "$JVM_MAX_HEAP" -gt "1600"; then if test "$JVM_MAX_HEAP" -gt "1600"; then
JVM_MAX_HEAP=1600 JVM_MAX_HEAP=1600
elif test "$JVM_MAX_HEAP" -lt "512"; then elif test "$JVM_MAX_HEAP" -lt "512"; then

22
common/autoconf/generated-configure.sh
View File

@ -815,6 +815,7 @@ JAXWS_TOPDIR
JAXP_TOPDIR JAXP_TOPDIR
CORBA_TOPDIR CORBA_TOPDIR
LANGTOOLS_TOPDIR LANGTOOLS_TOPDIR
BOOT_JDK_BITS
JAVAC_FLAGS JAVAC_FLAGS
BOOT_JDK_SOURCETARGET BOOT_JDK_SOURCETARGET
JARSIGNER JARSIGNER
@ -4587,7 +4588,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1444643341 DATE_WHEN_GENERATED=1445354942
############################################################################### ###############################################################################
# #
@ -26920,6 +26921,18 @@ $as_echo "$tool_specified" >&6; }
# Check if the boot jdk is 32 or 64 bit
if "$JAVA" -d64 -version > /dev/null 2>&1; then
BOOT_JDK_BITS="64"
else
BOOT_JDK_BITS="32"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
$as_echo "$BOOT_JDK_BITS" >&6; }
############################################################################### ###############################################################################
# #
@ -53099,7 +53112,7 @@ $as_echo_n "checking flags for boot jdk java command for big workloads... " >&6;
# Maximum amount of heap memory. # Maximum amount of heap memory.
# Maximum stack size. # Maximum stack size.
JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2` JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2`
if test "x$BUILD_NUM_BITS" = x32; then if test "x$BOOT_JDK_BITS" = "x32"; then
if test "$JVM_MAX_HEAP" -gt "1100"; then if test "$JVM_MAX_HEAP" -gt "1100"; then
JVM_MAX_HEAP=1100 JVM_MAX_HEAP=1100
elif test "$JVM_MAX_HEAP" -lt "512"; then elif test "$JVM_MAX_HEAP" -lt "512"; then
@ -53107,10 +53120,7 @@ $as_echo_n "checking flags for boot jdk java command for big workloads... " >&6;
fi fi
STACK_SIZE=768 STACK_SIZE=768
else else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit # Running a 64 bit JVM allows for and requires a bigger heap
# pointers are used. Apparently, we need to increase the heap and stack
# space for the jvm. More specifically, when running javac to build huge
# jdk batch
if test "$JVM_MAX_HEAP" -gt "1600"; then if test "$JVM_MAX_HEAP" -gt "1600"; then
JVM_MAX_HEAP=1600 JVM_MAX_HEAP=1600
elif test "$JVM_MAX_HEAP" -lt "512"; then elif test "$JVM_MAX_HEAP" -lt "512"; then