Mercurial > hg > release > icedtea-1.10
view patches/cacao/launcher.patch @ 1837:ecb875f82ef5
2009-05-26 Matthias Klose <doko@ubuntu.com>
* patches/cacao/launcher.patch: Update for OpenJDK 7.
author | doko@ubuntu.com |
---|---|
date | Tue, 26 May 2009 23:54:58 +0200 |
parents | f06356634030 |
children |
line wrap: on
line source
diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile --- openjdk.orig/jdk/make/docs/Makefile 2009-05-19 01:11:05.000000000 +0100 +++ openjdk/jdk/make/docs/Makefile 2009-05-20 20:17:49.000000000 +0100 @@ -36,7 +36,7 @@ ifeq ($(ARCH_DATA_MODEL),64) MAX_VM_MEMORY = 1024 else - MAX_VM_MEMORY = 512 + MAX_VM_MEMORY = 768 endif # --- 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; +#define JNI_VERSION_CACAO 0xcaca0000 + /* * Entry point. */ @@ -1875,6 +1877,8 @@ { /* Create a new thread to create JVM and invoke main method */ JavaMainArgs args; + struct JDK1_1InitArgs cacao_args; + int jvm_init_rv; int rslt; args.argc = argc; @@ -1883,7 +1887,17 @@ args.classname = classname; args.ifn = *ifn; - rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); + memset((void*)&cacao_args, 0, sizeof(cacao_args)); + cacao_args.version = JNI_VERSION_CACAO; + + 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); + else + return ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); + /* If the caller has deemed there is an error we * simply return that, otherwise we return the value of * the callee