Mercurial > hg > release > icedtea7-2.6

changeset 1988:e8514149a3c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b72 and new Zero update, don't copy OpenJDK source files during build. 2009-09-30 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-pregenerated-nimbus.patch: No longer needed. * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Removed, in upstream forest. * Makefile.am: Bump to b72, remove JIBX Nimbus requirement and don't copy OpenJDK source code. * acinclude.m4: (FIND_BCEL_JAR): Removed. (FIND_XPP3_JAR): Removed. (FIND_JIBX_DIR): Removed. (AC_CHECK_ENABLE_NIMBUS): Removed. (AC_CHECK_ENABLE_NIMBUS_GENERATION): Removed. * configure.ac: Drop Nimbus/JIBX tests. * patches/ecj/icedtea-hotspot-default.patch: Don't run test_gamma on zero. * patches/hotspot/default/icedtea-shark-build.patch, * patches/hotspot/default/icedtea-shark.patch, * patches/icedtea-libraries.patch, * patches/icedtea-linker-libs-order.patch, * patches/icedtea-shark-build.patch: Updated due to b72 and Zero update.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 30 Sep 2009 11:49:23 +0100
parents 0b502a4ae3ff
children d0aceefec3f3
files ChangeLog Makefile.am acinclude.m4 configure.ac patches/ecj/icedtea-hotspot-default.patch patches/hotspot/default/icedtea-shark-build.patch patches/hotspot/default/icedtea-shark.patch patches/icedtea-libraries.patch patches/icedtea-linker-libs-order.patch patches/icedtea-pregenerated-nimbus.patch patches/icedtea-shark-build.patch ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
diffstat 12 files changed, 251 insertions(+), 551 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 23 16:24:04 2009 -0400
+++ b/ChangeLog	Wed Sep 30 11:49:23 2009 +0100
@@ -1,3 +1,27 @@
+2009-09-30  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-pregenerated-nimbus.patch:
+	No longer needed.
+	* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp:
+	Removed, in upstream forest.
+	* Makefile.am: Bump to b72, remove JIBX Nimbus requirement
+	and don't copy OpenJDK source code.
+	* acinclude.m4:
+	(FIND_BCEL_JAR): Removed.
+	(FIND_XPP3_JAR): Removed.
+	(FIND_JIBX_DIR): Removed.
+	(AC_CHECK_ENABLE_NIMBUS): Removed.
+	(AC_CHECK_ENABLE_NIMBUS_GENERATION): Removed.
+	* configure.ac: Drop Nimbus/JIBX tests.
+	* patches/ecj/icedtea-hotspot-default.patch:
+	Don't run test_gamma on zero.
+	* patches/hotspot/default/icedtea-shark-build.patch,
+	* patches/hotspot/default/icedtea-shark.patch,
+	* patches/icedtea-libraries.patch,
+	* patches/icedtea-linker-libs-order.patch,
+	* patches/icedtea-shark-build.patch:
+	Updated due to b72 and Zero update.
+
 2009-09-23  Jon VanAlten  <jon.vanalten@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Sep 23 16:24:04 2009 -0400
+++ b/Makefile.am	Wed Sep 30 11:49:23 2009 +0100
@@ -1,20 +1,20 @@
-OPENJDK_VERSION = b71
+OPENJDK_VERSION = b72
 
-OPENJDK_CHANGESET = 47425552fc70
-CORBA_CHANGESET = 109171aadcfa
-JAXP_CHANGESET = 6d4f2360ffe6
-JAXWS_CHANGESET = 75cfe6f615df
-JDK_CHANGESET = 2a1a7fb44226
-LANGTOOLS_CHANGESET = 70cd643d6217
-HOTSPOT_CHANGESET = 73abf11e8e61
+CORBA_CHANGESET = 5fdcfb25dbb4
+HOTSPOT_CHANGESET = c8155bc21432
+JAXP_CHANGESET = fe2e7f835dd2
+JAXWS_CHANGESET = 501b8988da30
+JDK_CHANGESET = c2cd86f82ed7
+LANGTOOLS_CHANGESET = 5a36337cc053
+OPENJDK_CHANGESET = 717f2b969919
 
-OPENJDK_MD5SUM = d0753b769317c497ae14d9ab089504f7
-CORBA_MD5SUM = 5cb4f5afbef00fd662c554b9dd7312a7
-JAXP_MD5SUM = 0203983e81a05e548f7fc7bed557bf2c
-JAXWS_MD5SUM = 07015564ab925a96cebf363814707d64
-JDK_MD5SUM = 9297009647ee6d3711fb59c3d3914404
-LANGTOOLS_MD5SUM = 70c0690c8ee523beb2a19dd1b7d2a9f9
-HOTSPOT_MD5SUM = 27eabf6067ac04edf002fad94671bbe1
+CORBA_MD5SUM = 5a9fef662129c05b2dd05c79a2685178
+HOTSPOT_MD5SUM = e5b21a7e5cc5cae315cd9aa158ee9858
+JAXP_MD5SUM = f4bd08cf016fefe31c4269b9d90edec0
+JAXWS_MD5SUM = 8d0729f5c4ddec47393e636e7d6a4914
+JDK_MD5SUM = 622268153bc097a5b91d76305eb0502d
+LANGTOOLS_MD5SUM = eadbaead19df2fbe039fd12593e97197
+OPENJDK_MD5SUM = b5d1f6fad70a2b6af7b011169fbd6da3
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -61,19 +61,15 @@
 PULSE_JAVA_CLASS_DIR =
 endif
 
-if ENABLE_NIMBUS_GENERATION
-JIBX_DEPS_DIR=$(abs_top_builddir)/jibx
-endif
-
-SHARE = openjdk/jdk/src/share/classes
-SOLARIS = openjdk/jdk/src/solaris/classes
+JDK_SHARE = openjdk/jdk/src/share/classes
+JDK_SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
 CORBA = openjdk/corba/src/share/classes
 JAXWS = openjdk/jaxws/src/share/classes
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+        $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
 
 SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
 
