Mercurial > hg > release > icedtea-1.9
view patches/cacao/launcher.patch @ 1765:9adee4a3a8d1
Fix CACAO build.
2009-03-19 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-cacao-ignore-jdi-tests.patch:
Removed; replaced by exclude list.
* patches/icedtea-cacao-ignore-tests.patch,
* patches/icedtea-cacao.patch:
Moved to cacao subdirectory.
* Makefile.am:
Bump CACAO to 0.99.4, fix CACAO for OpenJDK7,
update target to jdk_only.
* patches/cacao/ignore-tests.patch: Moved.
* patches/cacao/launcher.patch: Updated.
* patches/cacao/openjdk7.patch: Fix CACAO 0.99.4
to work with OpenJDK7.
* test/jtreg/excludelist.jdk.cacao.jtx:
Replacement exclude list for CACAO JDI tests.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 19 Mar 2009 19:36:15 +0000 |
| parents | patches/icedtea-cacao.patch@caf1f4959def |
| 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-03-19 16:10:56.000000000 +0000 +++ openjdk/jdk/make/docs/Makefile 2009-03-19 16:12:59.000000000 +0000 @@ -36,7 +36,7 @@ ifeq ($(ARCH_DATA_MODEL),64) MAX_VM_MEMORY = 1024 else - MAX_VM_MEMORY = 512 + MAX_VM_MEMORY = 768 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-03-19 16:10:56.000000000 +0000 +++ openjdk/jdk/src/share/bin/java.c 2009-03-19 16:18:16.000000000 +0000 @@ -1873,7 +1873,8 @@ args.classname = classname; args.ifn = *ifn; - rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); + /*rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);*/ + rslt = JavaMain((void*)&args); /* If the caller has deemed there is an error we * simply return that, otherwise we return the value of * the callee