/hg/icedtea7: Regenerate conditional patches.

[andrew at icedtea.classpath.org]

changeset 3aba3623d5af in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3aba3623d5af
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Mar 23 10:34:40 2012 +0000

	Regenerate conditional patches.

	2012-03-23  Andrew John Hughes  <ahughes at redhat.com>

		* patches/boot/pr39408.patch,
		* patches/cacao/launcher.patch:
		Regenerated.


diffstat:

 ChangeLog                    |   6 ++++++
 patches/boot/pr39408.patch   |  12 ++++++------
 patches/cacao/launcher.patch |  20 +++++++++++---------
 3 files changed, 23 insertions(+), 15 deletions(-)

diffs (90 lines):

diff -r 5e302f2e45eb -r 3aba3623d5af ChangeLog
--- a/ChangeLog	Thu Mar 22 15:52:54 2012 +0000
+++ b/ChangeLog	Fri Mar 23 10:34:40 2012 +0000
@@ -1,3 +1,9 @@
+2012-03-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/boot/pr39408.patch,
+	* patches/cacao/launcher.patch:
+	Regenerated.
+
 2012-03-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/systemtap-alloc-size-workaround.patch:
diff -r 5e302f2e45eb -r 3aba3623d5af patches/boot/pr39408.patch
--- a/patches/boot/pr39408.patch	Thu Mar 22 15:52:54 2012 +0000
+++ b/patches/boot/pr39408.patch	Fri Mar 23 10:34:40 2012 +0000
@@ -1,9 +1,9 @@
 diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
---- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2009-03-18 16:25:52.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2009-03-18 16:27:03.000000000 +0000
-@@ -36,6 +36,14 @@
- #include "nio.h"
- #include "nio_util.h"
+--- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	2012-03-23 10:31:52.798787906 +0000
+@@ -55,6 +55,14 @@
+ static int preCloseFD = -1;     /* File descriptor to which we dup other fd's
+                                    before closing them for real */
  
 +#undef sun_nio_ch_FileDispatcher_NO_LOCK
 +#define sun_nio_ch_FileDispatcher_NO_LOCK -1L
@@ -14,5 +14,5 @@
 +#undef sun_nio_ch_FileDispatcher_INTERRUPTED
 +#define sun_nio_ch_FileDispatcher_INTERRUPTED 2L
  
- static int preCloseFD = -1;     /* File descriptor to which we dup other fd's
-                                    before closing them for real */
+ JNIEXPORT void JNICALL
+ Java_sun_nio_ch_FileDispatcherImpl_init(JNIEnv *env, jclass cl)
diff -r 5e302f2e45eb -r 3aba3623d5af patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch	Thu Mar 22 15:52:54 2012 +0000
+++ b/patches/cacao/launcher.patch	Fri Mar 23 10:34:40 2012 +0000
@@ -1,7 +1,8 @@
---- openjdk/jdk/make/docs/Makefile.orig	2010-08-27 20:01:53.000000000 +0200
-+++ openjdk/jdk/make/docs/Makefile	2010-09-07 12:56:00.309691118 +0200
-@@ -70,7 +70,7 @@
- ifeq ($(ARCH_DATA_MODEL),64)
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile	2012-03-21 17:09:55.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile	2012-03-23 00:46:49.461847958 +0000
+@@ -73,7 +73,7 @@
+ else ifeq ($(ARCH),universal)
    MAX_VM_MEMORY = 1024
  else
 -  MAX_VM_MEMORY = 512
@@ -9,18 +10,19 @@
  endif
  
  # List of all possible directories for javadoc to look for sources
---- openjdk/jdk/src/share/bin/java.c.orig	2010-09-07 05:24:49.307192201 +0200
-+++ openjdk/jdk/src/share/bin/java.c	2010-09-07 12:56:00.309691118 +0200
-@@ -174,6 +174,8 @@
-   InvocationFunctions ifn;
- } JavaMainArgs;
+diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
+--- openjdk.orig/jdk/src/share/bin/java.c	2012-03-21 17:09:55.000000000 +0000
++++ openjdk/jdk/src/share/bin/java.c	2012-03-23 00:46:49.461847958 +0000
+@@ -164,6 +164,8 @@
+ static jlong maxHeapSize        = 0;  /* max heap size */
+ static jlong initialHeapSize    = 0;  /* inital heap size */
  
 +#define JNI_VERSION_CACAO 0xcaca0000
 +
  /*
   * Entry point.
   */
-@@ -1923,6 +1925,8 @@
+@@ -1848,6 +1850,8 @@
  
      { /* Create a new thread to create JVM and invoke main method */
        JavaMainArgs args;
@@ -29,7 +31,7 @@
        int rslt;
  
        args.argc = argc;
-@@ -1931,7 +1935,17 @@
+@@ -1856,7 +1860,17 @@
        args.what = what;
        args.ifn = *ifn;