@@ -1555,11 +1551,9 @@
 	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
-	CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
 	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-	ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
 	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
 	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
 	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -1579,7 +1573,6 @@
 	ANT_RESPECT_JAVA_HOME="TRUE" \
 	RHINO_JAR="$(RHINO_JAR)" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
-	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
 	ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
 	ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
 	DEBUG_CLASSFILES="true" \
@@ -1591,11 +1584,6 @@
 	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
 endif
 
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_ENV += \
-	DISABLE_NIMBUS="true"
-endif
-
 if DISABLE_OPTIMIZATIONS
 ICEDTEA_ENV += \
 	NO_OPTIMIZATIONS="true" \
@@ -1643,11 +1631,9 @@
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
 	GENSRCDIR="$(abs_top_builddir)/generated" \
-	CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
 	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-	ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
 	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
 	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
 	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -2128,12 +2114,6 @@
 ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
 endif
 
-if ENABLE_NIMBUS
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_PATCHES += patches/icedtea-pregenerated-nimbus.patch
-endif
-endif
-
 if ENABLE_PLUGIN
 ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch
 else
@@ -2471,7 +2451,7 @@
 ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
 	patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
 	patches/ecj/icedtea-jopt.patch \
-	patches/ecj/icedtea-dyn.patch
+	patches/ecj/icedtea-dyn.patch 
 
 if CP39408_JAVAH
 ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr39408.patch
@@ -2689,8 +2669,8 @@
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
-	stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
-	stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
+	stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+	stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -2779,8 +2759,8 @@
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
-	stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
-	stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
+	stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+	stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -2957,38 +2937,18 @@
 	rm -f stamps/hotspot-tools.stamp
 	rm -f bootstrap/jdk1.7.0/lib/tools.jar
 
-# Sources copied from OpenJDK.
-ICEDTEA_COPY_DIRS = \
-	com/sun/jdi \
-	com/sun/jdi/connect \
-	com/sun/jdi/connect/spi \
-	com/sun/jdi/event \
-	com/sun/jdi/request \
-	com/sun/tools/jdi \
-	com/sun/net/httpserver \
-	java/io \
-	java/util \
-	java/rmi \
-	sun/awt/ \
-	javax/net/ssl \
-	javax/script
-
-stamps/copy-source-files.stamp: stamps/overlay.stamp
-	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
-	do \
-	  mkdir -p rt/$$copy_dir ; \
-	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \
-	    rt/$$copy_dir ; \
-	done
-	mkdir -p stamps
-	touch stamps/copy-source-files.stamp
-
-clean-copy:
-	rm -f stamps/copy-source-files.stamp
-	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
-	do \
-	  rm -rf rt/$$copy_dir ; \
-	done
+# Sources used from OpenJDK.
+ICEDTEA_BOOTSTRAP_DIRS = \
+	$(JDK_SHARE)/com/sun/jdi \
+	$(JDK_SHARE)/com/sun/tools/jdi \
+	$(JDK_SHARE)/com/sun/net/httpserver \
+	$(JDK_SHARE)/java/io \
+	$(JDK_SHARE)/java/util \
+	$(JDK_SHARE)/java/rmi \
+	$(JDK_SHARE)/sun/awt/ \
+	$(JDK_SHARE)/javax/net/ssl \
+	$(JDK_SHARE)/javax/script \
+	$(JAXWS)/javax/xml/bind
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
@@ -3059,9 +3019,13 @@
 	fi
 
 # rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/extract.stamp stamps/overlay.stamp
 	find $(abs_top_builddir)/rt -name '*.java' \
 	  | sort -u > $@
+	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
+	do \
+	  find $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
+	done
 
 stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp
 	mkdir -p lib/rt
@@ -3157,23 +3121,6 @@
 	mkdir -p stamps
 	touch stamps/liveconnect.stamp
 
-stamps/jibx.stamp:
-if ENABLE_NIMBUS
-if ENABLE_NIMBUS_GENERATION
-	mkdir $(JIBX_DEPS_DIR)
-	ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR)
-	ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
-	ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
-	ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
-else
-	mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
-	cp -a $(abs_top_builddir)/generated/javax/swing/plaf/nimbus \
-	  $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
-endif
-endif
-	mkdir -p stamps
-	touch $@
-
 stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
@@ -3646,8 +3593,6 @@
 
 nbplatform: stamps/nbplatform.stamp
 
-copy-source-files: stamps/copy-source-files.stamp
-
 download: stamps/download.stamp
 
 extract: stamps/extract.stamp
@@ -3664,8 +3609,6 @@
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
-jibx: stamps/jibx.stamp
-
 native-ecj: stamps/native-ecj.stamp
 
 patch-ecj: stamps/patch-ecj.stamp
--- a/acinclude.m4	Wed Sep 23 16:24:04 2009 -0400
+++ b/acinclude.m4	Wed Sep 30 11:49:23 2009 +0100
@@ -1239,131 +1239,6 @@
 AC_PROVIDE([$0])dnl
 ])
 
