Mercurial > hg > release > icedtea7-2.2
changeset 2270:37170bd13e08
Double CACAO's heap (to 256MB) so that the langtools build doesn't run out of memory.
2010-06-21 Andrew John Hughes <ahughes@redhat.com>
* patches/cacao/memory.patch:
Increase the memory used in the langtools
build when using CACAO.
* Makefile.am: Apply above patch when
building with CACAO.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 22 Jun 2010 16:00:26 +0100 |
| parents | c829a9d16fa0 |
| children | 03c860266712 |
| files | ChangeLog Makefile.am patches/cacao/memory.patch |
| diffstat | 3 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 21 21:38:43 2010 +0100 +++ b/ChangeLog Tue Jun 22 16:00:26 2010 +0100 @@ -1,3 +1,11 @@ +2010-06-21 Andrew John Hughes <ahughes@redhat.com> + + * patches/cacao/memory.patch: + Increase the memory used in the langtools + build when using CACAO. + * Makefile.am: Apply above patch when + building with CACAO. + 2010-06-21 Andrew John Hughes <ahughes@redhat.com> * patches/cacao/native-resolve.patch,
--- a/Makefile.am Mon Jun 21 21:38:43 2010 +0100 +++ b/Makefile.am Tue Jun 22 16:00:26 2010 +0100 @@ -342,7 +342,8 @@ patches/cacao/version.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ - patches/cacao/6714758.patch + patches/cacao/6714758.patch \ + patches/cacao/memory.patch endif if WITH_CACAO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/memory.patch Tue Jun 22 16:00:26 2010 +0100 @@ -0,0 +1,10 @@ +--- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100 ++++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100 +@@ -554,6 +554,7 @@ + <compilerarg value="-implicit:none"/> + <compilerarg value="-Xprefer:source"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> ++ <compilerarg value="-J-Xmx256M"/> + <compilerarg line="@{bootclasspath.opt}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> + <compilerarg line="${javac.version.opt}"/>