Mercurial > hg > icedtea7
changeset 2809:e3ceb97f3089
PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO
2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Add James.
* NEWS: Updated.
2015-05-23 James Le Cuirot <chewi@gentoo.org>
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.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Mon, 13 Jul 2015 11:27:42 +0100 |
parents | 139f2a8f085d |
children | a3dbf73342b5 |
files | AUTHORS ChangeLog NEWS patches/boot/compile-for-7-cacao-mem.patch patches/cacao/memory.patch |
diffstat | 5 files changed, 29 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Mon Jul 13 11:10:03 2015 +0100 +++ b/AUTHORS Mon Jul 13 11:27:42 2015 +0100 @@ -9,6 +9,7 @@ Deepak Bhole <dbhole@redhat.com> Tom Callaway <tcallawa@redhat.com> Pablo del Campo <pablogdc@gmail.com> +James Le Cuirot <chewi@gentoo.org> Tiago Sturmer Daitx <tdaitx@linux.vnet.ibm.com> Thomas Fitzsimmons <fitzsim@redhat.com> Matthew Flaschen <matthew.flaschen@gatech.edu>
--- a/ChangeLog Mon Jul 13 11:10:03 2015 +0100 +++ b/ChangeLog Mon Jul 13 11:27:42 2015 +0100 @@ -1,3 +1,17 @@ +2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * AUTHORS: Add James. + * NEWS: Updated. + +2015-05-23 James Le Cuirot <chewi@gentoo.org> + + 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 <gnu_andrew@member.fsf.org> PR2520: --enable-cacao builds broken, missing
--- a/NEWS Mon Jul 13 11:10:03 2015 +0100 +++ b/NEWS Mon Jul 13 11:27:42 2015 +0100 @@ -436,6 +436,7 @@ - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc. - PR2250: JSSE server is still limited to 768-bit DHE * CACAO + - PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO - PR2519: Update to latest CACAO - PR2520: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl. * ARM32 port
--- a/patches/boot/compile-for-7-cacao-mem.patch Mon Jul 13 11:10:03 2015 +0100 +++ b/patches/boot/compile-for-7-cacao-mem.patch Mon Jul 13 11:27:42 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)
--- a/patches/cacao/memory.patch Mon Jul 13 11:10:03 2015 +0100 +++ b/patches/cacao/memory.patch Mon Jul 13 11:27:42 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.