-AC_DEFUN([FIND_BCEL_JAR],
-[
-  AC_MSG_CHECKING([for bytecode engineering library (BCEL)])
-  AC_ARG_WITH([bcel],
-              [AS_HELP_STRING(--with-bcel,specify location of the bcel jar)],
-  [
-    case "${withval}" in
-      yes)
-	BCEL_JAR=yes
-        ;;
-      no)
-        BCEL_JAR=no
-        ;;
-      *)
-        BCEL_JAR="${withval}"
-	;;
-     esac
-  ],
-  [
-    BCEL_JAR=yes
-  ])
-  if test x"${BCEL_JAR}" = "xyes"; then
-    if test -e "/usr/share/bcel/lib/bcel.jar"; then
-      BCEL_JAR="/usr/share/bcel/lib/bcel.jar"
-    elif test -e "/usr/share/java/bcel.jar"; then
-      BCEL_JAR="/usr/share/java/bcel.jar"
-    fi
-  fi
-  if ! test -f "${BCEL_JAR}"; then
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR("A BCEL jar ${BCEL_JAR} was not found.")
-  fi
-  AC_MSG_RESULT(${BCEL_JAR})
-  AC_SUBST(BCEL_JAR)
-])
-
-AC_DEFUN([FIND_XPP3_JAR],
-[
-  AC_MSG_CHECKING([for XML Pull Parser 3 (XPP3)])
-  AC_ARG_WITH([xpp3],
-              [AS_HELP_STRING(--with-xpp3,specify location of the xpp3 jar)],
-  [
-    case "${withval}" in
-      yes)
-	XPP3_JAR=yes
-        ;;
-      no)
-        XPP3_JAR=no
-        ;;
-      *)
-        XPP3_JAR="${withval}"
-	;;
-     esac
-  ],
-  [
-    XPP3_JAR=yes
-  ])
-  if test x"${XPP3_JAR}" = "xyes"; then
-    if test -e "/usr/share/xpp3/lib/xpp3.jar"; then
-      XPP3_JAR="/usr/share/xpp3/lib/xpp3.jar"
-    elif test -e "/usr/share/java/xpp3.jar"; then
-      XPP3_JAR="/usr/share/java/xpp3.jar"
-    fi
-  fi
-  if ! test -f "${XPP3_JAR}"; then
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR("A XPP3 jar ${XPP3_JAR} was not found.")
-  fi
-  AC_MSG_RESULT(${XPP3_JAR})
-  AC_SUBST(XPP3_JAR)
-])
-
-AC_DEFUN([FIND_JIBX_DIR],
-[
-  AC_MSG_CHECKING([for JIBX])
-  AC_ARG_WITH([jibx],
-              [AS_HELP_STRING(--with-jibx,specify location of the jibx jars)],
-  [
-    case "${withval}" in
-      yes)
-	JIBX_DIR=yes
-        ;;
-      no)
-        JIBX_DIR=no
-        ;;
-      *)
-        JIBX_DIR="${withval}"
-	;;
-     esac
-  ],
-  [
-    JIBX_DIR=yes
-  ])
-  if test x"${JIBX_DIR}" = "xyes"; then
-    if test -e "/usr/share/jibx/lib/jibx-run.jar"; then
-      JIBX_DIR=/usr/share/jibx/lib
-    elif test -e "/usr/share/java/jibx-run.jar"; then
-      JIBX_DIR=/usr/share/java
-    fi
-  fi
-  if ! test -d "${JIBX_DIR}"; then
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR("A JIBX jar directory ${JIBX_JAR} was not found.")
-  fi
-  AC_MSG_RESULT(${JIBX_DIR})
-  AC_SUBST(JIBX_DIR)
-])
-
-AC_DEFUN([AC_CHECK_ENABLE_NIMBUS],
-[
-  AC_MSG_CHECKING(whether to build the Nimbus L'n'F)
-  AC_ARG_ENABLE([nimbus],
-	      [AS_HELP_STRING(--enable-nimbus,build the Nimbus L'n'F [[default=yes]])],
-  [
-    ENABLE_NIMBUS="${enableval}"
-  ],
-  [
-    ENABLE_NIMBUS=yes
-  ])
-
-  AC_MSG_RESULT(${ENABLE_NIMBUS})
-  AM_CONDITIONAL(ENABLE_NIMBUS, test x"${ENABLE_NIMBUS}" = "xyes")
-  AC_SUBST(ENABLE_NIMBUS)
-])
-
 AC_DEFUN([IT_XULRUNNER_VERSION],
 [
 AC_LANG_PUSH([C++])
@@ -1415,23 +1290,6 @@
 AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
 ])
 
-AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERATION],
-[
-  AC_MSG_CHECKING(whether to generate the Nimbus source files using JIBX)
-  AC_ARG_ENABLE([nimbus-generation],
-	      [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=no]])],
-  [
-    ENABLE_NIMBUS_GENERATION="${enableval}"
-  ],
-  [
-    ENABLE_NIMBUS_GENERATION=no
-  ])
-
-  AC_MSG_RESULT(${ENABLE_NIMBUS_GENERATION})
-  AM_CONDITIONAL(ENABLE_NIMBUS_GENERATION, test x"${ENABLE_NIMBUS_GENERATION}" = "xyes")
-  AC_SUBST(ENABLE_NIMBUS_GENERATION)
-])
-
 AC_DEFUN([IT_CHECK_ADDITIONAL_VMS],
 [
 AC_MSG_CHECKING([for additional virtual machines to build])
--- a/configure.ac	Wed Sep 23 16:24:04 2009 -0400
+++ b/configure.ac	Wed Sep 30 11:49:23 2009 +0100
@@ -229,8 +229,6 @@
 AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
-AC_CHECK_ENABLE_NIMBUS
-AC_CHECK_ENABLE_NIMBUS_GENERATION
 DISABLE_OPTIMIZATIONS
 SET_SHARK_BUILD
 ENABLE_ZERO_BUILD
@@ -261,16 +259,6 @@
   FIND_NETBEANS
 fi
 
-if test "x${ENABLE_NIMBUS}" = "xyes"
-then
-  if test "x${ENABLE_NIMBUS_GENERATION}" = "xyes"
-  then
-    FIND_BCEL_JAR
-    FIND_XPP3_JAR
-    FIND_JIBX_DIR
-  fi
-fi
-
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
 	,[AC_MSG_ERROR("CUPS headers were not found -
--- a/patches/ecj/icedtea-hotspot-default.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/ecj/icedtea-hotspot-default.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,7 +1,7 @@
 diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile	2009-08-18 17:44:09.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile	2009-08-18 18:56:52.000000000 +0100
-@@ -274,28 +274,24 @@
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile	2009-09-28 13:20:29.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile	2009-09-28 16:06:27.000000000 +0100
+@@ -280,35 +280,30 @@
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -30,9 +30,16 @@
  ifdef INSTALL
  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
  endif
+ 
+ $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
+ 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
 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	2009-08-18 17:35:29.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make	2009-08-18 19:54:42.000000000 +0100
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make	2009-09-22 20:05:24.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make	2009-09-28 16:06:18.000000000 +0100
 @@ -38,7 +38,9 @@
  GENERATED = $(TOPDIR)/../generated
  
--- a/patches/hotspot/default/icedtea-shark-build.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/hotspot/default/icedtea-shark-build.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,9 +1,9 @@
 diff -Nru openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
---- openjdk.orig/hotspot/make/linux/Makefile	2009-07-15 17:35:02.000000000 +0100
-+++ openjdk/hotspot/make/linux/Makefile	2009-07-24 00:10:26.000000000 +0100
-@@ -158,6 +158,13 @@
- #       profiledcore    core            <os>_<arch>_core/profiled
- #       productcore     core            <os>_<arch>_core/product
+--- 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 @@
+ #       profiledzero    zero            <os>_<arch>_zero/profiled
+ #       productzero     zero            <os>_<arch>_zero/product
  #
 +#       debugshark      shark           <os>_<arch>_shark/debug
 +#       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
@@ -15,31 +15,32 @@
  # What you get with each target:
  #
  # debug*     - "thin" libjvm_g - debug info linked into the gamma_g launcher
-@@ -176,11 +183,13 @@
- SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
+@@ -184,12 +191,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))
  
  TARGETS_C2        = $(TARGETS)
  TARGETS_C1        = $(addsuffix 1,$(TARGETS))
  TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
  TARGETS_CORE      = $(addsuffix core,$(TARGETS))
+ TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
 +TARGETS_SHARK     = $(addsuffix shark,$(TARGETS))
  
  BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
  BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-@@ -196,6 +205,7 @@
- 	@echo "  $(TARGETS_C2)"
+@@ -206,6 +215,7 @@
  	@echo "  $(TARGETS_C1)"
  	@echo "  $(TARGETS_CORE)"
+ 	@echo "  $(TARGETS_ZERO)"
 +	@echo "  $(TARGETS_SHARK)"
  
  checks: check_os_version check_j2se_version
  
-@@ -256,6 +266,10 @@
- 	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
- 	$(BUILDTREE) VARIANT=core
+@@ -262,6 +272,10 @@
+ $(OUTPUTDIR)/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
@@ -48,8 +49,8 @@
  # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
-@@ -286,6 +300,12 @@
- 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+@@ -299,6 +313,12 @@
+ 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
 +$(TARGETS_SHARK):  $(SUBDIRS_SHARK)
@@ -61,18 +62,18 @@
  # Just build the tree, and nothing else:
  tree:      $(SUBDIRS_C2)
  tree1:     $(SUBDIRS_C1)
-@@ -316,7 +336,7 @@
+@@ -332,7 +352,7 @@
  
  #-------------------------------------------------------------------------------
  
--.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
-+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_SHARK)
- .PHONY: tree tree1 treecore
- .PHONY: all compiler1 compiler2 core
- .PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
+-.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
++.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
+ .PHONY: tree tree1 treecore treezero
+ .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-07-15 17:35:02.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make	2009-07-24 00:10:26.000000000 +0100
+--- 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 @@
  
  ../shared_dirs.lst:  $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
@@ -85,24 +86,24 @@
  
  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-07-15 17:35:02.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make	2009-07-24 00:11:08.000000000 +0100
-@@ -110,6 +110,7 @@
+--- 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 ($(CORE_BUILD), true)
+ 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
-@@ -125,3 +126,4 @@
+@@ -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-07-23 23:49:44.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2009-07-24 00:10:26.000000000 +0100
+--- 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 @@
  ifeq ($(ZERO_BUILD), true)
  CFLAGS += $(LIBFFI_CFLAGS)
@@ -114,22 +115,22 @@
  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-03-30 17:15:27.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/top.make	2009-07-24 00:10:26.000000000 +0100
-@@ -74,6 +74,7 @@
- Include_DBs/COMPILER1   = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
+--- 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
+@@ -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
+ Include_DBs/ZERO        = $(Include_DBs/CORE) $(VM)/includeDB_zero
 +Include_DBs/SHARK       = $(Include_DBs/CORE) $(VM)/includeDB_shark
  Include_DBs = $(Include_DBs/$(TYPE))
  
  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-07-23 23:49:43.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make	2009-07-24 00:10:26.000000000 +0100
-@@ -130,10 +130,14 @@
- 
- STATIC_CXX = true
+--- 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 @@
+ 	rm -f $@
+ 	cat $^ > $@
  
 -ifeq ($(ZERO_LIBARCH), ppc64)
 +ifdef ICEDTEA_SHARK_BUILD
@@ -144,7 +145,7 @@
  endif
  
  ifeq ($(LINK_INTO),AOUT)
-@@ -161,6 +165,10 @@
+@@ -163,6 +167,10 @@
  ifeq ($(ZERO_BUILD), true)
    LIBS_VM += $(LIBFFI_LIBS)
  endif
@@ -156,11 +157,11 @@
  LINK_VM = $(LINK_LIB.c)
  
 diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile	2009-07-15 17:35:02.000000000 +0100
-+++ openjdk/hotspot/make/Makefile	2009-07-24 00:10:26.000000000 +0100
-@@ -103,6 +103,15 @@
- all_debugcore:     jvmgcore docs export_debug
- all_optimizedcore: optimizedcore docs export_optimized
+--- 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 @@
+ 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
@@ -174,9 +175,9 @@
  # Do everything
  world:         all create_jdk
  
-@@ -129,6 +138,10 @@
+@@ -123,6 +132,10 @@
  	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
+ 	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
  
 +$(SHARK_VM_TARGETS):
 +	$(CD) $(GAMMADIR)/make; \
@@ -185,9 +186,9 @@
  $(KERNEL_VM_TARGETS):
  	$(CD) $(GAMMADIR)/make; \
  	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -181,6 +194,12 @@
- 		$(MAKE) -f $(ABS_OS_MAKEFILE) \
- 			$(MAKE_ARGS) $(VM_TARGET)
+@@ -173,6 +186,12 @@
+ 		      $(MAKE_ARGS) $(VM_TARGET)
+ endif
  
 +generic_buildshark:
 +	$(MKDIR) -p $(OUTPUTDIR)
@@ -198,31 +199,30 @@
  generic_buildkernel:
  	$(MKDIR) -p $(OUTPUTDIR)
  ifeq ($(OSNAME),windows)
-@@ -230,8 +249,12 @@
- ifeq ($(CORE_BUILD), true)
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
+@@ -228,16 +247,22 @@
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+ ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
++SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
+ C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
+ C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
+ ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
++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
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
- endif
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-@@ -242,6 +265,10 @@
-   MISC_DIR=$(C2_DIR)
-   GEN_DIR=$(C2_BASE_DIR)/generated
- else
-+ifdef ICEDTEA_SHARK_BUILD
-+  MISC_DIR=$(C2_DIR)
-+  GEN_DIR=$(C2_BASE_DIR)/generated
++  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
-@@ -250,6 +277,7 @@
+@@ -246,6 +271,7 @@
    GEN_DIR=$(C2_BASE_DIR)/generated
  endif
  endif
--- a/patches/hotspot/default/icedtea-shark.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/hotspot/default/icedtea-shark.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
 --- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2009-03-30 17:15:27.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -548,3 +548,4 @@
    }
    return impl;
