Clean up +UseSerialGC handling and ensure it is set for the entire build.

(has anyone analyzed the concurrent GC memory allocation problem?)
Bump PKGREVISION for this and previous changes.

12 files changed, 66 insertions, 35 deletions

diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am
index dbf9f00b99e..1b1051f416d 100644
--- a/lang/openjdk7/patches/patch-am
+++ b/lang/openjdk7/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-am,v 1.6 2015/02/09 00:42:17 tnn Exp $
 
 Set username to pkgsrc.
 
@@ -18,7 +18,7 @@ Set username to pkgsrc.
  
  ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp
 -ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' JAVA_HOME='$(BOOTDIR)'
-+ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -mx1024m JAVA_HOME='$(BOOTDIR)'
++ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -Xmx768M JAVA_HOME='$(BOOTDIR)'
  
  ifeq ($(ANT_HOME),)
    ANT = $(ANT_WORKAROUNDS) ant
diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
index 44a6ab091ce..2cc041238c6 100644
--- a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
+++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
@@ -1,4 +1,4 @@
-$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.3 2014/09/22 11:54:45 joerg Exp $
+$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.4 2015/02/09 00:42:17 tnn Exp $
 
 --- corba/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:11:01.000000000 +0000
 +++ corba/make/common/shared/Defs-java.gmk
@@ -7,7 +7,7 @@ $NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.3 2014/09/22 11:54:45
  #   and creating the hotspot.log file.
  JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
 -   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms512m -XX:+UseSerialGC
++   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput $(PKGSRC_BOOT_JDK_JVMARGS)
  
  # JVM options
  JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
@@ -17,8 +17,8 @@ $NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.3 2014/09/22 11:54:45
  BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
 -BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
 -BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-+BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m
-+BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner -J-XX:+UseSerialGC -J-mx1024m
++BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner $(PKGSRC_BOOT_JDK_TOOLARGS)
  
  # Various tools we need to run (FIXUP: Are these the right ones?)
  NATIVE2ASCII    = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
index f8c82e24ea0..3988190ef67 100644
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
@@ -1,4 +1,4 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.2 2015/01/29 21:29:32 joerg Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- hotspot/make/bsd/makefiles/buildtree.make.orig	2014-01-06 02:36:18.000000000 +0000
 +++ hotspot/make/bsd/makefiles/buildtree.make
@@ -7,7 +7,7 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.2 2015/01/29 21:29:
  
  # For now, until the compiler is less wobbly:
 -TESTFLAGS	= -Xbatch -showversion
-+TESTFLAGS	= -Xbatch -showversion -Xmx512m -XX:+UseSerialGC
++TESTFLAGS	= -Xbatch -showversion $(PKGSRC_BOOT_JDK_JVMARGS)
  
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
@@ -16,7 +16,7 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.2 2015/01/29 21:29:
  	echo ""; \
  	echo "rm -f Queens.class"; \
 -	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
-+	echo "\$${JAVA_HOME}/bin/javac -J-XX:+UseSerialGC -J-mx1024m -d . $(GAMMADIR)/make/test/Queens.java"; \
++	echo "\$${JAVA_HOME}/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS) -d . $(GAMMADIR)/make/test/Queens.java"; \
  	echo ""; \
  	echo "# Set library path solely for gamma launcher test run"; \
  	echo ""; \
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
index 5ad1f5ca818..64dfd000789 100644
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
@@ -1,8 +1,8 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.2 2015/01/27 12:31:06 ryoon Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- hotspot/make/bsd/makefiles/rules.make.orig	2015-01-26 15:21:52.000000000 +0000
 +++ hotspot/make/bsd/makefiles/rules.make
-@@ -68,12 +68,12 @@ REMOVE_TARGET   = rm -f $@
+@@ -68,24 +68,24 @@ REMOVE_TARGET   = rm -f $@
  
  ifdef ALT_BOOTDIR
  
@@ -12,12 +12,30 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.2 2015/01/27 12:31:06 r
 -RUN.JAR   = $(ALT_BOOTDIR)/bin/jar
 -COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
 -COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
