# HG changeset patch # User Andrew John Hughes # Date 1437003496 -3600 # Node ID 95e61307e07ca65eb3401e2b8eba3a3b2aa3d7dd # Parent 9e113aaecdb21de2b28c4229e3e1bc623e872aaa PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO 2015-07-13 Andrew John Hughes * AUTHORS: Add James. * NEWS: Updated. 2015-05-23 James Le Cuirot PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO * patches/boot/compile-for-7-cacao-mem.patch: Increase memory limits so a build with CACAO and doc generation succeeds. * patches/cacao/memory.patch: Likewise. diff -r 9e113aaecdb2 -r 95e61307e07c AUTHORS --- a/AUTHORS Tue Jul 14 16:46:57 2015 +0100 +++ b/AUTHORS Thu Jul 16 00:38:16 2015 +0100 @@ -9,6 +9,7 @@ Deepak Bhole Tom Callaway Pablo del Campo +James Le Cuirot Tiago Sturmer Daitx Thomas Fitzsimmons Matthew Flaschen diff -r 9e113aaecdb2 -r 95e61307e07c ChangeLog --- a/ChangeLog Tue Jul 14 16:46:57 2015 +0100 +++ b/ChangeLog Thu Jul 16 00:38:16 2015 +0100 @@ -1,3 +1,17 @@ +2015-07-13 Andrew John Hughes + + * AUTHORS: Add James. + * NEWS: Updated. + +2015-05-23 James Le Cuirot + + PR2380: Raise javadoc and JAVAC_FLAGS memory + limits for CACAO + * patches/boot/compile-for-7-cacao-mem.patch: + Increase memory limits so a build with CACAO + and doc generation succeeds. + * patches/cacao/memory.patch: Likewise. + 2015-07-13 Andrew John Hughes PR2367: 7 no longer builds with 6 - Util is diff -r 9e113aaecdb2 -r 95e61307e07c NEWS --- a/NEWS Tue Jul 14 16:46:57 2015 +0100 +++ b/NEWS Thu Jul 16 00:38:16 2015 +0100 @@ -30,6 +30,8 @@ - PR2341: Update README & INSTALL files - PR2367: 7 no longer builds with 6 - Util is not public in sun.management - PR2395: Path to jvm.cfg is wrong in add-systemtap-boot +* CACAO + - PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO * PPC & AIX port - S8069590: AIX port of "8050807: Better performing performance data handling" - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError diff -r 9e113aaecdb2 -r 95e61307e07c patches/boot/compile-for-7-cacao-mem.patch --- a/patches/boot/compile-for-7-cacao-mem.patch Tue Jul 14 16:46:57 2015 +0100 +++ b/patches/boot/compile-for-7-cacao-mem.patch Thu Jul 16 00:38:16 2015 +0100 @@ -9,7 +9,7 @@ -BOOT_TARGET_CLASS_VERSION = 6 +BOOT_SOURCE_LANGUAGE_VERSION = 7 +BOOT_TARGET_CLASS_VERSION = 7 - JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m + JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make @@ -23,7 +23,7 @@ -BOOT_TARGET_CLASS_VERSION = 6 +BOOT_SOURCE_LANGUAGE_VERSION = 7 +BOOT_TARGET_CLASS_VERSION = 7 - JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m + JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make @@ -37,6 +37,6 @@ -BOOT_TARGET_CLASS_VERSION=6 +BOOT_SOURCE_LANGUAGE_VERSION=7 +BOOT_TARGET_CLASS_VERSION=7 - JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m + JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) diff -r 9e113aaecdb2 -r 95e61307e07c patches/cacao/memory.patch --- a/patches/cacao/memory.patch Tue Jul 14 16:46:57 2015 +0100 +++ b/patches/cacao/memory.patch Thu Jul 16 00:38:16 2015 +0100 @@ -6,7 +6,7 @@ BOOT_SOURCE_LANGUAGE_VERSION = 6 BOOT_TARGET_CLASS_VERSION = 6 -JAVAC_FLAGS = -g -encoding ascii -+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) # With parallel makes, print a message at the end of compilation. @@ -18,7 +18,7 @@ BOOT_SOURCE_LANGUAGE_VERSION = 6 BOOT_TARGET_CLASS_VERSION = 6 -JAVAC_FLAGS = -g -encoding ascii -+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) # With parallel makes, print a message at the end of compilation. @@ -30,7 +30,7 @@ BOOT_SOURCE_LANGUAGE_VERSION=6 BOOT_TARGET_CLASS_VERSION=6 -JAVAC_FLAGS=-g -encoding ascii -+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m ++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) ProjectFile=jvm.vcproj @@ -42,14 +42,14 @@ echo "false"; \ fi) - MAX_VM_MEMORY := 512 -+ MAX_VM_MEMORY := 1536 ++ MAX_VM_MEMORY := 1792 MIN_VM_MEMORY := $(MAX_VM_MEMORY) else MB_OF_MEMORY := unknown diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile --- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100 +++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100 -@@ -69,9 +69,9 @@ +@@ -69,11 +69,11 @@ # NOTE: javadoc will not complete without these larger settings. # WARNING: This could cause thrashing on low memory machines. ifeq ($(ARCH_DATA_MODEL),64) @@ -59,8 +59,11 @@ - MAX_VM_MEMORY = 1536 + MAX_VM_MEMORY = 1792 else - MAX_VM_MEMORY = 768 +- MAX_VM_MEMORY = 768 ++ MAX_VM_MEMORY = 2048 endif + + # List of all possible directories for javadoc to look for sources diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml --- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100 +++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100 @@ -80,7 +83,7 @@ BOOT_SOURCE_LANGUAGE_VERSION = 6 BOOT_TARGET_CLASS_VERSION = 6 -JAVAC_FLAGS = -g -encoding ascii -+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) # With parallel makes, print a message at the end of compilation.