@@ -8,7 +8,7 @@
 +
 diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp
 --- openjdk.orig/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2009-03-30 17:15:27.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2009-09-23 12:40:53.000000000 +0100
 @@ -198,4 +198,5 @@
    // What kind of ciObject is this?
    bool is_instance_klass() { return true; }
@@ -17,7 +17,7 @@
  };
 diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciMethod.cpp openjdk/hotspot/src/share/vm/ci/ciMethod.cpp
 --- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.cpp	2009-06-30 14:25:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -56,9 +56,9 @@
    _liveness           = NULL;
    _bcea = NULL;
@@ -104,7 +104,7 @@
  // ------------------------------------------------------------------
 diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciMethod.hpp openjdk/hotspot/src/share/vm/ci/ciMethod.hpp
 --- openjdk.orig/hotspot/src/share/vm/ci/ciMethod.hpp	2009-05-08 17:40:25.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp	2009-09-23 12:40:53.000000000 +0100
 @@ -69,7 +69,7 @@
  
    // Optional liveness analyzer.
@@ -125,8 +125,8 @@
    address       interpreter_entry();
  
 diff -Nru openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp openjdk/hotspot/src/share/vm/code/nmethod.cpp
---- openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp	2009-03-30 23:08:41.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/code/nmethod.cpp	2009-09-21 17:12:24.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -65,6 +65,11 @@
    assert(compiler() != NULL, "must be");
    return compiler()->is_c2();
@@ -139,7 +139,7 @@
  
  
  
-@@ -1567,6 +1572,7 @@
+@@ -1588,6 +1593,7 @@
  // Method that knows how to preserve outgoing arguments at call. This method must be
  // called with a frame corresponding to a Java invoke
  void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
@@ -147,7 +147,7 @@
    if (!method()->is_native()) {
      SimpleScopeDesc ssd(this, fr.pc());
      Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
-@@ -1574,6 +1580,7 @@
+@@ -1595,6 +1601,7 @@
      symbolOop signature = call->signature();
      fr.oops_compiled_arguments_do(signature, is_static, reg_map, f);
    }
@@ -155,7 +155,7 @@
  }
  
  
-@@ -2003,6 +2010,8 @@
+@@ -2024,6 +2031,8 @@
      tty->print("(c1) ");
    } else if (is_compiled_by_c2()) {
      tty->print("(c2) ");
@@ -165,9 +165,9 @@
      tty->print("(nm) ");
    }
 diff -Nru openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp openjdk/hotspot/src/share/vm/code/nmethod.hpp
---- openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp	2009-03-30 23:08:41.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.hpp	2009-07-01 11:02:39.000000000 +0100
-@@ -318,6 +318,7 @@
+--- openjdk.orig/hotspot/src/share/vm/code/nmethod.hpp	2009-09-21 17:12:24.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.hpp	2009-09-23 12:40:53.000000000 +0100
+@@ -317,6 +317,7 @@
  
    bool is_compiled_by_c1() const;
    bool is_compiled_by_c2() const;
@@ -177,7 +177,7 @@
    address code_begin         () const             { return _entry_point; }
 diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/abstractCompiler.hpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp
 --- openjdk.orig/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2009-03-30 17:15:27.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2009-09-23 12:40:53.000000000 +0100
 @@ -45,18 +45,26 @@
    // Missing feature tests
    virtual bool supports_native()                 { return true; }
@@ -207,8 +207,8 @@
  
    // Customization
 diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp
---- openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp	2009-06-30 14:25:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp	2009-08-06 13:19:29.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -554,6 +554,14 @@
  #endif
  #endif // COMPILER2
@@ -225,8 +225,8 @@
    _task_free_list = NULL;
  
 diff -Nru openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2009-03-30 23:08:41.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2009-09-21 17:12:26.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2009-09-23 12:40:53.000000000 +0100
 @@ -44,6 +44,7 @@
    friend class VMStructs;
    friend class CardTableRS;
@@ -236,8 +236,8 @@
    // For debugging.
    friend class GuaranteeNotModClosure;
 diff -Nru openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp openjdk/hotspot/src/share/vm/oops/methodOop.cpp
---- openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp	2009-05-08 17:40:29.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/oops/methodOop.cpp	2009-08-06 13:19:32.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -738,10 +738,14 @@
    }
  
@@ -254,8 +254,8 @@
  }
  
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp	2009-03-30 17:15:28.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/runtime/deoptimization.cpp	2009-08-06 13:19:34.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -229,6 +229,7 @@
  
    }
@@ -332,7 +332,7 @@
 +#endif // COMPILER2 || SHARK
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.cpp openjdk/hotspot/src/share/vm/runtime/globals.cpp
 --- openjdk.orig/hotspot/src/share/vm/runtime/globals.cpp	2009-03-30 17:15:28.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/globals.cpp	2009-07-01 11:02:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp	2009-09-23 12:40:53.000000000 +0100
 @@ -176,6 +176,18 @@
    #define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 notproduct}", DEFAULT },
  #endif
@@ -363,8 +363,8 @@
  };
  
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp	2009-06-30 17:14:57.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2009-07-01 11:02:39.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp	2009-09-23 12:25:43.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2009-09-23 12:40:53.000000000 +0100
 @@ -22,7 +22,7 @@
   *
   */
@@ -375,23 +375,18 @@
  define_pd_global(bool, UseTLAB,                      false);
  define_pd_global(bool, CICompileOSR,                 false);
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2009-06-30 17:14:58.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2009-07-01 11:02:39.000000000 +0100
-@@ -94,6 +94,9 @@
- #ifdef TIERED
-   #define VMTYPE "Server"
- #else
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2009-09-22 20:05:25.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2009-09-23 12:42:19.000000000 +0100
+@@ -97,8 +97,12 @@
+ #ifdef ZERO
+   #define VMTYPE "Zero"
+ #else // ZERO
 +#ifdef SHARK
 +  #define VMTYPE "Shark"
-+#else
- #if defined(COMPILER1) || defined(COMPILER2)
++#else // SHARK
     #define VMTYPE COMPILER1_PRESENT("Client")   \
                    COMPILER2_PRESENT("Server")
-@@ -104,6 +107,7 @@
-   #define VMTYPE "Core"
++#endif // SHARK
  #endif // ZERO
- #endif // COMPILER1 || COMPILER2
-+#endif // SHARK
  #endif // TIERED
  #endif // KERNEL
- 
--- a/patches/icedtea-libraries.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/icedtea-libraries.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,11 +1,11 @@
 diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-07-14 09:14:34.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-07-23 17:27:30.000000000 +0100
-@@ -75,12 +75,10 @@
- 	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-09-21 17:09:41.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-09-21 22:50:31.000000000 +0100
+@@ -74,12 +74,10 @@
+ 	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
  
--  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 -  OTHER_CXXFLAGS += $(ZINCLUDE)
 -  LDDFLAGS += $(ZIPOBJS)
 +  OTHER_LDLIBS += -lz
@@ -16,7 +16,7 @@
  endif
  
  CXXFLAGS_DBG += -DFULL
-@@ -99,12 +97,12 @@
+@@ -98,12 +96,12 @@
    RES = $(OBJDIR)/$(PGRM).res
  else
    LDOUTPUT = -o #Have a space 
@@ -32,8 +32,8 @@
  endif #LINUX
  endif #PLATFORM
 diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk	2009-07-23 17:28:45.000000000 +0100
+--- openjdk.orig/jdk/make/common/Program.gmk	2009-08-20 00:00:43.000000000 +0100
++++ openjdk/jdk/make/common/Program.gmk	2009-09-21 22:50:31.000000000 +0100
 @@ -85,7 +85,7 @@
  	endif
      endif
@@ -52,35 +52,32 @@
  # this may not be necessary...
  ifeq ($(PLATFORM), windows)
 diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile	2009-07-23 17:27:30.000000000 +0100
-@@ -44,8 +44,6 @@
+--- openjdk.orig/jdk/make/java/jli/Makefile	2009-09-21 17:09:41.000000000 +0100
++++ openjdk/jdk/make/java/jli/Makefile	2009-09-21 22:51:00.000000000 +0100
+@@ -44,7 +44,6 @@
  
  include $(BUILDDIR)/common/Defs.gmk
  
--ZLIB_VERSION = 1.1.3
 -ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
  LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
  LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
  
-@@ -70,15 +68,7 @@
+@@ -69,13 +68,7 @@
  	parse_manifest.c \
  	version_comp.c \
  	wildcard.c \
 -	jli_util.c \
 -	inflate.c \
--	infblock.c \
 -	inftrees.c \
--	infcodes.c \
 -	inffast.c \
--	infutil.c \
 -	zadler32.c \
+-	zcrc32.c \
 -	zutil.c
 +	jli_util.c
  
  ifneq ($(PLATFORM), windows)
  
-@@ -103,7 +93,7 @@
+@@ -100,7 +93,7 @@
  	# Note: its important to keep this order meaning -lc is the
  	# last library otherwise it could cause compatibility issues
  	# by pulling in SUNW_private symbols from libc
@@ -89,7 +86,7 @@
  ifeq ($(USE_PTHREADS),true)
  	LDLIBS += -lpthread
  endif # USE_PTHREADS 
-@@ -127,7 +117,6 @@
+@@ -124,7 +117,6 @@
  
  OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
  OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
@@ -97,44 +94,37 @@
  
  #
  # Library to compile.
-@@ -168,4 +157,4 @@
+@@ -165,4 +157,4 @@
  #
  # Add to ambient vpath so we pick up the library files
  #
 -vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
 +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
 diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-07-23 17:27:30.000000000 +0100
