From f159234fe554e0e6d8ca41b53d6dffddb9fafe50 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 28 Apr 2020 20:54:06 +0200 Subject: [PATCH] 8243991: Remove obsolete -XX:ThreadStackSize from java command line Reviewed-by: erikj --- make/RunTestsPrebuiltSpec.gmk | 2 +- make/autoconf/boot-jdk.m4 | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk index 94126548910..fab23fc9976 100644 --- a/make/RunTestsPrebuiltSpec.gmk +++ b/make/RunTestsPrebuiltSpec.gmk @@ -63,7 +63,7 @@ TEST_JOBS ?= 0 # Use hard-coded values for java flags (one size, fits all!) JAVA_FLAGS := -Duser.language=en -Duser.country=US -JAVA_FLAGS_BIG := -Xms64M -Xmx1600M -XX:ThreadStackSize=1536 +JAVA_FLAGS_BIG := -Xms64M -Xmx1600M JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1 BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1 BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG) diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4 index 3383097d8c0..0f40a77bdea 100644 --- a/make/autoconf/boot-jdk.m4 +++ b/make/autoconf/boot-jdk.m4 @@ -433,12 +433,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], UTIL_ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA]) BOOTCYCLE_JVM_ARGS_BIG=-Xms64M - # Maximum amount of heap memory and stack size. + # Maximum amount of heap memory. JVM_HEAP_LIMIT_32="768" # Running a 64 bit JVM allows for and requires a bigger heap JVM_HEAP_LIMIT_64="1600" - STACK_SIZE_32=768 - STACK_SIZE_64=1536 JVM_HEAP_LIMIT_GLOBAL=`expr $MEMORY_SIZE / 2` if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "$JVM_HEAP_LIMIT_32"; then JVM_HEAP_LIMIT_32=$JVM_HEAP_LIMIT_GLOBAL @@ -452,14 +450,11 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], fi if test "x$BOOT_JDK_BITS" = "x32"; then - STACK_SIZE=$STACK_SIZE_32 JVM_MAX_HEAP=$JVM_HEAP_LIMIT_32 else - STACK_SIZE=$STACK_SIZE_64 JVM_MAX_HEAP=$JVM_HEAP_LIMIT_64 fi UTIL_ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA]) - UTIL_ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA]) AC_MSG_RESULT([$boot_jdk_jvmargs_big]) @@ -468,13 +463,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_32 - BOOTCYCLE_STACK_SIZE=$STACK_SIZE_32 else BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_64 - BOOTCYCLE_STACK_SIZE=$STACK_SIZE_64 fi BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -Xmx${BOOTCYCLE_MAX_HEAP}M" - BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -XX:ThreadStackSize=$BOOTCYCLE_STACK_SIZE" AC_MSG_CHECKING([flags for bootcycle boot jdk java command for big workloads]) AC_MSG_RESULT([$BOOTCYCLE_JVM_ARGS_BIG]) AC_SUBST(BOOTCYCLE_JVM_ARGS_BIG)