-+RUN.JAVA  = $(ALT_BOOTDIR)/bin/java -XX:+UseSerialGC -mx1024m
-+RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap -J-XX:+UseSerialGC -J-mx1024m
-+RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah -J-XX:+UseSerialGC -J-mx1024m
-+RUN.JAR   = $(ALT_BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m
-+COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac -J-XX:+UseSerialGC -J-mx1024m
-+COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic -J-XX:+UseSerialGC -J-mx1024m
++RUN.JAVA  = $(ALT_BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
++RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAR   = $(ALT_BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
  BOOT_JAVA_HOME = $(ALT_BOOTDIR)
  
  else
+ 
+ ifdef BOOTDIR
+ 
+-RUN.JAVA  = $(BOOTDIR)/bin/java
+-RUN.JAVAP = $(BOOTDIR)/bin/javap
+-RUN.JAVAH = $(BOOTDIR)/bin/javah
+-RUN.JAR   = $(BOOTDIR)/bin/jar
+-COMPILE.JAVAC = $(BOOTDIR)/bin/javac
+-COMPILE.RMIC  = $(BOOTDIR)/bin/rmic
++RUN.JAVA  = $(BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
++RUN.JAVAP = $(BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAVAH = $(BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAR   = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.JAVAC = $(BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.RMIC  = $(BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
+ BOOT_JAVA_HOME = $(BOOTDIR)
+ 
+ else
diff --git a/lang/openjdk7/patches/patch-jaxp_build.xml b/lang/openjdk7/patches/patch-jaxp_build.xml
index 9e393d3f140..6a70e1d3d07 100644
--- a/lang/openjdk7/patches/patch-jaxp_build.xml
+++ b/lang/openjdk7/patches/patch-jaxp_build.xml
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxp_build.xml,v 1.1 2014/10/04 22:47:32 joerg Exp $
+$NetBSD: patch-jaxp_build.xml,v 1.2 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxp/build.xml.orig	2014-09-29 08:29:49.000000000 +0000
 +++ jaxp/build.xml
@@ -7,7 +7,7 @@ $NetBSD: patch-jaxp_build.xml,v 1.1 2014/10/04 22:47:32 joerg Exp $
               target="${javac.target}">
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
 +            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-mx1024m"/>
++            <compilerarg value="-J-Xmx768M"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
          </javac>
      </target>
diff --git a/lang/openjdk7/patches/patch-jaxp_make_Makefile b/lang/openjdk7/patches/patch-jaxp_make_Makefile
index d44d718e238..b3fc72fa42e 100644
--- a/lang/openjdk7/patches/patch-jaxp_make_Makefile
+++ b/lang/openjdk7/patches/patch-jaxp_make_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxp_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
+$NetBSD: patch-jaxp_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxp/make/Makefile.orig	2014-09-12 20:54:09.000000000 +0000
 +++ jaxp/make/Makefile
@@ -6,7 +6,7 @@ $NetBSD: patch-jaxp_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
  #
  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
  
-+ANT_OPTS += -XX:+UseSerialGC -mx1024m
++ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
 +export ANT_OPTS
  ifdef QUIET
    ANT_OPTIONS += -quiet
diff --git a/lang/openjdk7/patches/patch-jaxws_build.xml b/lang/openjdk7/patches/patch-jaxws_build.xml
new file mode 100644
index 00000000000..f1c99f00c08
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jaxws_build.xml
@@ -0,0 +1,13 @@
+$NetBSD: patch-jaxws_build.xml,v 1.1 2015/02/09 00:42:17 tnn Exp $
+
+--- jaxws/build.xml.orig	2015-01-26 15:22:17.000000000 +0000
++++ jaxws/build.xml
+@@ -145,6 +145,8 @@
+              source="${javac.source}"
+ 	     debug="${javac.debug}"
+              target="${javac.target}">
++            <compilerarg value="-J-XX:+UseSerialGC"/>
++            <compilerarg value="-J-Xmx768M"/>
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>
diff --git a/lang/openjdk7/patches/patch-jaxws_make_Makefile b/lang/openjdk7/patches/patch-jaxws_make_Makefile
index 6f912fadb24..22826f45b63 100644
--- a/lang/openjdk7/patches/patch-jaxws_make_Makefile
+++ b/lang/openjdk7/patches/patch-jaxws_make_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxws_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
+$NetBSD: patch-jaxws_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxws/make/Makefile.orig	2014-10-04 13:30:47.000000000 +0000
 +++ jaxws/make/Makefile
@@ -6,7 +6,7 @@ $NetBSD: patch-jaxws_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
  #
  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
  
-+ANT_OPTS += -XX:+UseSerialGC -mx1024m
++ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
 +export ANT_OPTS
  ifdef QUIET
    ANT_OPTIONS += -quiet
diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
index f648686aabc..41d4450aab4 100644
--- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
+++ b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
@@ -1,4 +1,4 @@
-$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 joerg Exp $
+$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.2 2015/02/09 00:42:17 tnn Exp $
 
 --- jdk/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:07:37.000000000 +0000
 +++ jdk/make/common/shared/Defs-java.gmk
@@ -7,7 +7,7 @@ $NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 jo
  #   and creating the hotspot.log file.
  JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
 -   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -XX:+UseSerialGC
++   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput $(PKGSRC_BOOT_JDK_JVMARGS)
  
  # JVM options
  # MMM: is headless option necessary?
diff --git a/lang/openjdk7/patches/patch-jdk_test_Makefile b/lang/openjdk7/patches/patch-jdk_test_Makefile
index b277e4e4264..4bb55294040 100644
--- a/lang/openjdk7/patches/patch-jdk_test_Makefile
+++ b/lang/openjdk7/patches/patch-jdk_test_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-jdk_test_Makefile,v 1.3 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-jdk_test_Makefile,v 1.4 2015/02/09 00:42:17 tnn Exp $
 
 Use tools from pkgsrc.
 
@@ -31,7 +31,7 @@ Use tools from pkgsrc.
  JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
  # Boost the max memory for jtreg to avoid gc thrashing
 -JTREG_MEMORY_OPTION = -J-Xmx512m
-+JTREG_MEMORY_OPTION = -J-Xmx512m -J-XX:+UseSerialGC
++JTREG_MEMORY_OPTION = $(PKGSRC_BOOT_JDK_TOOLARGS)
  JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
  
  # Make sure jtreg exists
@@ -40,7 +40,7 @@ Use tools from pkgsrc.
  # The jtjck.jar utility to use to run the tests
  JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar
 -JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m
-+JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx1024m -XX:+UseSerialGC
++JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m $(PKGSRC_BOOT_JDK_JVMARGS)
  JTJCK_OPTIONS = -headless -v
  
  # Default tests to run
diff --git a/lang/openjdk7/patches/patch-langtools_make_Makefile b/lang/openjdk7/patches/patch-langtools_make_Makefile
index cfc9ece6a9f..f14edfe4301 100644
--- a/lang/openjdk7/patches/patch-langtools_make_Makefile
+++ b/lang/openjdk7/patches/patch-langtools_make_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-langtools_make_Makefile,v 1.1 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-langtools_make_Makefile,v 1.2 2015/02/09 00:42:17 tnn Exp $
 
 --- langtools/make/Makefile.orig	2014-09-12 13:06:23.000000000 +0000
 +++ langtools/make/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-langtools_make_Makefile,v 1.1 2014/09/13 14:35:25 joerg Exp $
  
  ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
 -ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-+ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR) -XX:+UseSerialGC -mx1024m'
++ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR) $(PKGSRC_BOOT_JDK_JVMARGS)'
  
  ifdef FINDBUGS_HOME
    ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
diff --git a/lang/openjdk7/patches/patch-langtools_make_build.xml b/lang/openjdk7/patches/patch-langtools_make_build.xml
index 769faf3cde1..9cd083f5376 100644
--- a/lang/openjdk7/patches/patch-langtools_make_build.xml
+++ b/lang/openjdk7/patches/patch-langtools_make_build.xml
@@ -1,4 +1,4 @@
-$NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-langtools_make_build.xml,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 * Avoid *.orig files.
 
@@ -21,7 +21,7 @@ $NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $
 -            debuglevel="${javac.debuglevel}"/>
 +            debuglevel="${javac.debuglevel}">
 +           <compilerarg value="-J-XX:+UseSerialGC"/>
-+           <compilerarg value="-J-mx1024m"/>
++           <compilerarg value="-J-Xmx768M"/>
 +        </javac>
          <java fork="true"
              jvm="${target.java.home}/bin/java"
@@ -31,7 +31,7 @@ $NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $
                      <compilerarg value="-implicit:none"/>
                      <compilerarg value="-Xprefer:source"/>
 +                    <compilerarg value="-J-XX:+UseSerialGC"/>
-+                    <compilerarg value="-J-mx1024m"/>
++                    <compilerarg value="-J-Xmx768M"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg line="@{bootclasspath.opt}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>
@@ -50,7 +50,7 @@ $NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $
 -               includeantruntime="false"/>
 +               includeantruntime="false">
 +          <compilerarg value="-J-XX:+UseSerialGC"/>
-+          <compilerarg value="-J-mx1024m"/>
++          <compilerarg value="-J-Xmx768M"/>
 +        </javac>
          <taskdef name="pcompile"
                   classname="CompilePropertiesTask"
@@ -60,7 +60,7 @@ $NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $
                 includeantruntime="false">
              <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
 +            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-mx1024m"/>
++            <compilerarg value="-J-Xmx768M"/>
          </javac>
          <taskdef name="genstubs"
                   classname="GenStubs$$Ant"