-@@ -29,15 +29,4 @@
+--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk	2009-09-21 17:09:41.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
+@@ -29,16 +29,4 @@
  	Deflater.c \
  	Inflater.c \
  	ZipFile.c \
+-	zip_util.c \
+-	compress.c \
+-	deflate.c \
+-	gzio.c \
+-	infback.c \
+-	inffast.c \
+-	inflate.c \
+-	inftrees.c \
+-	trees.c \
+-	uncompr.c \
 -	zadler32.c \
 -	zcrc32.c \
--	deflate.c \
--	trees.c \
--	zutil.c \
--	inflate.c \
--	infblock.c \
--	inftrees.c \
--	infcodes.c \
--	infutil.c \
--	inffast.c \
- 	zip_util.c
+-	zutil.c 
++	zip_util.c
 diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
---- openjdk.orig/jdk/make/java/zip/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile	2009-07-23 17:27:30.000000000 +0100
-@@ -30,8 +30,6 @@
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
- 
--ZLIB_VERSION = 1.1.3
--
- #
- # Files to compile.
- #
-@@ -69,16 +67,10 @@
+--- openjdk.orig/jdk/make/java/zip/Makefile	2009-09-21 17:09:41.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile	2009-09-21 22:50:31.000000000 +0100
+@@ -71,16 +71,10 @@
  CPPFLAGS += -UDEBUG 
  endif
  
@@ -154,7 +144,7 @@
 +OTHER_LDLIBS = $(JVMLIB) -lz
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
 --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
 @@ -25,51 +25,7 @@
  
  FILES_c = \
@@ -210,7 +200,7 @@
  FILES_c += \
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
 --- openjdk.orig/jdk/make/sun/jpeg/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile	2009-09-21 22:50:31.000000000 +0100
 @@ -67,6 +67,8 @@
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  include $(BUILDDIR)/common/Library.gmk
@@ -221,9 +211,9 @@
  # Add to ambient vpath to get files in a subdirectory
  #
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
---- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-07-23 17:27:30.000000000 +0100
-@@ -30,81 +30,5 @@
+--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 17:09:42.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
+@@ -30,79 +30,5 @@
  	splashscreen_impl.c \
  	splashscreen_jpeg.c \
  	splashscreen_png.c \
@@ -249,12 +239,10 @@
 -	compress.c \
 -	deflate.c \
 -	gzio.c \
--	infblock.c \
--	infcodes.c \
+-	infback.c \
 -	inffast.c \
 -	inflate.c \
 -	inftrees.c \
--	infutil.c \
 -	trees.c \
 -	uncompr.c \
 -	zadler32.c \
@@ -304,11 +292,11 @@
 -	jfdctflt.c \
 -	jfdctfst.c \
 -	jfdctint.c
-+	splashscreen_sys.c 
++	splashscreen_sys.c
  
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
---- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-07-23 17:27:30.000000000 +0100
+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2009-09-21 17:09:42.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-09-21 22:50:31.000000000 +0100
 @@ -59,12 +59,12 @@
  # C Flags
  #
@@ -329,19 +317,19 @@
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
 -vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
--vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 -vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
  vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
  
  CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
  
  # Shun the less than portable MMX assembly code in pnggccrd.c,
  # and use alternative implementations in C.
 diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-05-08 16:10:58.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-07-23 17:27:30.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-08-20 00:00:45.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-09-21 22:50:31.000000000 +0100
 @@ -89,11 +89,7 @@
  // bytes and byte arrays
  
@@ -356,7 +344,7 @@
  typedef DWORDLONG       julong;
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-09-21 22:50:31.000000000 +0100
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -368,7 +356,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-09-21 22:50:31.000000000 +0100
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -380,7 +368,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-09-21 22:50:31.000000000 +0100
 @@ -32,7 +32,7 @@
  #include "jlong.h"
  #include "jni.h"
@@ -392,7 +380,7 @@
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-09-21 22:50:31.000000000 +0100
 @@ -35,7 +35,7 @@
  #include "jni.h"
  #include "jvm.h"
@@ -404,7 +392,7 @@
  #define ThrowDataFormatException(env, msg) \
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c	2009-07-14 09:14:42.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-09-21 22:50:31.000000000 +0100
 @@ -44,7 +44,8 @@
  #include "io_util.h"
  #include "io_util_md.h"
@@ -417,7 +405,7 @@
  #ifdef USE_MMAP
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-06 14:52:43.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-09-21 22:50:31.000000000 +0100
 @@ -51,7 +51,9 @@
  
  /* headers from the JPEG library */
@@ -20951,7 +20939,7 @@
 -#endif /* JPEG_INTERNAL_OPTIONS */
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-09-21 22:50:31.000000000 +0100
 @@ -45,7 +45,9 @@
  #undef boolean
  #undef FAR
@@ -25491,7 +25479,7 @@
 -Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-05-08 16:10:59.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-09-21 22:50:31.000000000 +0100
 @@ -26,7 +26,7 @@
  #include "splashscreen_impl.h"
  #include "splashscreen_gfx.h"
@@ -25502,8 +25490,8 @@
  #define GIF_TRANSPARENT     0x01
  #define GIF_USER_INPUT      0x02
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-07-23 17:27:30.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-08-20 00:00:45.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-09-21 22:50:31.000000000 +0100
 @@ -25,9 +25,8 @@
  
  #include "splashscreen_impl.h"
@@ -25535,7 +25523,7 @@
      src = (stream_src_ptr) cinfo->src;
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
 --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-04-14 16:51:17.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-07-23 17:27:30.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-09-21 22:50:31.000000000 +0100
 @@ -25,7 +25,7 @@
  
  #include "splashscreen_impl.h"
--- a/patches/icedtea-linker-libs-order.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/icedtea-linker-libs-order.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,8 +1,8 @@
 diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-07-14 17:28:33.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-07-14 17:32:29.000000000 +0100
