Mercurial > hg > release > icedtea7-2.6

changeset 2025:d3256a5c9afe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b75 with upstream Zero and make Shark build. 2009-11-01 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-float-double-trailing-zeros.patch: Dropped, in b75. * Makefile.am: Bump to b75. * patches/boot/icedtea-hotspot-default.patch, * patches/boot/icedtea.patch: Regenerated. * patches/hotspot/default/icedtea-shark-build.patch: Use VARIANTARCH not BUILDARCH. Use platform_zero directly and pass VARIANTARCH through to subbuild. Add rule for SHARK_DIR. * patches/icedtea-shark-build.patch: Put ICEDTEA_SHARK_BUILD prior to ZERO_BUILD test. * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Rename encoding to constant_encoding inline with upstream. * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Use should_be_constant instead of has_encoding inline with upstream.
author Andrew John Hughes <ahughes@redhat.com>
date Sun, 01 Nov 2009 19:13:55 +0000
parents 7100c9f14ffa
children 864e5903d8e2
files ChangeLog Makefile.am patches/boot/icedtea-hotspot-default.patch patches/boot/icedtea.patch patches/hotspot/default/icedtea-shark-build.patch patches/icedtea-float-double-trailing-zeros.patch patches/icedtea-shark-build.patch ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp ports/hotspot/src/share/vm/shark/sharkConstant.cpp
diffstat 9 files changed, 237 insertions(+), 225 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 29 15:00:12 2009 +0000
+++ b/ChangeLog	Sun Nov 01 19:13:55 2009 +0000
@@ -1,3 +1,22 @@
+2009-11-01  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-float-double-trailing-zeros.patch:
+	Dropped, in b75.
+	* Makefile.am: Bump to b75.
+	* patches/boot/icedtea-hotspot-default.patch,
+	* patches/boot/icedtea.patch:
+	Regenerated.
+	* patches/hotspot/default/icedtea-shark-build.patch:
+	Use VARIANTARCH not BUILDARCH.  Use platform_zero
+	directly and pass VARIANTARCH through to subbuild.
+	Add rule for SHARK_DIR.
+	* patches/icedtea-shark-build.patch:
+	Put ICEDTEA_SHARK_BUILD prior to ZERO_BUILD test.
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp:
+	Rename encoding to constant_encoding inline with upstream.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp:
+	Use should_be_constant instead of has_encoding inline with upstream.
+
 2009-10-28  Andrew John Hughes  <ahughes@redhat.com>
 
 	Fix build failures with Shark.
--- a/Makefile.am	Thu Oct 29 15:00:12 2009 +0000
+++ b/Makefile.am	Sun Nov 01 19:13:55 2009 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
-OPENJDK_VERSION = b74
+OPENJDK_VERSION = b75
 
-CORBA_CHANGESET = ddc6504bb4f3
-HOTSPOT_CHANGESET = 4aad6284518e
-JAXP_CHANGESET  = 1da2b57e4825
-JAXWS_CHANGESET = b176d7a1d9e9
-JDK_CHANGESET = 6d6f38ba8a03
-LANGTOOLS_CHANGESET = 27f109855e7f
-OPENJDK_CHANGESET = f8e6c40ffac8
+CORBA_CHANGESET = d4f1f79e9231
+HOTSPOT_CHANGESET = 0c593310a62c
+JAXP_CHANGESET  = 1ff97e23727b
+JAXWS_CHANGESET = 7a525c434bc9
+JDK_CHANGESET = 70b5a4c7b35d
+LANGTOOLS_CHANGESET = 4b3ebc896806
+OPENJDK_CHANGESET = aeb73b347f3a
 
