--- openjdk/hotspot/build/linux/makefiles/sa.make.orig	2008-04-11 10:25:12.000000000 +0200
+++ openjdk/hotspot/build/linux/makefiles/sa.make	2008-05-08 06:31:40.000000000 +0200
@@ -42,7 +42,7 @@
 
 # gnumake 3.78.1 does not accept the *s that
 # are in AGENT_ALLFILES, so use the shell to expand them
-AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
+AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && > agentfiles && for i in $(AGENT_ALLFILES); do /bin/echo "$$i" >> agentfiles; done)
 
 SA_CLASSDIR = $(GENERATED)/saclasses
 
@@ -72,7 +72,8 @@
 	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
 	  mkdir -p $(SA_CLASSDIR);        \
 	fi
-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) @agentfiles
 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
 	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
--- patches/icedtea-ecj.patch.orig	2008-05-08 07:57:21.000000000 +0200
+++ patches/icedtea-ecj.patch	2008-05-08 08:00:28.000000000 +0200
@@ -924,12 +924,13 @@
  ifdef ALT_OUTPUTDIR
 --- openjdk6/hotspot/build/linux/makefiles/sa.make	2008-02-12 04:14:13.000000000 -0500
 +++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make	2008-02-15 09:23:58.000000000 -0500
-@@ -72,7 +72,7 @@
+@@ -72,8 +72,8 @@
  	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
  	  mkdir -p $(SA_CLASSDIR);        \
  	fi
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) @agentfiles
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) @agentfiles
  	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
  	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
  	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .