Mercurial > hg > release > icedtea7-2.5

changeset 2680:d41c1fc06514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support building with the PPC port HotSpot instead of IcedTea's. 2014-01-17 Andrew John Hughes <gnu.andrew@member.fsf.org> * patches/boot/hotspot/default/jdk-dependency.patch: Moved to... * patches/boot/hotspot/zero/jdk-dependency.patch: Removed. * Makefile.am: (ICEDTEA_PATCHES): Add 8026703. Fix path to jdk-dependency patch. * hotspot.map: Add ppc. * patches/boot/hotspot-jdk-dependency.patch: ...here. * patches/ppc/8026703-xsl_include.patch: Needed for PPC HotSpot build to bootstrap.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sat, 18 Jan 2014 08:05:53 +0000
parents 1885a2b6d744
children fb4939d4c208
files ChangeLog Makefile.am hotspot.map patches/boot/hotspot-jdk-dependency.patch patches/boot/hotspot/default/jdk-dependency.patch patches/boot/hotspot/zero/jdk-dependency.patch patches/ppc/8026703-xsl_include.patch
diffstat 7 files changed, 93 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 12 01:25:32 2014 -0600
+++ b/ChangeLog	Sat Jan 18 08:05:53 2014 +0000
@@ -1,3 +1,18 @@
+2014-01-17  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* patches/boot/hotspot/default/jdk-dependency.patch:
+	Moved to...
+	* patches/boot/hotspot/zero/jdk-dependency.patch:
+	Removed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add 8026703.  Fix path to
+	jdk-dependency patch.
+	* hotspot.map: Add ppc.
+	* patches/boot/hotspot-jdk-dependency.patch:
+	...here.
+	* patches/ppc/8026703-xsl_include.patch:
+	Needed for PPC HotSpot build to bootstrap.
+
 2014-01-09  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* acinclude.m4:
--- a/Makefile.am	Sun Jan 12 01:25:32 2014 -0600
+++ b/Makefile.am	Sat Jan 18 08:05:53 2014 +0000
@@ -262,6 +262,11 @@
 
 # Conditional patches
 
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+	patches/ppc/8026703-xsl_include.patch
+endif
+
 if WITH_RHINO
 ICEDTEA_PATCHES += \
 	patches/rhino.patch
@@ -334,7 +339,7 @@
 	patches/boot/corba-dependencies.patch \
 	patches/boot/jaxws-langtools-dependency.patch \
 	patches/boot/jaxws-jdk-dependency.patch \
-	patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \
+	patches/boot/hotspot-jdk-dependency.patch \
 	patches/boot/ecj-multicatch.patch \
 	patches/boot/ecj-trywithresources.patch \
 	patches/boot/ecj-autoboxing.patch \
--- a/hotspot.map	Sun Jan 12 01:25:32 2014 -0600
+++ b/hotspot.map	Sat Jan 18 08:05:53 2014 +0000
@@ -1,2 +1,3 @@
 # version url changeset sha256sum
 default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 11e724b1a33d 68edff4b613f9013f6c4779e1712512d02fc24886a53a69f35fa7e9313fce58b
+ppc http://hg.openjdk.java.net/ppc-aix-port/jdk7u/hotspot 3cc52fb61873 ca8ddf13a1195688835cb4f6941aa9ac32070e05b5856a906a8fb2e3a5f81ac9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/hotspot-jdk-dependency.patch	Sat Jan 18 08:05:53 2014 +0000
@@ -0,0 +1,23 @@
+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make	2012-05-23 22:15:04.747642641 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2012-05-23 22:16:32.825095823 +0100
+@@ -91,7 +91,7 @@
+ # are in AGENT_FILES, so use the shell to expand them.
+ # Be extra carefull to not produce too long command lines in the shell!
+ 	$(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_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)
+ 	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
+diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
+--- openjdk-boot.orig/make/hotspot-rules.gmk	2012-05-23 20:37:39.000000000 +0100
++++ openjdk-boot/make/hotspot-rules.gmk	2012-05-23 22:16:52.425419199 +0100
+@@ -85,6 +85,7 @@
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
+ HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
++HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
+ 
+ # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
+ #   Or is there something wrong with hotspot/make/Makefile?
--- a/patches/boot/hotspot/default/jdk-dependency.patch	Sun Jan 12 01:25:32 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make	2012-05-23 22:15:04.747642641 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2012-05-23 22:16:32.825095823 +0100
-@@ -91,7 +91,7 @@
- # are in AGENT_FILES, so use the shell to expand them.
- # Be extra carefull to not produce too long command lines in the shell!
- 	$(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_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)
- 	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
-diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk	2012-05-23 20:37:39.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk	2012-05-23 22:16:52.425419199 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
- 
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- #   Or is there something wrong with hotspot/make/Makefile?
--- a/patches/boot/hotspot/zero/jdk-dependency.patch	Sun Jan 12 01:25:32 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make	2012-07-20 18:05:26.733484117 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2012-07-20 18:10:11.384736044 +0100
-@@ -97,8 +97,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) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -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 -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk	2012-06-29 15:19:51.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk	2012-07-20 18:10:28.277161702 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
- 
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- #   Or is there something wrong with hotspot/make/Makefile?
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppc/8026703-xsl_include.patch	Sat Jan 18 08:05:53 2014 +0000
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User simonis
+# Date 1381928799 -7200
+#      Wed Oct 16 15:06:39 2013 +0200
+# Node ID 042cf42c72bd7fb3e5b50dd88d908985926f5284
+# Parent  7fe6ef09d2424c8f92244fa61393fa64f555ebd7
+8026703: Wrongly placed <xsl:import> element in Event-Based JVM Tracing .xsl files
+Reviewed-by: sla, kamg
+
+diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceEventClasses.xsl
+--- openjdk/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Oct 16 09:20:23 2013 +0200
++++ openjdk/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Oct 16 15:06:39 2013 +0200
+@@ -23,8 +23,8 @@
+ -->
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+ 
+ <xsl:template match="/">
+   <xsl:call-template name="file-header"/>
+diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceEventIds.xsl
+--- openjdk/hotspot/src/share/vm/trace/traceEventIds.xsl	Wed Oct 16 09:20:23 2013 +0200
++++ openjdk/hotspot/src/share/vm/trace/traceEventIds.xsl	Wed Oct 16 15:06:39 2013 +0200
+@@ -23,8 +23,8 @@
+ -->
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+ 
+ <xsl:template match="/">
+   <xsl:call-template name="file-header"/>
+diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceTypes.xsl
+--- openjdk/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Oct 16 09:20:23 2013 +0200
++++ openjdk/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Oct 16 15:06:39 2013 +0200
+@@ -23,8 +23,8 @@
+ -->
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+ 
+ <xsl:template match="/">
+   <xsl:call-template name="file-header"/>