--- a/ChangeLog	Wed Oct 29 11:29:20 2008 -0400
+++ b/ChangeLog	Sat Nov 01 03:39:24 2008 +0000
@@ -1,3 +1,17 @@
+2008-10-30  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Add bootstrap-directory-symlink
+	target to icedtea-ecj so it works as the user-specified
+	make target.
+	
+2008-10-22  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Pass JAR_KNOWS_J_OPTIONS	to ecj make.
+	* acinclude.m4: Check whether or not jar supports -J
+	options at the end.
+	* patches/icedtea-ecj-jopt.patch: Only add -J options
+	to jar in JDK and CORBA when supported.
+
 2008-10-29  Gary Benson  <gbenson@redhat.com>
 
 	PR icedtea/238:

--- a/Makefile.am	Wed Oct 29 11:29:20 2008 -0400
+++ b/Makefile.am	Sat Nov 01 03:39:24 2008 +0000
@@ -247,6 +247,7 @@
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
 	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
@@ -766,7 +767,8 @@
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
-	patches/icedtea-ecj-spp.patch
+	patches/icedtea-ecj-spp.patch \
+	patches/icedtea-ecj-jopt.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	mkdir -p stamps; \
@@ -1113,7 +1115,8 @@
 	fi ; \
 	touch stamps/native-ecj.stamp
 
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \

--- a/acinclude.m4	Wed Oct 29 11:29:20 2008 -0400
+++ b/acinclude.m4	Sat Nov 01 03:39:24 2008 +0000
@@ -351,10 +351,20 @@
     JAR_ACCEPTS_STDIN_LIST=
     AC_MSG_RESULT(no)
   fi
-  rm -f _config.txt _config.list _config.jar
+  rm -f _config.list _config.jar
+  AC_MSG_CHECKING([whether jar supports -J options at the end])
+  if $JAR cf _config.jar _config.txt -J-Xmx896m 2>/dev/null; then
+    JAR_KNOWS_J_OPTIONS=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_KNOWS_J_OPTIONS=
+    AC_MSG_RESULT(no)
+  fi
+  rm -f _config.txt _config.jar
   AC_SUBST(JAR)
   AC_SUBST(JAR_KNOWS_ATFILE)
   AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
+  AC_SUBST(JAR_KNOWS_J_OPTIONS)
 ])
 
 AC_DEFUN([FIND_RMIC],

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-jopt.patch	Sat Nov 01 03:39:24 2008 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:45:43.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:49:29.000000000 +0100
+@@ -75,7 +75,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:15:00.000000000 +0100
+@@ -82,7 +82,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.