changeset in /hg/icedtea: 2009-05-26 Matthias Klose <doko at ubun...

[doko at ubuntu.com]

changeset ecb875f82ef5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ecb875f82ef5
description:
	2009-05-26  Matthias Klose  <doko at ubuntu.com>

	        * patches/cacao/launcher.patch: Update for OpenJDK 7.

diffstat:

2 files changed, 10 insertions(+), 8 deletions(-)
ChangeLog                    |    4 ++++
patches/cacao/launcher.patch |   14 ++++++--------

diffs (56 lines):

diff -r 51313371451a -r ecb875f82ef5 ChangeLog
--- a/ChangeLog	Mon May 25 00:26:26 2009 +0200
+++ b/ChangeLog	Tue May 26 23:54:58 2009 +0200
@@ -1,3 +1,7 @@ 2009-05-24  Mark Wielaard  <mark at klomp.o
+2009-05-26  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/cacao/launcher.patch: Update for OpenJDK 7.
+
 2009-05-24  Mark Wielaard  <mark at klomp.org>
 
 	* patches/xrender/icedtea-001.patch: Initialize X11SurfaceData
diff -r 51313371451a -r ecb875f82ef5 patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch	Mon May 25 00:26:26 2009 +0200
+++ b/patches/cacao/launcher.patch	Tue May 26 23:54:58 2009 +0200
@@ -10,9 +10,8 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak
  endif
  
  #
-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	2009-05-19 01:11:05.000000000 +0100
-+++ openjdk/jdk/src/share/bin/java.c	2009-05-20 20:22:14.000000000 +0100
+--- openjdk/jdk/src/share/bin/java.c.orig	2009-05-26 21:16:09.000000000 +0000
++++ openjdk/jdk/src/share/bin/java.c	2009-05-26 21:29:41.000000000 +0000
 @@ -175,6 +175,8 @@
    InvocationFunctions ifn;
  } JavaMainArgs;
@@ -22,7 +21,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin
  /*
   * Entry point.
   */
-@@ -1871,6 +1873,8 @@
+@@ -1875,6 +1877,8 @@
  
      { /* Create a new thread to create JVM and invoke main method */
        JavaMainArgs args;
@@ -31,7 +30,7 @@ diff -Nru openjdk.orig/jdk/src/share/bin
        int rslt;
  
        args.argc = argc;
-@@ -1879,7 +1883,18 @@
+@@ -1883,7 +1887,17 @@
        args.classname = classname;
        args.ifn = *ifn;
  
@@ -39,9 +38,8 @@ diff -Nru openjdk.orig/jdk/src/share/bin
 +      memset((void*)&cacao_args, 0, sizeof(cacao_args));
 +      cacao_args.version = JNI_VERSION_CACAO;
 +
-+      jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args);
-+      if (_launcher_debug)
-+          printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no");
++      jvm_init_rv = ifn->GetDefaultJavaVMInitArgs(&cacao_args);
++      JLI_TraceLauncher("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no");
 +
 +      if (jvm_init_rv == 0)
 +          return JavaMain((void*)&args);