1
0
Fridrich Strba 2017-01-30 07:44:22 +00:00 committed by Git OBS Bridge
parent c4f8da9def
commit d3a93e755d

View File

@ -1,20 +1,45 @@
--- openjdk/common/autoconf/boot-jdk.m4 2017-01-25 05:18:48.000000000 +0100
+++ openjdk/common/autoconf/boot-jdk.m4 2017-01-30 08:38:38.677272517 +0100
@@ -351,7 +351,7 @@
--- openjdk/common/autoconf/boot-jdk.m4 2016-07-26 12:28:03.054552831 +0200
+++ openjdk/common/autoconf/boot-jdk.m4 2016-07-26 12:30:34.651143737 +0200
@@ -351,29 +351,29 @@
AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
# Starting amount of heap memory.
- if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+ if test "x$OPENJDK_BUILD_CPU" = "xs390"; then
+ # if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
else
ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
@@ -360,7 +360,7 @@
- else
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
- fi
+ # else
+ # ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
+ # fi
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BOOT_JDK_BITS" = x32; then
- if test "x$BOOT_JDK_BITS" = x32; then
- if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+ if test "x$OPENJDK_BUILD_CPU" = "xs390"; then
+ # if test "x$BOOT_JDK_BITS" = x32; then
+ # if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
JVM_MAX_HEAP=768M
else
JVM_MAX_HEAP=1100M
- else
- JVM_MAX_HEAP=1100M
- fi
+ # else
+ # JVM_MAX_HEAP=1100M
+ # fi
STACK_SIZE=768
- else
+ # else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
# 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
- JVM_MAX_HEAP=1600M
- STACK_SIZE=1536
- fi
+ # JVM_MAX_HEAP=1600M
+ # STACK_SIZE=1536
+ # fi
ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])