Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8160571: Bootcycle builds still broken with server jvm on Windows 32bit
authorerikj
Wed, 29 Jun 2016 20:00:55 +0200
changeset 39189 bae461399d89
parent 39188 cdb1013defd0
child 39201 031eb5753c98
8160571: Bootcycle builds still broken with server jvm on Windows 32bit Reviewed-by: tbell
common/autoconf/boot-jdk.m4 file | annotate | diff | comparison | revisions
common/autoconf/bootcycle-spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox