Mercurial > hg > icedtea7

changeset 1891:3340f0afa232

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b63. 2009-07-09 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Bump to b63 and latest IcedTea changesets. Add ANT_RESPECT_JAVA_HOME for Gentoo ant support. Support patches for PR40616 and PR40630. Only apply Scanner patches when needed. * acinclude.m4: (IT_LIBRARY_CHECK): Check for PR40616, missing PrintStream constructors in GCJ. (IT_SCANNER_CHECK): Check for PR30436, missing java.util.Scanner class. (IT_PR40630_CHECK): Check for PR40630, broken java.util.Scanner#hasNextLine(). * configure.ac: Apply new macros. * patches/ecj/icedtea-dbcs.patch: Replace java.util.Scanner in GenerateDBCS. * patches/ecj/icedtea-sbcs.patch, * patches/ecj/icedtea.patch, * patches/hotspot/default/icedtea-shark.patch, * patches/icedtea-libraries.patch, * patches/icedtea-liveconnect.patch, * patches/icedtea-webstart.patch: Recreated.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 09 Jul 2009 16:43:16 +0100
parents cba3ed800419
children e944184d6eda
files ChangeLog Makefile.am acinclude.m4 configure.ac patches/ecj/icedtea-dbcs.patch patches/ecj/icedtea-sbcs.patch patches/ecj/icedtea.patch patches/hotspot/default/icedtea-shark.patch patches/icedtea-libraries.patch patches/icedtea-liveconnect.patch patches/icedtea-webstart.patch
diffstat 11 files changed, 422 insertions(+), 247 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 24 10:31:06 2009 +0200
+++ b/ChangeLog	Thu Jul 09 16:43:16 2009 +0100
@@ -1,3 +1,27 @@
+2009-07-09  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Bump to b63 and latest IcedTea changesets.
+	Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
+	Support patches for PR40616 and PR40630.  Only
+	apply Scanner patches when needed.
+	* acinclude.m4:
+	(IT_LIBRARY_CHECK): Check for PR40616, missing
+	PrintStream constructors in GCJ.
+	(IT_SCANNER_CHECK): Check for PR30436, missing
+	java.util.Scanner class.
+	(IT_PR40630_CHECK): Check for PR40630, broken
+	java.util.Scanner#hasNextLine().
+	* configure.ac: Apply new macros.
+	* patches/ecj/icedtea-dbcs.patch: Replace java.util.Scanner
+	in GenerateDBCS.
+	* patches/ecj/icedtea-sbcs.patch,
+	* patches/ecj/icedtea.patch,
+	* patches/hotspot/default/icedtea-shark.patch,
+	* patches/icedtea-libraries.patch,
+	* patches/icedtea-liveconnect.patch,
+	* patches/icedtea-webstart.patch: Recreated.
+
 2009-06-24  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/cacao/no-strict-aliasing.patch: Apply for configure.ac.
--- a/Makefile.am	Wed Jun 24 10:31:06 2009 +0200
+++ b/Makefile.am	Thu Jul 09 16:43:16 2009 +0100
@@ -1,20 +1,20 @@
-OPENJDK_VERSION = b60
+OPENJDK_VERSION = b63
 
-OPENJDK_CHANGESET = 472c21584cfd
-CORBA_CHANGESET = e906b16a12a9
-JAXP_CHANGESET = f1ac756616ea
-JAXWS_CHANGESET = 55ffcbca5f46
-JDK_CHANGESET = 1a01c90431a7
-LANGTOOLS_CHANGESET = 522520757dd3
-HOTSPOT_CHANGESET = 86092459c54d
+OPENJDK_CHANGESET = 57f7e028c7ad
+CORBA_CHANGESET = d20e45cd539f
+JAXP_CHANGESET = ae449e9c04c1
+JAXWS_CHANGESET = 5b9e8315aab2
+JDK_CHANGESET = 6388560a8d7e
+LANGTOOLS_CHANGESET = 5c2c81120555
+HOTSPOT_CHANGESET = 32c83fb84370
 
-OPENJDK_MD5SUM = 9f5e15067cf5207760a83cea8ba41da8
-CORBA_MD5SUM = 7f00e0b5d16046d116cd53c9f43c7122
-JAXP_MD5SUM = 2de0ec54014eb7f25c811e40fc2e3e3f
-JAXWS_MD5SUM = 9c0131755eefaa929ca8e47abe21cc58
-JDK_MD5SUM = 1fd637880521f3e2c274a1db8bfed89b
-LANGTOOLS_MD5SUM = e7c0ac7a9d67d361cc64fc15312d4a85
-HOTSPOT_MD5SUM = 18c922319545d7e907a2d6cbb265865d
+OPENJDK_MD5SUM = 01a2fe09452d8579fb251120e37dc45a
+CORBA_MD5SUM = 865e397135e2b9f8e4a256b4146b6852
+JAXP_MD5SUM = 008c8971c40aca1759dd0129a025f9b8
+JAXWS_MD5SUM = 86d18ba378cb83a2bd33b334c7bd610e
+JDK_MD5SUM = 68b034a7d0906a0f7b471e080b45407a
+LANGTOOLS_MD5SUM = 5ff432cec3ddf86ae5dbd147da1a7f92
+HOTSPOT_MD5SUM = a97947d03665b39b806ddcf2e48b9fc8
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -1567,6 +1567,7 @@
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
+	"ANT_RESPECT_JAVA_HOME=TRUE" \
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"DISTRIBUTION_ID=$(DIST_ID)" \
 	"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
@@ -2479,9 +2480,7 @@
 # Patch OpenJDK for ecj/gcj builds.
 ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
 	patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
-	patches/ecj/icedtea-spp.patch \
 	patches/ecj/icedtea-jopt.patch \
-	patches/ecj/icedtea-sbcs.patch \
 	patches/ecj/icedtea-dyn.patch
 
 if CP39408_JAVAH
@@ -2492,6 +2491,25 @@
 ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40188.patch
 endif
 
+if CP40616
+ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40616.patch
+endif
+
+# Patches for when java.util.Scanner is missing
+# or has the bug #40630 (all these classes rely
+# on Scanner#hasNextLine() looping behaviour)
+SCANNER_PATCHES = patches/ecj/icedtea-spp.patch \
+	patches/ecj/icedtea-sbcs.patch \
+	patches/ecj/icedtea-dbcs.patch
+
+if LACKS_JAVA_UTIL_SCANNER
+ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
+else
+if CP40630
+ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
+endif
+endif
+
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
 	mkdir -p stamps; \
 	rm -f stamps/patch-ecj.stamp.tmp ; \
--- a/acinclude.m4	Wed Jun 24 10:31:06 2009 +0200
+++ b/acinclude.m4	Thu Jul 09 16:43:16 2009 +0100
@@ -1561,3 +1561,104 @@
   AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir])
 fi
 ])
+
+AC_DEFUN([IT_LIBRARY_CHECK],[
+AC_CACHE_CHECK([if java.io.PrintStream is missing the 1.5 constructors (PR40616)], it_cv_cp40616, [
+CLASS=Test.java
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line __oline__ "configure" */
+public class Test 
+{
+  public static void main(String[] args)
+  throws Exception
+  {
+    new java.io.PrintStream(new java.io.File("bluh"), "UTF-8");
+  }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+  it_cv_cp40616=no;
+else
+  it_cv_cp40616=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([CP40616], test x"${it_cv_cp40616}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
+AC_DEFUN([IT_SCANNER_CHECK],[
+AC_CACHE_CHECK([if java.util.Scanner is missing], it_cv_cp30436, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line __oline__ "configure" */
+public class Test 
+{
+  public static void main(String[] args)
+  throws Exception
+  {
+    new java.util.Scanner("Hello");
+  }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+  if $JAVA -classpath . $BYTECODE 2>&1 | grep 'Exception'; then
+      it_cv_cp30436=yes;
+  else
+      it_cv_cp30436=no;
+  fi
+else
+  it_cv_cp30436=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([LACKS_JAVA_UTIL_SCANNER], test x"${it_cv_cp30436}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
+AC_DEFUN([IT_PR40630_CHECK],[
+if test "x${it_cv_cp30436}" = "xno"; then
+  AC_CACHE_CHECK([if java.util.Scanner exhibits Classpath bug 40630], it_cv_cp40630, [
+  CLASS=Test.java
+  mkdir tmp.$$
+  cd tmp.$$
+  cat << \EOF > $CLASS
+  /* [#]line __oline__ "configure" */
+public class Test 
+{
+  public static void main(String[] args)
+  throws Exception
+  {
+    Scanner s = new Scanner("Blah\nBlah\n\nBlah\n\n");
+    for (int i = 0; i < 5; ++i)
+      s.nextLine();
+    s.hasNextLine();
+  }
+}
+EOF
+  if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+    if $JAVA -classpath . $CLASS 2>&1 | grep 'Exception'; then
+      it_cv_cp40630=yes;
+    else
+      it_cv_cp40630=no;
+    fi
+  else
+    it_cv_cp40630=yes;
+  fi
+  ])
+  rm -f $CLASS *.class
+  cd ..
+  rmdir tmp.$$
+fi
+AM_CONDITIONAL([CP40630], test x"${it_cv_cp40630}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
--- a/configure.ac	Wed Jun 24 10:31:06 2009 +0200
+++ b/configure.ac	Thu Jul 09 16:43:16 2009 +0100
@@ -290,6 +290,9 @@
 fi
 fi
 IT_JAVAH
+IT_LIBRARY_CHECK
+IT_SCANNER_CHECK
+IT_PR40630_CHECK
 FIND_RHINO_JAR
 WITH_OPENJDK_SRC_ZIP
 WITH_HOTSPOT_SRC_ZIP
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-dbcs.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -0,0 +1,40 @@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	2009-07-08 18:00:55.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java	2009-07-08 23:45:44.000000000 +0100
+@@ -27,7 +27,6 @@
+ import java.io.*;
+ import java.util.Arrays;
+ import java.util.ArrayList;
+-import java.util.Scanner;
+ import java.util.Formatter;
+ import java.util.regex.*;
+ import java.nio.charset.*;
+@@ -38,9 +37,8 @@
+     static Pattern mPattern = Pattern.compile("(\\p{XDigit}++)\\s++(\\p{XDigit}++)(\\s++#.*)?");
+     public static void genDBCS(String args[]) throws Exception {
+ 
+-        Scanner s = new Scanner(new File(args[0], args[2]));
+-        while (s.hasNextLine()) {
+-            String line = s.nextLine();
++        BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2])));
++        for (String line = s.readLine(); line != null; line = s.readLine()) {
+             if (line.startsWith("#") || line.length() == 0)
+                 continue;
+             String[] fields = line.split("\\s+");
+@@ -239,14 +237,13 @@
+         String b2cNR = b2cNRSB.toString();
+         String c2bNR = c2bNRSB.toString();
+ 
+-        Scanner s = new Scanner(new File(srcDir, template));
++        BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
+         PrintStream out = new PrintStream(new FileOutputStream(
+                               new File(dstDir, clzName + ".java")));
+         if (hisName == null)
+             hisName = "";
+ 
+-        while (s.hasNextLine()) {
+-            String line = s.nextLine();
++        for (String line = s.readLine(); line != null; line = s.readLine()) {
+             if (line.indexOf("$") == -1) {
+                 out.println(line);
+                 continue;
--- a/patches/ecj/icedtea-sbcs.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/ecj/icedtea-sbcs.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-01-18 03:30:42.000000000 +0000
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-01-19 00:55:58.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-07-01 11:39:50.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java	2009-07-01 12:24:04.000000000 +0100
 @@ -27,7 +27,6 @@
  
  import java.io.*;
@@ -9,9 +9,9 @@
  import java.util.Formatter;
  import java.util.regex.*;
  import java.nio.charset.*;
-@@ -40,9 +39,8 @@
-             System.exit(1);
-         }
+@@ -37,9 +36,8 @@
+ 
+     public static void genSBCS(String args[]) throws Exception {
  
 -        Scanner s = new Scanner(new File(args[0], args[2]));
 -        while (s.hasNextLine()) {
@@ -21,7 +21,7 @@
              if (line.startsWith("#") || line.length() == 0)
                  continue;
              String[] fields = line.split("\\s+");
-@@ -201,12 +199,10 @@
+@@ -198,12 +196,10 @@
                                       int    c2blen)
          throws Exception
      {
--- a/patches/ecj/icedtea.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/ecj/icedtea.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
 --- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -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
@@ -12,7 +12,7 @@
  
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
 --- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2009-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -54,7 +54,7 @@
 +include $(BUILDDIR)/common/Classes.gmk
 diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
 --- openjdk-ecj.orig/corba/make/common/Defs.gmk	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -53,6 +53,13 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@
  vpath %.java $(VPATH.java)
  vpath %.class $(CLASSBINDIR)
 diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -276,7 +276,7 @@
  		    fi; \
  		  done)
@@ -101,7 +101,7 @@
  # We want to privatize JVM symbols on Solaris. This is so the user can
 diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
 --- openjdk-ecj.orig/corba/make/common/Rules.gmk	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -201,8 +201,10 @@
  	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
  	  $(CAT) $(JAVA_SOURCE_LIST); \
@@ -117,7 +117,7 @@
  
 diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
 --- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -120,31 +120,14 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -158,7 +158,7 @@
  ifdef JAVAC
 diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
 --- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -93,8 +93,6 @@
  POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
  
@@ -237,7 +237,7 @@
  
 diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
 --- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -172,7 +172,6 @@
  ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
  
@@ -255,8 +255,8 @@
  portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
  
 diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml	2009-06-15 14:57:04.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml	2009-06-15 17:21:10.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml	2009-06-30 14:24:48.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml	2009-07-01 13:55:31.000000000 +0100
 @@ -71,7 +71,10 @@
        <mkdir dir="${build.toolclasses.dir}"/>
        <javac srcdir="${make.tools.dir}/StripProperties"
@@ -269,22 +269,21 @@
        <taskdef name="pstrip"
  		 classname="StripPropertiesTask"
  		 classpath="${build.toolclasses.dir}/"/>
-@@ -86,7 +89,9 @@
-              memoryInitialSize="${javac.memoryInitialSize}"
+@@ -87,7 +90,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
+ 	     source="${javac.source}"
  	     debug="${javac.debug}"
 -             target="${javac.target}">
 +             target="${javac.target}"
-+             executable="${javac.executable}"
-+             source="1.5">
++             executable="${javac.executable}">
           <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
           <compilerarg line="${javac.version.opt}"/>
        </javac>
 diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile	2009-06-15 17:14:26.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile	2009-06-15 17:19:32.000000000 +0100
-@@ -84,7 +84,7 @@
- endif
+--- openjdk-ecj.orig/jaxp/make/Makefile	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile	2009-07-01 13:52:45.000000000 +0100
+@@ -92,7 +92,7 @@
+ endif 
  
  ifdef ALT_BOOTDIR
 -  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -293,9 +292,9 @@
  
  ifdef ALT_OUTPUTDIR
 diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties	2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties	2009-06-15 17:19:32.000000000 +0100
-@@ -36,7 +36,7 @@
+--- openjdk-ecj.orig/jaxws/make/build.properties	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties	2009-07-01 13:52:45.000000000 +0100
+@@ -37,7 +37,7 @@
  # set the following to -version to verify the versions of javac being used
  javac.version.opt = 
  # in time, there should be no exceptions to -Xlint:all
@@ -305,8 +304,8 @@
  # JVM memory size
  javac.memoryInitialSize = 128m
 diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml	2009-06-15 14:57:13.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml	2009-06-15 17:22:06.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml	2009-06-30 14:24:56.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml	2009-07-01 13:52:45.000000000 +0100
 @@ -93,7 +93,10 @@
        <mkdir dir="${build.toolclasses.dir}"/>
        <javac srcdir="${make.tools.dir}/StripProperties"
@@ -319,27 +318,19 @@
        <taskdef name="pstrip"
  		 classname="StripPropertiesTask"
  		 classpath="${build.toolclasses.dir}/"/>
-@@ -105,11 +108,14 @@
-       <javac fork="true"
-              srcdir="${src.classes.dir}"
-              destdir="${build.classes.dir}"
-+             executable="${javac.executable}"
-              memoryInitialSize="${javac.memoryInitialSize}"
-              memoryMaximumSize="${javac.memoryMaximumSize}"
+@@ -111,6 +114,7 @@
  	     debug="${javac.debug}"
               target="${javac.target}"
--             excludes="com/sun/tools/internal/txw2/**">
-+             excludes="com/sun/tools/internal/txw2/**"
-+ 	     source="1.5">
-+	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
+              excludes="com/sun/tools/internal/txw2/**">
++ 	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
           <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
           <compilerarg line="${javac.version.opt}"/>
           <compilerarg line="${javac.no.jdk.warnings}"/>
 diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile	2009-06-15 17:14:26.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile	2009-06-15 17:19:32.000000000 +0100
-@@ -84,8 +84,8 @@
- endif
+--- openjdk-ecj.orig/jaxws/make/Makefile	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile	2009-07-01 13:52:45.000000000 +0100
+@@ -92,8 +92,8 @@
+ endif 
  
  ifdef ALT_BOOTDIR
 -  ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
@@ -351,7 +342,7 @@
  ifdef ALT_OUTPUTDIR
 diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
 --- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -43,7 +43,8 @@
  	@$(prep-target)
  	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -363,9 +354,9 @@
  	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
  	    $(BOOT_JAR_JFLAGS) || $(RM) $@
 diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk	2009-06-15 17:14:31.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2009-06-15 17:19:32.000000000 +0100
-@@ -654,10 +654,23 @@
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk	2009-07-01 13:42:20.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk	2009-07-01 13:52:45.000000000 +0100
+@@ -652,10 +652,23 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -391,7 +382,7 @@
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -713,10 +726,18 @@
+@@ -711,10 +724,18 @@
  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -412,7 +403,7 @@
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier
-@@ -947,19 +968,6 @@
+@@ -945,19 +966,6 @@
  	@$(java-vm-cleanup)
  	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
  	@#
@@ -432,7 +423,7 @@
  	@# CORBA supported orb.idl and ir.idl should be copied to lib
  	@#
  	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1036,16 +1044,6 @@
+@@ -1034,16 +1042,6 @@
  	$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
  	$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
  	$(RM) -r $(JDK_IMAGE_DIR)/src
@@ -451,7 +442,7 @@
  endif # !windows
 diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
 --- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -237,8 +237,9 @@
  	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
  	  $(CAT) $<.filtered; \
@@ -478,9 +469,9 @@
  	@$(TOUCH) $@
  
 diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2009-06-15 17:19:32.000000000 +0100
-@@ -135,33 +135,22 @@
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2009-07-01 13:52:45.000000000 +0100
+@@ -136,33 +136,22 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
  # Needed for javah
@@ -516,8 +507,8 @@
  
  # Override of what javac to use (see deploy workspace)
 diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2009-06-15 17:14:31.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2009-07-01 13:42:19.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -31,7 +31,7 @@
  PACKAGE = java.nio
  LIBRARY = nio
@@ -529,7 +520,7 @@
  NIO_SRC = $(SHARE_SRC)/classes/java/nio
 diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
 --- openjdk-ecj.orig/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -81,8 +81,8 @@
  		-sourcepath $(TEXT_SRCDIR) \
  		$(TEXT_SOURCES)
@@ -543,7 +534,7 @@
  	@$(java-vm-cleanup)
 diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
 --- openjdk-ecj.orig/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -239,7 +239,7 @@
  
  all build:: sanity-all post-sanity-all
@@ -555,7 +546,7 @@
  
 diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk
 --- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -189,3 +189,5 @@
  	java/awt/dnd/DnDConstants.java \
  	sun/awt/CausedFocusEvent.java
@@ -564,7 +555,7 @@
 +    sun.java2d.opengl.OGLContext$$OGLContextCaps
 diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
 --- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -401,10 +401,9 @@
  COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
  
@@ -581,7 +572,7 @@
  fontconfigs.clean :
 diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
 --- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -62,7 +62,8 @@
  $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
  	$(RM) -r $(@D)
@@ -594,7 +585,7 @@
  $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
 diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
 --- openjdk-ecj.orig/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -85,8 +85,9 @@
  	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
  		-sourcepath $(TEXT_SRCDIR) \
@@ -608,8 +599,8 @@
  		-spec $(UNICODEDATA)/UnicodeData.txt \
  		-language th
 diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2009-06-15 17:14:31.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2009-07-01 13:42:21.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2009-07-01 13:52:45.000000000 +0100
 @@ -294,11 +294,7 @@
  
  TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -647,8 +638,8 @@
  	done
  	$(TOUCH) $@
 diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-06-15 17:13:39.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-07-01 13:41:38.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-07-01 13:52:45.000000000 +0100
 @@ -647,9 +647,6 @@
              throws FileNotFoundException, IOException {
          BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -668,8 +659,8 @@
                  if (plane == 0 && bLatin1 == false) {
              genCaseMapTableDeclaration(result);
 diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java	2009-06-15 17:13:27.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java	2009-07-01 13:41:25.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java	2009-07-01 13:52:45.000000000 +0100
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffffffffffP+1023} and also equal to
       * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -698,8 +689,8 @@
      /**
       * Maximum exponent a finite {@code double} variable may have.
 diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java	2009-06-15 17:13:27.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java	2009-07-01 13:41:26.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java	2009-07-01 13:52:45.000000000 +0100
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffeP+127f} and also equal to
       * {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -729,7 +720,7 @@
       * Maximum exponent a finite {@code float} variable may have.  It
 diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
 --- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-07-01 13:52:45.000000000 +0100
 @@ -27,6 +27,7 @@
  #define OGLContext_h_Included
  
@@ -794,45 +785,43 @@
  
  /**
   * Evaluates to true if the given capability bitmask is present for the
+diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
+--- openjdk-ecj.orig/langtools/make/build.properties	2009-07-01 13:54:20.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties	2009-07-01 13:54:36.000000000 +0100
+@@ -32,8 +32,8 @@
+ # boot.java.home = /opt/jdk/1.5.0 
+ boot.java = ${boot.java.home}/bin/java
+ boot.javac = ${boot.java.home}/bin/javac
+-boot.javac.source = 6
+-boot.javac.target = 6
++boot.javac.source = 5
++boot.javac.target = 5
+ 
+ # This is the JDK used to run the product version of the tools,
+ # for example, for testing. If you're building a complete JDK, specify that.
 diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml	2009-06-15 14:59:52.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml	2009-06-15 17:19:32.000000000 +0100
-@@ -509,7 +509,9 @@
-                        includes="@{includes}"
-                        sourcepath=""
+--- openjdk-ecj.orig/langtools/make/build.xml	2009-06-30 14:25:18.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml	2009-07-01 13:53:47.000000000 +0100
+@@ -516,6 +516,7 @@
                         includeAntRuntime="no"
--                       target="@{javac.target}">
-+                       target="@{javac.target}"
-+                       source="1.5">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+                        source="@{javac.source}"
+                        target="@{javac.target}">
++		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg line="${javac.version.opt}"/>
                      <compilerarg line="-Xlint"/>
-@@ -524,7 +526,9 @@
-                        includeAntRuntime="no"
+@@ -532,6 +533,7 @@
                         target="@{javac.target}"
                         debug="${javac.debug}" 
--                       debuglevel="${javac.debuglevel}">
-+                       debuglevel="${javac.debuglevel}"
-+                       source="1.5">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+                        debuglevel="${javac.debuglevel}">
++		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -578,7 +582,8 @@
-                executable="${boot.java.home}/bin/javac"
-                srcdir="${make.tools.dir}/CompileProperties"
-                destdir="${build.toolclasses.dir}/"
--               classpath="${ant.home}/lib/ant.jar"/>
-+               classpath="${ant.home}/lib/ant.jar"
-+	       source="1.5" />
-         <taskdef name="pcompile"
-                  classname="CompilePropertiesTask" 
-                  classpath="${build.toolclasses.dir}/"/>
 diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
---- openjdk-ecj.orig/langtools/make/Makefile	2009-06-15 17:14:26.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile	2009-06-15 17:19:32.000000000 +0100
-@@ -122,7 +122,7 @@
+--- openjdk-ecj.orig/langtools/make/Makefile	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile	2009-07-01 13:52:45.000000000 +0100
+@@ -130,7 +130,7 @@
  
  ifdef ALT_BOOTDIR
    ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
@@ -842,8 +831,8 @@
  
  ifdef ALT_OUTPUTDIR
 diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk	2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk	2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/make/jdk-rules.gmk	2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk	2009-07-01 13:52:45.000000000 +0100
 @@ -58,7 +58,7 @@
  endif
  
--- a/patches/hotspot/default/icedtea-shark.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/hotspot/default/icedtea-shark.patch	Thu Jul 09 16:43:16 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-06-10 18:05:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2009-07-01 11:02:39.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-06-10 18:05:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2009-07-01 11:02:39.000000000 +0100
 @@ -198,4 +198,5 @@
    // What kind of ciObject is this?
    bool is_instance_klass() { return true; }
@@ -16,8 +16,8 @@
 +
  };
 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-05-08 17:40:25.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp	2009-06-10 18:07:13.000000000 +0100
+--- 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
 @@ -56,9 +56,9 @@
    _liveness           = NULL;
    _bcea = NULL;
@@ -28,8 +28,8 @@
 -#endif // COMPILER2
 +#endif // COMPILER2 || SHARK
  
-   if (JvmtiExport::can_hotswap_or_post_breakpoint() && _is_compilable) {
-     // 6328518 check hotswap conditions under the right lock.
+   ciEnv *env = CURRENT_ENV;
+   if (env->jvmti_can_hotswap_or_post_breakpoint() && _is_compilable) {
 @@ -124,9 +124,9 @@
    _bcea = NULL;
    _method_blocks = 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-06-10 18:07:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp	2009-07-01 11:02:39.000000000 +0100
 @@ -69,7 +69,7 @@
  
    // Optional liveness analyzer.
@@ -126,7 +126,7 @@
  
 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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2009-07-01 11:02:39.000000000 +0100
 @@ -65,6 +65,11 @@
    assert(compiler() != NULL, "must be");
    return compiler()->is_c2();
@@ -166,7 +166,7 @@
    }
 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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.hpp	2009-07-01 11:02:39.000000000 +0100
 @@ -318,6 +318,7 @@
  
    bool is_compiled_by_c1() 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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2009-07-01 11:02:39.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-03-30 17:15:27.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2009-06-10 18:04:13.000000000 +0100
+--- 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
 @@ -554,6 +554,14 @@
  #endif
  #endif // COMPILER2
@@ -226,7 +226,7 @@
  
 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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2009-07-01 11:02:39.000000000 +0100
 @@ -44,6 +44,7 @@
    friend class VMStructs;
    friend class CardTableRS;
@@ -237,7 +237,7 @@
    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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp	2009-07-01 11:02:39.000000000 +0100
 @@ -738,10 +738,14 @@
    }
  
@@ -255,7 +255,7 @@
  
 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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp	2009-07-01 11:02:39.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-06-10 18:04:13.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp	2009-07-01 11:02:39.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-10 17:54:59.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2009-06-10 18:04:13.000000000 +0100
+--- 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
 @@ -22,7 +22,7 @@
   *
   */
@@ -375,8 +375,8 @@
  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-10 17:54:59.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2009-06-10 18:04:13.000000000 +0100
+--- 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"
--- a/patches/icedtea-libraries.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/icedtea-libraries.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -1,6 +1,6 @@
 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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-07-07 14:30:46.000000000 +0100
 @@ -75,12 +75,10 @@
  	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
@@ -33,7 +33,7 @@
  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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk	2009-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/common/Program.gmk	2009-07-07 14:30:46.000000000 +0100
 @@ -85,7 +85,7 @@
  	endif
      endif
@@ -53,7 +53,7 @@
  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-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile	2009-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/java/jli/Makefile	2009-07-07 14:30:46.000000000 +0100
 @@ -44,8 +44,6 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -105,7 +105,7 @@
 +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-05-11 18:53:32.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-07-07 14:30:46.000000000 +0100
 @@ -29,15 +29,4 @@
  	Deflater.c \
  	Inflater.c \
@@ -124,7 +124,7 @@
  	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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile	2009-07-07 14:30:46.000000000 +0100
 @@ -30,8 +30,6 @@
  PRODUCT = sun
  include $(BUILDDIR)/common/Defs.gmk
@@ -154,7 +154,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-07-07 14:30:46.000000000 +0100
 @@ -25,51 +25,7 @@
  
  FILES_c = \
@@ -210,7 +210,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile	2009-07-07 14:30:46.000000000 +0100
 @@ -67,6 +67,8 @@
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  include $(BUILDDIR)/common/Library.gmk
@@ -222,7 +222,7 @@
  #
 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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-07-07 14:30:46.000000000 +0100
 @@ -30,81 +30,5 @@
  	splashscreen_impl.c \
  	splashscreen_jpeg.c \
@@ -308,7 +308,7 @@
  
 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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-07-07 14:30:46.000000000 +0100
 @@ -59,12 +59,12 @@
  # C Flags
  #
@@ -341,7 +341,7 @@
  # 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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-07-07 14:30:46.000000000 +0100
 @@ -89,11 +89,7 @@
  // bytes and byte arrays
  
@@ -356,7 +356,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-07-07 14:30:46.000000000 +0100
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -368,7 +368,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-07-07 14:30:46.000000000 +0100
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -379,8 +379,8 @@
  #include "java_util_zip_CRC32.h"
  
 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-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-05-11 18:53:01.000000000 +0100
+--- 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-07 14:30:46.000000000 +0100
 @@ -32,7 +32,7 @@
  #include "jlong.h"
  #include "jni.h"
@@ -391,8 +391,8 @@
  #include "java_util_zip_Deflater.h"
  
 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-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-05-11 18:53:01.000000000 +0100
+--- 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-07 14:30:46.000000000 +0100
 @@ -35,7 +35,7 @@
  #include "jni.h"
  #include "jvm.h"
@@ -404,7 +404,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-05-08 16:10:59.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-07-07 14:30:46.000000000 +0100
 @@ -44,7 +44,8 @@
  #include "io_util.h"
  #include "io_util_md.h"
@@ -416,8 +416,8 @@
  /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
  #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-04-14 16:51:17.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-05-11 18:53:01.000000000 +0100
+--- 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-07 14:30:46.000000000 +0100
 @@ -51,7 +51,9 @@
  
  /* headers from the JPEG library */
@@ -629,7 +629,7 @@
          }
      }
  
-@@ -1924,7 +1984,7 @@
+@@ -1917,7 +1977,7 @@
                     TRUE);
      }
  
@@ -638,16 +638,16 @@
      if (progressive) {
          cinfo->buffered_image = TRUE;
          cinfo->input_scan_number = minProgressivePass+1; // Java count from 0
-@@ -1936,7 +1996,7 @@
+@@ -1929,7 +1989,7 @@
  
      data->streamBuf.suspendable = FALSE;
  
 -    jpeg_start_decompress(cinfo);
 +    jpegstartdecompress(cinfo);
  
-     // loop over progressive passes
-     done = FALSE;
-@@ -1944,7 +2004,7 @@
+     if (numBands !=  cinfo->output_components) {
+         JNU_ThrowByName(env, "javax/imageio/IIOException",
+@@ -1954,7 +2014,7 @@
          if (progressive) {
              // initialize the next pass.  Note that this skips up to
              // the first interesting pass.
@@ -656,7 +656,7 @@
              if (wantUpdates) {
                  (*env)->CallVoidMethod(env, this,
                                         JPEGImageReader_passStartedID,
-@@ -1960,7 +2020,7 @@
+@@ -1970,7 +2030,7 @@
          // Skip until the first interesting line
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -665,7 +665,7 @@
          }
  
          scanlineLimit = sourceYStart+sourceHeight;
-@@ -1973,7 +2033,7 @@
+@@ -1983,7 +2043,7 @@
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < scanlineLimit)) {
  
@@ -674,7 +674,7 @@
  
              // Now mangle it into our buffer
              out = data->pixelBuf.buf.bp;
-@@ -2021,13 +2081,13 @@
+@@ -2031,13 +2091,13 @@
                  skipLines = linesLeft;
              }
              for(i = 0; i < skipLines; i++) {
@@ -691,7 +691,7 @@
                  || (cinfo->input_scan_number > maxProgressivePass)) {
                  done = TRUE;
              }
-@@ -2047,9 +2107,9 @@
+@@ -2057,9 +2117,9 @@
      if (cinfo->output_scanline == cinfo->output_height) {
          //    if ((cinfo->output_scanline == cinfo->output_height) &&
          //(jpeg_input_complete(cinfo))) {  // We read the whole file
@@ -703,7 +703,7 @@
      }
  
      free(scanLinePtr);
-@@ -2095,7 +2155,7 @@
+@@ -2105,7 +2165,7 @@
  
      cinfo = (j_decompress_ptr) data->jpegObj;
  
@@ -712,7 +712,7 @@
  }
  
  
-@@ -2301,6 +2361,142 @@
+@@ -2311,6 +2371,142 @@
  
  /********************** end of destination manager ************/
  
@@ -855,7 +855,7 @@
  /********************** Writer JNI calls **********************/
  
  
-@@ -2312,6 +2508,8 @@
+@@ -2322,6 +2518,8 @@
       jclass qTableClass,
       jclass huffClass) {
  
@@ -864,7 +864,7 @@
      ImageOutputStream_writeID = (*env)->GetMethodID(env,
                                                      IOSClass,
                                                      "write",
-@@ -2385,7 +2583,7 @@
+@@ -2395,7 +2593,7 @@
      }
  
      /* We set up the normal JPEG error routines, then override error_exit. */
@@ -873,7 +873,7 @@
      jerr->pub.error_exit = sun_jpeg_error_exit;
      /* We need to setup our own print routines */
      jerr->pub.output_message = sun_jpeg_output_message;
-@@ -2402,7 +2600,7 @@
+@@ -2412,7 +2610,7 @@
      }
  
      /* Perform library initialization */
@@ -882,7 +882,7 @@
  
      /* Now set up the destination  */
      dest = malloc(sizeof(struct jpeg_destination_mgr));
-@@ -2511,7 +2709,7 @@
+@@ -2521,7 +2719,7 @@
          return;
      }
  
@@ -891,7 +891,7 @@
  
      data->streamBuf.suspendable = FALSE;
      if (qtables != NULL) {
-@@ -2526,7 +2724,7 @@
+@@ -2536,7 +2734,7 @@
                     DCHuffmanTables, ACHuffmanTables, TRUE);
      }
  
@@ -900,7 +900,7 @@
      RELEASE_ARRAYS(env, data, NULL);
  }
  
-@@ -2690,9 +2888,9 @@
+@@ -2700,9 +2898,9 @@
      cinfo->input_components = numBands;
      cinfo->in_color_space = inCs;
  
@@ -912,7 +912,7 @@
  
      cinfo->optimize_coding = optimize;
  
-@@ -2729,7 +2927,7 @@
+@@ -2739,7 +2937,7 @@
      (*env)->ReleaseIntArrayElements(env, QtableSelectors,
                                      qsels, JNI_ABORT);
  
@@ -921,7 +921,7 @@
  
      qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT);
  
-@@ -2754,7 +2952,7 @@
+@@ -2764,7 +2962,7 @@
  
      if (progressive) {
          if (numScans == 0) { // then use default scans
@@ -930,7 +930,7 @@
          } else {
              cinfo->num_scans = numScans;
              // Copy the scanInfo to a local array
-@@ -2796,7 +2994,7 @@
+@@ -2806,7 +3004,7 @@
  #endif
  
      // start the compressor; tables must already be set
@@ -939,7 +939,7 @@
  
      if (haveMetadata) {
          // Flush the buffer
-@@ -2857,7 +3055,7 @@
+@@ -2867,7 +3065,7 @@
              }
          }
          // write it out
@@ -948,7 +948,7 @@
          targetLine += stepY;
      }
  
-@@ -2866,9 +3064,9 @@
+@@ -2876,9 +3074,9 @@
       * so use jpeg_abort instead of jpeg_finish_compress.
       */
      if (cinfo->next_scanline == cinfo->image_height) {
@@ -20951,7 +20951,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c	2009-07-07 14:30:46.000000000 +0100
 @@ -45,7 +45,9 @@
  #undef boolean
  #undef FAR
@@ -25491,7 +25491,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2009-07-07 14:30:46.000000000 +0100
 @@ -26,7 +26,7 @@
  #include "splashscreen_impl.h"
  #include "splashscreen_gfx.h"
@@ -25503,7 +25503,7 @@
  #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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2009-07-07 14:30:46.000000000 +0100
 @@ -25,9 +25,8 @@
  
  #include "splashscreen_impl.h"
@@ -25535,7 +25535,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-05-11 18:53:01.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2009-07-07 14:30:46.000000000 +0100
 @@ -25,7 +25,7 @@
  
  #include "splashscreen_impl.h"
--- a/patches/icedtea-liveconnect.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/icedtea-liveconnect.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -1,10 +1,10 @@
 diff -Nru openjdk.orig/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile
---- openjdk.orig/jdk/make/sun/Makefile	2008-10-09 08:45:43.000000000 +0100
-+++ openjdk/jdk/make/sun/Makefile	2008-10-24 10:14:07.000000000 +0100
-@@ -63,7 +63,7 @@
+--- openjdk.orig/jdk/make/sun/Makefile	2009-06-30 14:05:45.000000000 +0100
++++ openjdk/jdk/make/sun/Makefile	2009-06-30 16:40:55.000000000 +0100
+@@ -64,7 +64,7 @@
            $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
  	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
- 	  jawt text nio launcher management $(ORG_SUBDIR) \
+ 	  jawt text launcher management $(ORG_SUBDIR) \
 -          native2ascii serialver tools jconsole tracing
 +          plugin native2ascii serialver tools jconsole tracing
  
@@ -12,7 +12,7 @@
  	$(SUBDIRS-loop)
 diff -Nru openjdk.orig/jdk/make/sun/plugin/Makefile openjdk/jdk/make/sun/plugin/Makefile
 --- openjdk.orig/jdk/make/sun/plugin/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/sun/plugin/Makefile	2008-10-24 10:13:32.000000000 +0100
++++ openjdk/jdk/make/sun/plugin/Makefile	2009-06-30 16:28:07.000000000 +0100
 @@ -0,0 +1,53 @@
 +#
 +# Copyright 1995-2005 Sun Microsystems, Inc.  All Rights Reserved.
--- a/patches/icedtea-webstart.patch	Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/icedtea-webstart.patch	Thu Jul 09 16:43:16 2009 +0100
@@ -1,17 +1,67 @@
-diff -c openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
---- openjdk.orig/jdk/make/launchers/Makefile	2008-06-29 09:45:56.000000000 -0400
-+++ openjdk/jdk/make/launchers/Makefile	2008-06-29 09:47:01.000000000 -0400
+diff -Nru openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
+--- openjdk.orig/jdk/make/launchers/Makefile	2009-06-30 14:05:45.000000000 +0100
++++ openjdk/jdk/make/launchers/Makefile	2009-06-30 17:09:40.000000000 +0100
 @@ -67,6 +67,7 @@
  $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
  $(call make-launcher, javah, com.sun.tools.javah.Main, , )
- $(call make-launcher, javap, sun.tools.javap.Main, , )
+ $(call make-launcher, javap, com.sun.tools.javap.Main, , )
 +$(call make-launcher, javaws, net.sourceforge.jnlp.runtime.Boot, , )
  $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
    -J-Djconsole.showOutputViewer, )
  $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-01-12 15:53:45.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-02-04 11:51:20.000000000 -0500
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-06-30 16:45:46.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2009-06-30 17:09:09.000000000 +0100
+@@ -67,7 +67,7 @@
+     /**
+      * The applet (if loaded).
+      */
+-    Applet applet;
++    protected Applet applet;
+ 
+     /**
+      * Applet will allow initialization.  Should be
+@@ -116,7 +116,7 @@
+     /**
+      * The thread for the applet.
+      */
+-    Thread handler;
++    protected Thread handler;
+ 
+ 
+     /**
+@@ -161,7 +161,8 @@
+      * Creates a thread to run the applet. This method is called
+      * each time an applet is loaded and reloaded.
+      */
+-    synchronized void createAppletThread() {
++	//Overridden by NetxPanel.
++    protected synchronized void createAppletThread() {
+         // Create a thread group for the applet, and start a new
+         // thread to load the applet.
+         String nm = "applet-" + getCode();
+@@ -305,7 +306,7 @@
+     /**
+      * Get an event from the queue.
+      */
+-    synchronized AppletEvent getNextEvent() throws InterruptedException {
++    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
+         while (queue == null || queue.isEmpty()) {
+             wait();
+         }
+@@ -694,7 +695,8 @@
+      * applet event processing so that it can be gracefully interrupted from
+      * things like HotJava.
+      */
+-    private void runLoader() {
++	//Overridden by NetxPanel.
++    protected void runLoader() {
+         if (status != APPLET_DISPOSE) {
+             showAppletStatus("notdisposed");
+             return;
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-06-30 16:45:46.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2009-06-30 17:09:09.000000000 +0100
 @@ -42,25 +42,25 @@
   *
   * @author      Arthur van Hoff
@@ -67,53 +117,3 @@
          if(debug) {
              t.printStackTrace();
              debug(s);
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-03-26 04:58:12.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-04-07 21:55:56.000000000 -0400
-@@ -68,7 +68,7 @@
-     /**
-      * The applet (if loaded).
-      */
--    Applet applet;
-+    protected Applet applet;
- 
-     /**
-      * Applet will allow initialization.  Should be
-@@ -117,7 +117,7 @@
-     /**
-      * The thread for the applet.
-      */
--    Thread handler;
-+    protected Thread handler;
- 
- 
-     /**
-@@ -162,7 +162,8 @@
-      * Creates a thread to run the applet. This method is called
-      * each time an applet is loaded and reloaded.
-      */
--    synchronized void createAppletThread() {
-+	//Overridden by NetxPanel.
-+    protected synchronized void createAppletThread() {
-         // Create a thread group for the applet, and start a new
-         // thread to load the applet.
-         String nm = "applet-" + getCode();
-@@ -306,7 +307,7 @@
-     /**
-      * Get an event from the queue.
-      */
--    synchronized AppletEvent getNextEvent() throws InterruptedException {
-+    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
-         while (queue == null || queue.isEmpty()) {
-             wait();
-         }
-@@ -695,7 +696,8 @@
-      * applet event processing so that it can be gracefully interrupted from
-      * things like HotJava.
-      */
--    private void runLoader() {
-+	//Overridden by NetxPanel.
-+    protected void runLoader() {
-         if (status != APPLET_DISPOSE) {
-             showAppletStatus("notdisposed");
-             return;