-@@ -75,12 +75,12 @@
- 	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-09-21 18:42:07.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-09-21 18:47:23.000000000 +0100
+@@ -74,12 +74,12 @@
+ 	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
  
 -  OTHER_LDLIBS += -lz
@@ -16,7 +16,7 @@
  CXXFLAGS_DBG += -DFULL
  CXXFLAGS_OPT += -DPRODUCT
  CXXFLAGS_COMMON += -DFULL
-@@ -97,12 +97,11 @@
+@@ -96,12 +96,11 @@
    RES = $(OBJDIR)/$(PGRM).res
  else
    LDOUTPUT = -o #Have a space 
@@ -31,7 +31,7 @@
  endif
  endif #LINUX
  endif #PLATFORM
-@@ -145,7 +144,7 @@
+@@ -144,7 +143,7 @@
  
  $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) updatefiles winres
  	$(prep-target)
@@ -42,7 +42,7 @@
  endif
 diff -Nru openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
 --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile	2009-07-14 17:32:29.000000000 +0100
++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile	2009-09-21 18:47:23.000000000 +0100
 @@ -65,7 +65,7 @@
  	$(MIDIFILES_export) \
  	$(PORTFILES_export)
--- a/patches/icedtea-pregenerated-nimbus.patch	Wed Sep 23 16:24:04 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/Makefile openjdk/jdk/make/javax/swing/plaf/Makefile
---- openjdk.orig/jdk/make/javax/swing/plaf/Makefile	2009-05-21 16:40:04.000000000 +0100
-+++ openjdk/jdk/make/javax/swing/plaf/Makefile	2009-05-21 16:40:19.000000000 +0100
-@@ -34,9 +34,7 @@
- #
- include FILES.gmk
- AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
--ifndef DISABLE_NIMBUS
--  SUBDIRS = nimbus
--endif
-+SUBDIRS = nimbus
- 
- # Nimbus is handled in its own directory
- AUTO_JAVA_PRUNE = nimbus
-diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile
---- openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-21 17:12:39.000000000 +0100
-@@ -44,8 +44,6 @@
- #
- # Rules
- #
--CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
--
- include $(BUILDDIR)/common/Classes.gmk
- 
- $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)
--- a/patches/icedtea-shark-build.patch	Wed Sep 23 16:24:04 2009 -0400
+++ b/patches/icedtea-shark-build.patch	Wed Sep 30 11:49:23 2009 +0100
@@ -1,10 +1,10 @@
 diff -Nru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/jdk/make/java/redist/Makefile	2009-07-23 23:45:17.000000000 +0100
+--- openjdk.orig/jdk/make/java/redist/Makefile	2009-09-22 20:24:29.000000000 +0100
++++ openjdk/jdk/make/java/redist/Makefile	2009-09-23 12:02:13.000000000 +0100
 @@ -96,11 +96,13 @@
  
- # Hotspot client is only available on 32-bit non-core builds
- ifneq ($(CORE_BUILD), true)
+ # Hotspot client is only available on 32-bit non-Zero builds
+ ifneq ($(ZERO_BUILD), true)
 +ifndef ICEDTEA_SHARK_BUILD
  ifeq ($(ARCH_DATA_MODEL), 32)
    IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
@@ -18,7 +18,7 @@
 @@ -174,6 +176,7 @@
  endif 
  
- ifneq ($(CORE_BUILD), true)
+ ifneq ($(ZERO_BUILD), true)
 +ifndef ICEDTEA_SHARK_BUILD
  ifeq ($(ARCH_DATA_MODEL), 32)
  
@@ -29,15 +29,15 @@
  
 +endif # ICEDTEA_SHARK_BUILD
 +
- endif # CORE_BUILD
+ endif # ZERO_BUILD
  
  #  NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
 diff -Nru openjdk.orig/make/hotspot-rules.gmk openjdk/make/hotspot-rules.gmk
---- openjdk.orig/make/hotspot-rules.gmk	2009-07-15 17:35:01.000000000 +0100
-+++ openjdk/make/hotspot-rules.gmk	2009-07-23 23:44:12.000000000 +0100
+--- openjdk.orig/make/hotspot-rules.gmk	2009-09-22 21:17:14.000000000 +0100
++++ openjdk/make/hotspot-rules.gmk	2009-09-23 12:01:14.000000000 +0100
 @@ -75,6 +75,9 @@
- ifeq ($(CORE_BUILD), true)
-   HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
+ ifeq ($(ZERO_BUILD), true)
+   HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
  endif
 +ifdef ICEDTEA_SHARK_BUILD
 +  HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
--- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp	Wed Sep 23 16:24:04 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-// |  ...               |
-// +--------------------+  ------------------
-// | stack slot n-1     |       low addresses
-// |  ...               |
-// | stack slot 0       |
-// | monitor m-1        |
-// |  ...               |
-// | monitor 0          |
-// | oop_tmp            |
-// | method             |
-// | unextended_sp      |
-// | pc                 |
-// | frame_type         |
-// | next_frame         |      high addresses
-// +--------------------+  ------------------
-// |  ...               |
-
-class SharkFrame : public ZeroFrame {
-  friend class ZeroStackPrinter;
-  friend class SharkFunction;
-
- private:
-  SharkFrame() : ZeroFrame()
-  {
-    ShouldNotCallThis();
-  }
-
- protected:
-  enum Layout {
-    pc_off = jf_header_words,
-    unextended_sp_off,
-    method_off,
-    oop_tmp_off,
-    header_words
-  };
-
- public:
-  address pc() const
-  {
-    return (address) value_of_word(pc_off);
-  }
-
-  intptr_t* unextended_sp() const
-  {
-    return (intptr_t *) value_of_word(unextended_sp_off);
-  }
-
-  methodOop method() const
-  {
-    return (methodOop) value_of_word(method_off);
-  }
-};