-CORBA_MD5SUM = 1e931327890c8951d98e27bdfb54021b
-HOTSPOT_MD5SUM = 99e631c28819d643cbf1dcca0d3f4a99
-JAXP_MD5SUM = f1bef1d655513d450e0a57db6bf2e87c
-JAXWS_MD5SUM = 4524646c2cb4e21f80bd17408485588e
-JDK_MD5SUM = 62599b14fbf2352c5cc1cb23ccbef683
-LANGTOOLS_MD5SUM = c04a42138a860df67a396de51fcf11b6
-OPENJDK_MD5SUM = bad6c4ca26dfc18aa719dc9636a5c353
+CORBA_MD5SUM = cbdf4c993b0617ccddcb01a649e2eb05
+HOTSPOT_MD5SUM = 4508ff8d599b5ae3b094eaa3f8dfd494
+JAXP_MD5SUM = 2055c0ab13fea8c2597d7f3367905faa
+JAXWS_MD5SUM = 50ba89fa406b179e2ac20dd11cf37c5d
+JDK_MD5SUM = e98d4f2f0a74cc96ff7fa7838166d2dd
+LANGTOOLS_MD5SUM = 672ed2024d4d8787eefbbdebd1266c07
+OPENJDK_MD5SUM = fd027dba070b73a164a32a30f8807470
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -268,7 +268,6 @@
 	patches/icedtea-gcc-suffix.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
-	patches/icedtea-float-double-trailing-zeros.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
--- a/patches/boot/icedtea-hotspot-default.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea-hotspot-default.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,7 +1,7 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
---- openjdk-boot.orig/hotspot/make/linux/Makefile	2009-09-28 13:20:29.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/Makefile	2009-09-28 16:06:27.000000000 +0100
-@@ -280,35 +280,30 @@
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
+@@ -287,35 +287,30 @@
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -32,14 +32,14 @@
  endif
  
  $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
- 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
  ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
  endif
-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	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-09-28 16:06:18.000000000 +0100
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-10-30 15:58:31.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-10-30 17:44:58.000000000 +0000
 @@ -38,7 +38,9 @@
  GENERATED = $(TOPDIR)/../generated
  
--- a/patches/boot/icedtea.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,6 +1,6 @@
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -42,7 +42,7 @@
  # the rmic iiop backend needs some classes that are part of the impl/util
  # package.  These classes use log wrappers, so they must be built after
@@ -10,9 +10,9 @@
  all build clean clobber::
  	$(SUBDIRS-loop)
  
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -52,9 +52,9 @@
 +# Include
 +#
 +include $(BUILDDIR)/common/Classes.gmk
-diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk	2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk	2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Defs.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -53,6 +53,13 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -87,9 +87,9 @@
  VPATH.java = $(VPATH0.java)
  vpath %.java $(VPATH.java)
  vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -276,7 +276,7 @@
  		    fi; \
  		  done)
@@ -99,9 +99,9 @@
  
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
-diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk	2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Rules.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk	2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Rules.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -187,7 +187,10 @@
  	@$(MKDIR) -p $(CLASSDESTDIR)
  	if [ -s $(JAVA_SOURCE_LIST) ] ; then \
@@ -114,9 +114,9 @@
  	fi
  	@$(java-vm-cleanup)
  
-diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk	2009-09-04 02:41:12.000000000 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-09-04 02:41:12.000000000 +0100
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -135,31 +135,14 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -155,9 +155,9 @@
  
  # Override of what javac to use (see deploy workspace)
  ifdef JAVAC
-diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
---- openjdk-boot.orig/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -93,8 +93,6 @@
  POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
  
@@ -234,9 +234,9 @@
  
  pi.compile: $(PIGENERATEDFILES)
  
-diff -Nru openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -172,7 +172,6 @@
  ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
  
@@ -253,9 +253,9 @@
  
  portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
  
-diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml	2009-10-03 00:22:23.000000000 +0100
-+++ openjdk-boot/jaxp/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/build.xml openjdk-boot/jaxp/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxp/build.xml	2009-10-03 00:22:23.000000000 +0100
++++ openjdk-boot/jaxp/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -112,7 +112,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -266,9 +266,9 @@
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
---- openjdk-boot.orig/jaxp/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxp/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxp/make/Makefile	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxp/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -110,6 +110,7 @@
  ifdef ALT_LANGTOOLS_DIST
    ifdef ALT_BOOTDIR
