[patch] fix hotspot build with small SC_ARG_MAX

Dr Andrew John Hughes ahughes at redhat.com
Tue Aug 24 06:13:46 PDT 2010 

On 09:06 Tue 24 Aug     , Matthias Klose wrote:
> On 24.08.2010 08:59, Matthias Klose wrote:
> > hotspot uses overlong command lines, and the build will fail when building on a
> > machine where SC_ARG_MAX is limited.
> >
> > This patch works around this limitation by using a file list for compiling the
> > agent classes, and generating the file list with Makefile features instead of
> > shell code.
> 
> here is the corresponding patch for icedtea, proposing for the 6-1.8 branch and 
> newer, and icedtea7.
> 
>    Matthias
> 

Approved for IcedTea6 1.7, 1.8, 1.9 and HEAD, but please drop the unneeded 'icedtea-' prefix on the patch name.

For IcedTea7, can you please apply too-many-args.patch to http://hg.openjdk.java.net/icedtea/jdk7/hotspot directly
rather than adding it to IcedTea.


> 	* patches/icedtea-too-many-args.diff: Fix build failure with
> 	small SC_ARG_MAX.
> 	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
> 	* patches/ecj/icedtea-hotspot.patch: Update.
> 
> diff -r 933fec08a004 Makefile.am
> --- a/Makefile.am	Mon Aug 23 17:49:28 2010 -0400
> +++ b/Makefile.am	Tue Aug 24 09:06:25 2010 +0200
> @@ -289,7 +289,8 @@
>  	patches/fonts-rhel.patch \
>  	patches/fonts-gentoo.patch \
>  	patches/ipv4-mapped-ipv6-addresses.patch \
> -	patches/openjdk/6795060-icu_crash.patch
> +	patches/openjdk/6795060-icu_crash.patch \
> +	patches/icedtea-too-many-args.diff
>  
>  if WITH_RHINO
>  ICEDTEA_PATCHES += \
> diff -r 933fec08a004 patches/ecj/icedtea-hotspot.patch
> --- a/patches/ecj/icedtea-hotspot.patch	Mon Aug 23 17:49:28 2010 -0400
> +++ b/patches/ecj/icedtea-hotspot.patch	Tue Aug 24 09:06:25 2010 +0200
> @@ -1,14 +1,14 @@
>  diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
>  --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make	2010-03-29 21:34:15.000000000 +0100
>  +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make	2010-03-29 21:41:28.000000000 +0100
> -@@ -74,8 +74,8 @@
> - 	  mkdir -p $(SA_CLASSDIR);        \
> - 	fi
> +@@ -80,8 +80,8 @@
> + 	$(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
> + 	$(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
>   
> --	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> --	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> -+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> -+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> +-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
> +-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
> ++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
> ++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
>   
>   	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
>   	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
> diff -r 933fec08a004 patches/icedtea-too-many-args.diff
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/icedtea-too-many-args.diff	Tue Aug 24 09:06:25 2010 +0200
> @@ -0,0 +1,46 @@
> +--- openjdk/hotspot/make/linux/makefiles/sa.make.orig	2010-06-21 23:12:13.000000000 +0200
> ++++ openjdk/hotspot/make/linux/makefiles/sa.make	2010-06-28 01:11:27.022322578 +0200
> +@@ -45,6 +45,9 @@
> + AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
> + AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
> + 
> ++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list
> ++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list
> ++
> + SA_CLASSDIR = $(GENERATED)/saclasses
> + 
> + SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
> +@@ -59,7 +62,7 @@
> + 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
> + 	fi
> + 
> +-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
> ++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
> + 	$(QUIETLY) echo "Making $@"
> + 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
> + 	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
> +@@ -74,8 +77,11 @@
> + 	  mkdir -p $(SA_CLASSDIR);        \
> + 	fi
> + 
> +-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> +-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> ++	$(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
> ++	$(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
> ++
> ++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
> ++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
> + 
> + 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
> + 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
> +@@ -92,6 +98,10 @@
> + 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
> + 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
> + 
> ++agent_files_preclean:
> ++	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
> ++
> + clean:
> + 	rm -rf $(SA_CLASSDIR)
> + 	rm -rf $(GENERATED)/sa-jdi.jar
> ++	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)

Thanks,
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

More information about the distro-pkg-dev mailing list