Mercurial > hg > release > icedtea7-2.3
view patches/boot/hotspot-jdk-dependency.patch @ 2668:4c7988ed06f8
Remove alternate HotSpot for Zero and update default to latest 2.3 HEAD.
2013-07-17 Andrew John Hughes <gnu.andrew@member.fsf.org>
* patches/boot/ecj-opts.patch,
* patches/boot/hotspot/zero/jdk-dependency.patch,
* patches/cacao/arm-arch-defines.patch,
* patches/hotspot/zero/6924259-string_offset.patch,
* patches/hotspot/zero/7089790-bsd_port.patch,
* patches/hotspot/zero/7098194-macosx_port.patch,
* patches/hotspot/zero/7116189-setnativethreadname.patch,
* patches/hotspot/zero/7175133-string_offset.patch,
* patches/hotspot/zero/revert-7017193.patch,
* patches/hotspot/zero/revert_arm_debug.patch:
Removed unused patches.
* patches/boot/hotspot-jdk-dependency.patch: Renamed from
patches/boot/hotspot/default/jdk-dependency.patch
* patches/revert-7017193.patch: Renamed from
patches/hotspot/default/revert-7017193.patch
* Makefile.am:
(CORBA_CHANGESET): Update to IcedTea 2.3 HEAD.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove Zero-specific patches
and use of $(HSBUILD).
* acinclude.m4:
(IT_WITH_HOTSPOT_BUILD): No longer default to "zero"
HotSpot if Zero is requested.
* hotspot.map: Update default to IcedTea 2.3 HotSpot
HEAD. Remove zero.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 17 Jul 2013 21:21:52 +0100 |
| parents | patches/boot/hotspot/default/jdk-dependency.patch@dc1eb9ec0fef |
| children |
line wrap: on
line source
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?