@@ -277,9 +277,9 @@
    endif
    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
  else
-diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2009-10-03 00:57:53.000000000 +0100
-+++ openjdk-boot/jaxws/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/build.xml openjdk-boot/jaxws/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxws/build.xml	2009-10-03 00:57:53.000000000 +0100
++++ openjdk-boot/jaxws/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -112,7 +112,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -290,9 +290,9 @@
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxws/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxws/make/Makefile	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxws/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -111,6 +111,7 @@
    ifdef ALT_BOOTDIR
      ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -301,9 +301,9 @@
    endif
    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
  else
-diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -43,7 +43,8 @@
  	@$(prep-target)
  	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -314,9 +314,9 @@
  	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
  	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
  	    $(BOOT_JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk	2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/common/Release.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -650,10 +650,21 @@
  RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
  $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
@@ -377,9 +377,9 @@
  ifneq ($(PLATFORM), windows)
  	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
  endif # !windows
-diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Rules.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/Rules.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -237,8 +237,9 @@
  	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
  	  $(CAT) $<.filtered; \
@@ -405,9 +405,9 @@
  	@$(java-vm-cleanup)
  	@$(TOUCH) $@
  
-diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -136,33 +136,22 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -442,10 +442,10 @@
 -  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
  endif
  
- #always use the bootstrap javah until bug-ID 6889255 is fixed.  These
-diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/java/nio/Makefile	2009-10-26 13:38:03.000000000 +0000
+ # Override of what javac to use (see deploy workspace)
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile	2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/java/nio/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -31,7 +31,7 @@
  PACKAGE = java.nio
  LIBRARY = nio
@@ -455,9 +455,9 @@
  include $(BUILDDIR)/common/Defs.gmk
  
  NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
---- openjdk-boot.orig/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/java/text/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/java/text/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -81,8 +81,8 @@
  		-sourcepath $(TEXT_SRCDIR) \
  		$(TEXT_SOURCES)
@@ -469,9 +469,9 @@
  		-o $(TEXT_CLASSDIR) \
  		-spec $(UNICODEDATA)/UnicodeData.txt
  	@$(java-vm-cleanup)
-diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -239,7 +239,7 @@
  
  all build:: sanity-all post-sanity-all
@@ -481,18 +481,18 @@
  all build::
  	$(SUBDIRS-loop)
  
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -189,3 +189,5 @@
  	java/awt/dnd/DnDConstants.java \
  	sun/awt/CausedFocusEvent.java
  
 +EXPORTED_inner = \
 +    sun.java2d.opengl.OGLContext$$OGLContextCaps
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
---- openjdk-boot.orig/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -401,10 +401,9 @@
  COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
  
@@ -507,9 +507,9 @@
  	@$(java-vm-cleanup)
  
  fontconfigs.clean :
-diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
---- openjdk-boot.orig/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -62,7 +62,8 @@
  $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
  	$(RM) -r $(@D)
@@ -520,9 +520,9 @@
  	@$(java-vm-cleanup)
  
  $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
---- openjdk-boot.orig/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/text/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/text/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -85,8 +85,9 @@
  	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
  		-sourcepath $(TEXT_SRCDIR) \
@@ -535,9 +535,9 @@
  		-o $(CLASSDESTDIR)/sun/text/resources \
  		-spec $(UNICODEDATA)/UnicodeData.txt \
  		-language th
-diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- openjdk-boot.orig/jdk/make/sun/xawt/Makefile	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-30 16:49:39.000000000 +0000
++++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -294,11 +294,7 @@
  
  TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -574,9 +574,9 @@
  	    $(ECHO) "}; }" >> $$classname;  \
  	done
  	$(TOUCH) $@
-diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-23 15:58:41.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+--- ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-30 16:49:08.000000000 +0000
++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-30 16:59:16.000000000 +0000
 @@ -647,9 +647,6 @@
              throws FileNotFoundException, IOException {
          BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -595,9 +595,9 @@
  
                  if (plane == 0 && bLatin1 == false) {
              genCaseMapTableDeclaration(result);
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java	2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-30 16:59:16.000000000 +0000
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffffffffffP+1023} and also equal to
       * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -625,9 +625,9 @@
  
      /**
       * Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java	2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-30 16:59:16.000000000 +0000
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffeP+127f} and also equal to
       * {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -655,9 +655,9 @@
  
      /**
       * Maximum exponent a finite {@code float} variable may have.  It
-diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-30 16:59:16.000000000 +0000
 @@ -27,6 +27,7 @@
  #define OGLContext_h_Included
  
@@ -722,9 +722,9 @@
  
  /**
   * Evaluates to true if the given capability bitmask is present for the
-diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml	2009-10-21 16:40:37.000000000 +0100
-+++ openjdk-boot/langtools/make/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
+--- ../openjdk.orig/openjdk-boot/langtools/make/build.xml	2009-10-21 16:40:37.000000000 +0100
++++ openjdk-boot/langtools/make/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -524,6 +524,7 @@
                         includeAntRuntime="no"
                         source="@{javac.source}"
@@ -741,9 +741,9 @@
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>
-diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
---- openjdk-boot.orig/langtools/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/langtools/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
+--- ../openjdk.orig/openjdk-boot/langtools/make/Makefile	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/langtools/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -130,7 +130,7 @@
  
  ifdef ALT_BOOTDIR
@@ -753,9 +753,9 @@
  endif
  
  ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-boot.orig/make/jdk-rules.gmk openjdk-boot/make/jdk-rules.gmk
---- openjdk-boot.orig/make/jdk-rules.gmk	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/make/jdk-rules.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/make/jdk-rules.gmk openjdk-boot/make/jdk-rules.gmk
+--- ../openjdk.orig/openjdk-boot/make/jdk-rules.gmk	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/make/jdk-rules.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -58,7 +58,7 @@
  endif
  
--- a/patches/hotspot/default/icedtea-shark-build.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/hotspot/default/icedtea-shark-build.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,7 +1,7 @@
 diff -Nru openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
---- openjdk.orig/hotspot/make/linux/Makefile	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk/hotspot/make/linux/Makefile	2009-09-23 12:13:50.000000000 +0100
-@@ -165,6 +165,13 @@
+--- openjdk.orig/hotspot/make/linux/Makefile	2009-10-30 16:00:45.000000000 +0000
++++ openjdk/hotspot/make/linux/Makefile	2009-10-31 00:13:31.000000000 +0000
+@@ -168,6 +168,13 @@
  #       profiledzero    zero            <os>_<arch>_zero/profiled
  #       productzero     zero            <os>_<arch>_zero/product
  #
@@ -15,11 +15,11 @@
  # What you get with each target:
  #
  # debug*     - "thin" libjvm_g - debug info linked into the gamma_g launcher
-@@ -184,12 +191,14 @@
+@@ -191,12 +198,14 @@
  SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
  SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
- SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(BUILDARCH)_zero/,$(TARGETS))
-+SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(BUILDARCH)_shark/,$(TARGETS))
+ SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
++SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
  
  TARGETS_C2        = $(TARGETS)
  TARGETS_C1        = $(addsuffix 1,$(TARGETS))
@@ -30,7 +30,7 @@
  
  BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
  BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-@@ -206,6 +215,7 @@
+@@ -213,6 +222,7 @@
  	@echo "  $(TARGETS_C1)"
  	@echo "  $(TARGETS_CORE)"
  	@echo "  $(TARGETS_ZERO)"
@@ -38,31 +38,31 @@
  
  checks: check_os_version check_j2se_version
  
-@@ -262,6 +272,10 @@
- $(OUTPUTDIR)/platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
+@@ -266,6 +276,10 @@
+ 	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ 	$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
+ 
++$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
++	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
++	$(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
++
+ platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
  	$(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
  
-+$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) $(PLATFORM_FILE)
-+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-+	$(BUILDTREE) VARIANT=shark
-+
- # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
- 
- $(TARGETS_C2):  $(SUBDIRS_C2)
-@@ -299,6 +313,12 @@
- 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+@@ -306,6 +320,12 @@
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
 +$(TARGETS_SHARK):  $(SUBDIRS_SHARK)
-+	cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
++	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
 +ifdef INSTALL
-+	cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
++	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
 +endif
 +
  # Just build the tree, and nothing else:
  tree:      $(SUBDIRS_C2)
  tree1:     $(SUBDIRS_C1)
-@@ -332,7 +352,7 @@
+@@ -339,7 +359,7 @@
  
  #-------------------------------------------------------------------------------
  
@@ -72,9 +72,9 @@
  .PHONY: all compiler1 compiler2 core zero
  .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
 diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make	2009-09-23 12:12:46.000000000 +0100
-@@ -219,8 +219,8 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make	2009-10-30 16:01:05.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/buildtree.make	2009-10-30 18:21:52.000000000 +0000
+@@ -225,8 +225,8 @@
  
  ../shared_dirs.lst:  $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
  	@echo Creating directory list $@
@@ -85,26 +85,10 @@
          \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@
  
  Makefile: $(BUILDTREE_MAKE)
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make	2009-09-23 12:14:21.000000000 +0100
-@@ -109,6 +109,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
- ifneq ($(ZERO_BUILD), true)
-+ifndef ICEDTEA_SHARK_BUILD
-   ifeq ($(ARCH_DATA_MODEL), 32)
-     EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -124,3 +125,4 @@
-     endif
-   endif
- endif
-+endif
 diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2009-09-23 12:06:41.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2009-09-23 12:12:46.000000000 +0100
-@@ -59,6 +59,9 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2009-09-22 20:05:24.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2009-10-30 18:21:52.000000000 +0000
+@@ -55,6 +55,9 @@
  ifeq ($(ZERO_BUILD), true)
  CFLAGS += $(LIBFFI_CFLAGS)
  endif
@@ -115,8 +99,8 @@
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
 diff -Nru openjdk.orig/hotspot/make/linux/makefiles/top.make openjdk/hotspot/make/linux/makefiles/top.make
---- openjdk.orig/hotspot/make/linux/makefiles/top.make	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/top.make	2009-09-23 12:15:48.000000000 +0100
+--- openjdk.orig/hotspot/make/linux/makefiles/top.make	2009-10-30 15:58:31.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/top.make	2009-10-30 18:21:52.000000000 +0000
 @@ -75,6 +75,7 @@
  Include_DBs/COMPILER2   = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
  Include_DBs/TIERED      = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
@@ -126,9 +110,9 @@
  
  Cached_plat = $(GENERATED)/platform.current
 diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2009-09-23 12:06:41.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make	2009-09-23 12:12:46.000000000 +0100
-@@ -132,10 +132,14 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2009-10-30 15:58:31.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/vm.make	2009-10-30 19:02:04.000000000 +0000
+@@ -128,10 +128,14 @@
  	rm -f $@
  	cat $^ > $@
  
@@ -145,7 +129,7 @@
  endif
  
  ifeq ($(LINK_INTO),AOUT)
-@@ -163,6 +167,10 @@
+@@ -159,6 +163,10 @@
  ifeq ($(ZERO_BUILD), true)
    LIBS_VM += $(LIBFFI_LIBS)
  endif
@@ -157,15 +141,26 @@
  LINK_VM = $(LINK_LIB.c)
  
 diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk/hotspot/make/Makefile	2009-09-23 12:18:46.000000000 +0100
-@@ -101,6 +101,15 @@
+--- openjdk.orig/hotspot/make/Makefile	2009-10-30 15:58:30.000000000 +0000
++++ openjdk/hotspot/make/Makefile	2009-10-31 00:18:39.000000000 +0000
+@@ -80,11 +80,12 @@
+   ALT_OUT=
+ endif
+ 
+-# Typical C1/C2 targets made available with this Makefile
++# Typical C1/C2 and Shark (C0) targets made available with this Makefile
+ C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
+ C2_VM_TARGETS=product  fastdebug  optimized  jvmg
+ KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
+ ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
++SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
+ 
+ # JDK directory list
+ JDK_DIRS=bin include jre lib demo
+@@ -101,6 +102,12 @@
  all_debugzero:     jvmgzero docs export_debug
  all_optimizedzero: optimizedzero docs export_optimized
  
-+# Shark (C0) targets made available with this Makefile
-+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-+
 +allshark:           all_productshark all_fastdebugshark
 +all_productshark:   productshark docs export_product
 +all_fastdebugshark: fastdebugshark docs export_fastdebug
@@ -175,7 +170,7 @@
  # Do everything
  world:         all create_jdk
  
-@@ -123,6 +132,10 @@
+@@ -123,6 +130,10 @@
  	$(CD) $(GAMMADIR)/make; \
  	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
  
@@ -186,7 +181,7 @@
  $(KERNEL_VM_TARGETS):
  	$(CD) $(GAMMADIR)/make; \
  	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -173,6 +186,12 @@
+@@ -173,6 +184,12 @@
  		      $(MAKE_ARGS) $(VM_TARGET)
  endif
  
@@ -199,7 +194,7 @@
  generic_buildkernel:
  	$(MKDIR) -p $(OUTPUTDIR)
  ifeq ($(OSNAME),windows)
-@@ -228,16 +247,22 @@
+@@ -228,12 +245,18 @@
  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
  KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
  ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
@@ -211,18 +206,14 @@
 +SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
  
  # Misc files and generated files need to come from C1 or C2 area
- ifeq ($(ZERO_BUILD), true)
-   MISC_DIR=$(ZERO_DIR)
-   GEN_DIR=$(ZERO_BASE_DIR)/generated
- else
 +ifdef ICEDTEA_SHARK_BUILD
 +  MISC_DIR=$(SHARK_DIR)
 +  GEN_DIR=$(SHARK_BASE_DIR)/generated
 +else
- ifeq ($(ARCH_DATA_MODEL), 32)
-   MISC_DIR=$(C1_DIR)
-   GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -246,6 +271,7 @@
+ ifeq ($(ZERO_BUILD), true)
+   MISC_DIR=$(ZERO_DIR)
+   GEN_DIR=$(ZERO_BASE_DIR)/generated
+@@ -246,6 +269,7 @@
    GEN_DIR=$(C2_BASE_DIR)/generated
  endif
  endif
@@ -230,3 +221,32 @@
  
  # Bin files (windows)
  ifeq ($(OSNAME),windows)
+@@ -289,12 +313,18 @@
+ 
+ # Shared Library
+ ifneq ($(OSNAME),windows)
+-  ifeq ($(ZERO_BUILD), true)
++  ifdef ICEDTEA_SHARK_BUILD
++$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
++	$(install-file)
++$(EXPORT_SERVER_DIR)/%.so:       $(SHARK_DIR)/%.so
++	$(install-file)
++  else
++    ifeq ($(ZERO_BUILD), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
+ 	$(install-file)
+ $(EXPORT_SERVER_DIR)/%.so:       $(ZERO_DIR)/%.so
+ 	$(install-file)
+-  else
++    else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ 	$(install-file)
+ $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
+@@ -305,6 +335,7 @@
+ 	$(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
+ 	$(install-file)
++    endif
+   endif
+ endif
+ 
--- a/patches/icedtea-float-double-trailing-zeros.patch	Thu Oct 29 15:00:12 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- oipenjdk/jdk/src/share/classes/sun/misc/FloatingDecimal.java	Thu Sep 27 12:56:46 2007 -0700
-+++ openjdk/jdk/src/share/classes/sun/misc/FloatingDecimal.java	2007-11-13 13:39:18.000000000 -0500
-@@ -730,7 +730,7 @@
-                  * Thus we will need more than one digit if we're using
-                  * E-form
-                  */
--                if ( decExp <= -3 || decExp >= 8 ){
-+                if ( decExp < -3 || decExp >= 8 ){
-                     high = low = false;
-                 }
-                 while( ! low && ! high ){
-@@ -783,7 +783,7 @@
-                  * Thus we will need more than one digit if we're using
-                  * E-form
-                  */
--                if ( decExp <= -3 || decExp >= 8 ){
-+                if ( decExp < -3 || decExp >= 8 ){
-                     high = low = false;
-                 }
-                 while( ! low && ! high ){
-@@ -847,7 +847,7 @@
-              * Thus we will need more than one digit if we're using
-              * E-form
-              */
--            if ( decExp <= -3 || decExp >= 8 ){
-+            if ( decExp < -3 || decExp >= 8 ){
-                 high = low = false;
-             }
-             while( ! low && ! high ){
--- a/patches/icedtea-shark-build.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/icedtea-shark-build.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
 --- openjdk.orig/jdk/make/java/redist/Makefile	2009-10-26 21:42:20.000000000 +0000
-+++ openjdk/jdk/make/java/redist/Makefile	2009-10-29 11:53:21.000000000 +0000
++++ openjdk/jdk/make/java/redist/Makefile	2009-10-29 16:33:44.000000000 +0000
 @@ -96,11 +96,13 @@
  
  # Hotspot client is only available on 32-bit non-Zero builds
@@ -33,16 +33,19 @@
  
  #  NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
 diff -Nru openjdk.orig/make/hotspot-rules.gmk openjdk/make/hotspot-rules.gmk
---- openjdk.orig/make/hotspot-rules.gmk	2009-10-29 11:51:56.000000000 +0000
-+++ openjdk/make/hotspot-rules.gmk	2009-10-29 11:52:56.000000000 +0000
-@@ -74,6 +74,10 @@
+--- openjdk.orig/make/hotspot-rules.gmk	2009-10-21 16:40:25.000000000 +0100
++++ openjdk/make/hotspot-rules.gmk	2009-10-29 16:33:44.000000000 +0000
+@@ -72,9 +72,13 @@
+   HOTSPOT_TARGET = all_fastdebug
+ endif
  
++ifdef ICEDTEA_SHARK_BUILD
++  HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
++else
  ifeq ($(ZERO_BUILD), true)
    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
-+else
-+ifdef ICEDTEA_SHARK_BUILD                                                                                                
-+  HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark                                                                               
-+endif      
  endif
++endif
  
  HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
--- a/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp	Thu Oct 29 15:00:12 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp	Sun Nov 01 19:13:55 2009 +0000
@@ -88,7 +88,7 @@
   {
     masm()->align(BytesPerWord);
     int offset = masm()->offset();
-    masm()->store_oop(object->encoding());
+    masm()->store_oop(object->constant_encoding());
     return offset;
   }
 };
--- a/ports/hotspot/src/share/vm/shark/sharkConstant.cpp	Thu Oct 29 15:00:12 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkConstant.cpp	Sun Nov 01 19:13:55 2009 +0000
@@ -117,7 +117,7 @@
     }
     object = klass->java_mirror();
   }
-  if (object->is_null_object() || !object->has_encoding()) {
+  if (object->is_null_object() || !object->should_be_constant()) {
     _is_loaded = false;
     return;
   }