changeset 2152:7cd263acb48d

8160571: Bootcycle builds still broken with server jvm on Windows 32bit Reviewed-by: tbell
author erikj
date Wed, 29 Jun 2016 20:00:55 +0200
parents 20f1ee2fe834
children b1b6e7556b30
files common/autoconf/boot-jdk.m4 common/autoconf/bootcycle-spec.gmk.in common/autoconf/generated-configure.sh
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/boot-jdk.m4	Tue Jun 28 16:04:03 2016 +0200
+++ b/common/autoconf/boot-jdk.m4	Wed Jun 29 20:00:55 2016 +0200
@@ -362,7 +362,7 @@
   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
 
   # Maximum amount of heap memory and stack size.
-  JVM_HEAP_LIMIT_32="1100"
+  JVM_HEAP_LIMIT_32="1024"
   # Running a 64 bit JVM allows for and requires a bigger heap
   JVM_HEAP_LIMIT_64="1600"
   STACK_SIZE_32=768
--- a/common/autoconf/bootcycle-spec.gmk.in	Tue Jun 28 16:04:03 2016 +0200
+++ b/common/autoconf/bootcycle-spec.gmk.in	Wed Jun 29 20:00:55 2016 +0200
@@ -64,7 +64,7 @@
 # When building a 32bit target, make sure the sjavac server flags are compatible
 # with a 32bit JVM.
 ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-  SJAVAC_SERVER_JAVA_FLAGS:= -Xms256M -Xmx1500M
+  SJAVAC_SERVER_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
 endif
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
--- a/common/autoconf/generated-configure.sh	Tue Jun 28 16:04:03 2016 +0200
+++ b/common/autoconf/generated-configure.sh	Wed Jun 29 20:00:55 2016 +0200
@@ -5095,7 +5095,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1467116399
+DATE_WHEN_GENERATED=1467223237
 
 ###############################################################################
 #
@@ -65122,7 +65122,7 @@
   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
 
   # Maximum amount of heap memory and stack size.
-  JVM_HEAP_LIMIT_32="1100"
+  JVM_HEAP_LIMIT_32="1024"
   # Running a 64 bit JVM allows for and requires a bigger heap
   JVM_HEAP_LIMIT_64="1600"
   STACK_SIZE_32=768