/hg/icedtea6: Update CACAO to 1.1.0pre (mostly backports from ic...
doko at icedtea.classpath.org
doko at icedtea.classpath.org
Wed Jun 23 15:57:23 PDT 2010
changeset a4bc545c483a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4bc545c483a
author: doko at ubuntu.com
date: Thu Jun 24 00:56:40 2010 +0200
Update CACAO to 1.1.0pre (mostly backports from icedtea7).
Builds, not yet tested otherwise.
2010-06-24 Andrew John Hughes <ahughes at redhat.com>
Matthias Klose <doko at ubuntu.com>
* patches/cacao/no-strict-aliasing.patch: Remove, applied
upstream.
* patches/icedtea-cacao-no-mmap-first-page.patch: Likewise.
* patches/icedtea-cacao.patch: Remove, replaced by ...
* patches/cacao/launcher.patch: New.
* patches/cacao/memory.patch: Increase the memory used in the
langtools build when using CACAO.
* patches/cacao/arm-arch-defines.patch: Update.
* patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader
introduced by 6714758 and modified in 6864003.
http://server.complang.tuwien.ac.at/cgi-
bin/bugzilla/show_bug.cgi?id=137
* patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ...
* patches/cacao/ignore-tests.patch: New.
* patches/cacao/jsig.patch: Update.
* patches/cacao/package-version.diff: Drop 'preX' from the cacao
package version.
* patches/cacao/version.patch: Update
* Makefile.am (ICEDTEA_PATCHES): Add/remove patches. Use
Mercurial snapshot of CACAO 1.1.0pre.
diffstat:
15 files changed, 226 insertions(+), 162 deletions(-)
ChangeLog | 35 ++++++++++++++++
Makefile.am | 24 ++++++-----
patches/cacao/6714758.patch | 40 +++++++++++++++++++
patches/cacao/arm-arch-defines.patch | 14 +++---
patches/cacao/ignore-tests.patch | 11 +++++
patches/cacao/jsig.patch | 18 ++++++++
patches/cacao/launcher.patch | 50 ++++++++++++++++++++++++
patches/cacao/memory.patch | 18 ++++++++
patches/cacao/nio2.patch | 41 -------------------
patches/cacao/no-strict-aliasing.patch | 22 ----------
patches/cacao/package-version.diff | 11 +++++
patches/cacao/version.patch | 21 ++++++++++
patches/icedtea-cacao-ignore-tests.patch | 10 ----
patches/icedtea-cacao-no-mmap-first-page.patch | 23 -----------
patches/icedtea-cacao.patch | 50 ------------------------
diffs (489 lines):
diff -r da2ba8396450 -r a4bc545c483a ChangeLog
--- a/ChangeLog Tue Jun 22 19:14:32 2010 +0100
+++ b/ChangeLog Thu Jun 24 00:56:40 2010 +0200
@@ -1,3 +1,38 @@ 2010-06-22 Andrew John Hughes <ahughes
+2010-06-24 Andrew John Hughes <ahughes at redhat.com>
+ Matthias Klose <doko at ubuntu.com>
+
+ * patches/cacao/no-strict-aliasing.patch: Remove, applied upstream.
+ * patches/icedtea-cacao-no-mmap-first-page.patch: Likewise.
+ * patches/icedtea-cacao.patch: Remove, replaced by ...
+ * patches/cacao/launcher.patch: New.
+ * patches/cacao/memory.patch: Increase the memory used in the langtools
+ build when using CACAO.
+ * patches/cacao/arm-arch-defines.patch: Update.
+ * patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader
+ introduced by 6714758 and modified in 6864003.
+ http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137
+ * patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ...
+ * patches/cacao/ignore-tests.patch: New.
+ * patches/cacao/jsig.patch: Update.
+ * patches/cacao/package-version.diff: Drop 'preX' from the cacao
+ package version.
+ * patches/cacao/version.patch: Update
+ * Makefile.am (ICEDTEA_PATCHES): Add/remove patches.
+ Use Mercurial snapshot of CACAO 1.1.0pre.
+
+2010-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix issues with the CACAO build so it at
+ least builds again (though it still fails to
+ bootstrap).
+ * Makefile.am: Add new patches.
+ * patches/cacao/6714758.patch:
+ Add JVM_FindClassFromBootLoader introduced by
+ 6714758 and modified in 6864003.
+ http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137
+ * patches/cacao/jsig.patch:
+ Place fake libjsig.so in correct location for HotSpot 17+.
+
2010-06-22 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
diff -r da2ba8396450 -r a4bc545c483a Makefile.am
--- a/Makefile.am Tue Jun 22 19:14:32 2010 +0100
+++ b/Makefile.am Thu Jun 24 00:56:40 2010 +0200
@@ -5,10 +5,10 @@ OPENJDK_VERSION = b20
OPENJDK_VERSION = b20
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-CACAO_VERSION = 0.99.4
-CACAO_MD5SUM = c5e6525c5212ddbb6026e4a7cde37ca6
-CACAO_BASE_URL = http://www.complang.tuwien.ac.at
-CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
+CACAO_VERSION = 8948a434c10d
+CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412
+CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2
+CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2
NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/
@@ -180,8 +180,8 @@ endif
ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)"
if WITH_CACAO
- ICEDTEA_BUILD_TARGET=j2se_only
- ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only
+ ICEDTEA_BUILD_TARGET=jdk_only
+ ICEDTEA_DEBUG_BUILD_TARGET += jdk_fastdebug_only
else
ICEDTEA_DEBUG_BUILD_TARGET += debug_build
endif
@@ -327,10 +327,13 @@ endif
if BUILD_CACAO
ICEDTEA_PATCHES += \
- patches/icedtea-cacao.patch \
- patches/icedtea-cacao-no-mmap-first-page.patch \
- patches/cacao/no-strict-aliasing.patch \
- patches/cacao/arm-arch-defines.patch
+ patches/cacao/launcher.patch \
+ patches/cacao/version.patch \
+ patches/cacao/arm-arch-defines.patch \
+ patches/cacao/jsig.patch \
+ patches/cacao/6714758.patch \
+ patches/cacao/memory.patch \
+ patches/cacao/package-version.diff
if ENABLE_NIO2
ICEDTEA_PATCHES += patches/cacao/nio2.patch
endif
@@ -1779,6 +1782,7 @@ if BUILD_CACAO
if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
+ ./autogen.sh && \
$(ARCH_PREFIX) ./configure \
--host=$(host_alias) \
--build=$(build_alias) \
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/6714758.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/6714758.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,40 @@
+diff -Nru cacao.orig/cacao/contrib/mapfile-vers-product cacao/cacao/contrib/mapfile-vers-product
+--- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100
+@@ -86,6 +86,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
++ JVM_FindClassFromBootLoader;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindLibraryEntry;
+diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp cacao/cacao/src/native/vm/openjdk/jvm.cpp
+--- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
+@@ -668,6 +668,9 @@
+
+ assert(throwError == false);
+
++ if (name == NULL)
++ return NULL;
++
+ u = utf_new_char(name);
+ cl = loader_hashtable_classloader_add((java_handle_t *) loader);
+
+@@ -685,6 +688,15 @@
+ }
+
+
++/* JVM_FindClassFromBootLoader */
++
++jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name)
++{
++ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name));
++ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE,
++ (jobject)NULL, false);
++}
++
+ /* JVM_FindClassFromClass */
+
+ jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from)
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch Tue Jun 22 19:14:32 2010 +0100
+++ b/patches/cacao/arm-arch-defines.patch Thu Jun 24 00:56:40 2010 +0200
@@ -1,5 +1,6 @@
---- cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h~ 2008-08-04 18:51:12.000000000 +0200
-+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2009-12-15 16:28:12.000000000 +0100
+diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
+--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100
@@ -33,7 +33,13 @@
/* NEC LE-IT: gcc has no way to easily check the arm architecture
@@ -15,11 +16,12 @@
AO_INLINE void
AO_nop_full()
{
---- cacao/cacao/src/vm/jit/arm/md-atomic.hpp~ 2008-08-04 16:51:28.000000000 +0000
-+++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2009-12-16 06:40:37.000000000 +0000
-@@ -44,26 +44,7 @@
+diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp
+--- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100
+@@ -45,26 +45,7 @@
*/
- inline static uint32_t Atomic_compare_and_swap_32(volatile uint32_t *p, uint32_t oldval, uint32_t newval)
+ inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval)
{
- uint32_t result;
- uint32_t temp;
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/ignore-tests.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/ignore-tests.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,11 @@
+diff -Nru openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
+--- openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 15:04:14.000000000 +0100
++++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 23:42:41.000000000 +0100
+@@ -37,6 +37,7 @@
+ * @compile ProducerConsumerLoops.java
+ * @run main/timeout=3600 ProducerConsumerLoops
+ * @summary multiple producers and consumers using blocking queues
++ * @ignore cacao test hog, ignore for the sake of buildds
+ */
+
+ import java.util.concurrent.*;
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/jsig.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/jsig.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,18 @@
+diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
+--- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100
++++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100
+@@ -96,12 +96,12 @@
+ $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
+ $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
+ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
++ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+
+ uninstall-local:
+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
++ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+ endif
+
+
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/launcher.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/launcher.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,50 @@
+--- openjdk/jdk/make/docs/Makefile.orig 2010-06-21 21:15:08.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile 2010-06-23 18:35:55.529822335 +0000
+@@ -70,7 +70,7 @@
+ ifeq ($(ARCH_DATA_MODEL),64)
+ MAX_VM_MEMORY = 1024
+ else
+- MAX_VM_MEMORY = 512
++ MAX_VM_MEMORY = 768
+ endif
+
+ # List of all possible directories for javadoc to look for sources
+--- openjdk/jdk/src/share/bin/java.c.orig 2010-06-23 18:32:51.889824337 +0000
++++ openjdk/jdk/src/share/bin/java.c 2010-06-23 18:35:55.529822335 +0000
+@@ -199,6 +199,8 @@
+ InvocationFunctions ifn;
+ };
+
++#define JNI_VERSION_CACAO 0xcaca0000
++
+ /*
+ * Entry point.
+ */
+@@ -387,6 +389,8 @@
+
+ { /* Create a new thread to create JVM and invoke main method */
+ struct JavaMainArgs args;
++ struct JDK1_1InitArgs cacao_args;
++ int jvm_init_rv;
+
+ args.argc = argc;
+ args.argv = argv;
+@@ -394,7 +398,17 @@
+ args.classname = classname;
+ args.ifn = ifn;
+
+- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
++ 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");
++
++ if (jvm_init_rv == 0)
++ return JavaMain((void*)&args);
++ else
++ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
+ }
+ }
+
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/memory.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/memory.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,18 @@
+--- openjdk/langtools/make/build.xml~ 2010-06-21 23:16:19.000000000 +0200
++++ openjdk/langtools/make/build.xml 2010-06-23 20:51:31.649822343 +0200
+@@ -524,6 +524,7 @@
+ source="@{javac.source}"
+ target="@{javac.target}">
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
++ <compilerarg value="-J-Xmx256M"/>
+ <compilerarg line="${javac.version.opt}"/>
+ <compilerarg line="-Xlint"/>
+ </javac>
+@@ -541,6 +542,7 @@
+ debuglevel="${javac.debuglevel}">
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+ <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
++ <compilerarg value="-J-Xmx256M"/>
+ <compilerarg line="${javac.no.jdk.warnings}"/>
+ <compilerarg line="${javac.version.opt}"/>
+ <compilerarg line="${javac.lint.opts}"/>
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/nio2.patch
--- a/patches/cacao/nio2.patch Tue Jun 22 19:14:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
---- cacao/cacao/src/native/vm/sun_misc_Unsafe.c.orig 2010-01-11 16:20:51.000000000 +0000
-+++ cacao/cacao/src/native/vm/sun_misc_Unsafe.c 2010-01-11 16:22:15.000000000 +0000
-@@ -107,9 +107,10 @@
- #if 0
- /* OpenJDK 7 */
- { "setMemory", "(Ljava/lang/Object;JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory },
-+#endif
- { "copyMemory", "(Ljava/lang/Object;JLjava/lang/Object;JJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory },
--#else
- { "setMemory", "(JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory },
-+#if 0
- { "copyMemory", "(JJJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory },
- #endif
- { "freeMemory", "(J)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_freeMemory },
-@@ -786,7 +787,7 @@
-
- system_memset(p, value, length);
- }
--
-+#endif
-
- /*
- * Class: sun/misc/Unsafe
-@@ -816,7 +817,7 @@
-
- system_memcpy(dest, src, length);
- }
--#else
-+
- /*
- * Class: sun/misc/Unsafe
- * Method: setMemory
-@@ -841,7 +842,7 @@
- system_memset(p, value, length);
- }
-
--
-+#if 0
- /*
- * Class: sun/misc/Unsafe
- * Method: copyMemory
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/no-strict-aliasing.patch
--- a/patches/cacao/no-strict-aliasing.patch Tue Jun 22 19:14:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-diff -Nru cacao/cacao.orig/configure cacao/cacao/configure
---- cacao/cacao.orig/configure 2009-03-16 11:44:25.000000000 +0000
-+++ cacao/cacao/configure 2010-01-09 00:10:59.000000000 +0000
-@@ -2829,6 +2829,7 @@
- else
- OPT_CFLAGS=$CFLAGS
- fi
-+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
-
- case "$host_cpu" in
- alpha | alphaev56 | alphapca56 )
-diff -Nru cacao/cacao.orig/configure.ac cacao/cacao/configure.ac
---- cacao/cacao.orig/configure.ac 2009-03-16 11:42:56.000000000 +0000
-+++ cacao/cacao/configure.ac 2010-01-09 00:11:06.000000000 +0000
-@@ -41,6 +41,7 @@
- else
- OPT_CFLAGS=$CFLAGS
- fi
-+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
-
- dnl system type
- case "$host_cpu" in
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/package-version.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/package-version.diff Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,11 @@
+--- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200
++++ cacao/cacao/m4/version.m4 2010-06-23 21:00:36.739828757 +0200
+@@ -24,7 +24,7 @@
+ dnl define detailed version numbers
+
+ AC_DEFUN([AC_VERSION_DETAIL],[
+-version="$PACKAGE_VERSION"
++version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//')
+ if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x..";
+ then
+ major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
diff -r da2ba8396450 -r a4bc545c483a patches/cacao/version.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/version.patch Thu Jun 24 00:56:40 2010 +0200
@@ -0,0 +1,21 @@
+diff -Nru cacao.orig2/cacao/src/vm/global.h cacao2/cacao/src/vm/global.h
+--- cacao.orig/cacao/src/vm/global.h 2009-08-05 01:12:02.000000000 +0100
++++ cacao/cacao/src/vm/global.h 2009-08-05 01:51:01.000000000 +0100
+@@ -132,14 +132,14 @@
+
+ /* some Java related defines **************************************************/
+
+-#define JAVA_VERSION "1.5.0" /* this version is supported by CACAO */
+-#define CLASS_VERSION "50.0"
++#define JAVA_VERSION "1.6.0" /* this version is supported by CACAO */
++#define CLASS_VERSION "51.0"
+
+
+ /* Java class file constants **************************************************/
+
+ #define MAGIC 0xCAFEBABE
+-#define MAJOR_VERSION 50
++#define MAJOR_VERSION 51
+ #define MINOR_VERSION 0
+
+
diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao-ignore-tests.patch
--- a/patches/icedtea-cacao-ignore-tests.patch Tue Jun 22 19:14:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java~ 2008-08-28 10:20:49.000000000 +0200
-+++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2008-10-19 17:02:41.000000000 +0200
-@@ -37,6 +37,7 @@
- * @compile -source 1.5 ProducerConsumerLoops.java
- * @run main/timeout=3600 ProducerConsumerLoops
- * @summary multiple producers and consumers using blocking queues
-+ * @ignore cacao test hog, ignore for the sake of buildds
- */
-
- import java.util.concurrent.*;
diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao-no-mmap-first-page.patch
--- a/patches/icedtea-cacao-no-mmap-first-page.patch Tue Jun 22 19:14:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- cacao/cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200
-+++ cacao/cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200
-@@ -59,20 +59,6 @@
- */
- void trap_init(void)
- {
--#if !(defined(__ARM__) && defined(__LINUX__))
-- /* On arm-linux the first memory page can't be mmap'ed, as it
-- contains the exception vectors. */
--
-- int pagesize;
--
-- /* mmap a memory page at address 0x0, so our hardware-exceptions
-- work. */
--
-- pagesize = system_getpagesize();
--
-- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED);
--#endif
--
- TRACESUBSYSTEMINITIALIZATION("trap_init");
-
- #if !defined(TRAP_INSTRUCTION_IS_LOAD)
diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao.patch
--- a/patches/icedtea-cacao.patch Tue Jun 22 19:14:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
---- openjdk/jdk/src/share/bin/java.c.orig 2009-03-02 23:21:31.000000000 +0000
-+++ openjdk/jdk/src/share/bin/java.c 2009-03-02 23:23:53.000000000 +0000
-@@ -199,6 +199,8 @@
- InvocationFunctions ifn;
- };
-
-+#define JNI_VERSION_CACAO 0xcaca0000
-+
- /*
- * Entry point.
- */
-@@ -360,6 +389,8 @@
-
- { /* Create a new thread to create JVM and invoke main method */
- struct JavaMainArgs args;
-+ struct JDK1_1InitArgs cacao_args;
-+ int jvm_init_rv;
-
- args.argc = argc;
- args.argv = argv;
-@@ -367,7 +398,17 @@
- args.classname = classname;
- args.ifn = ifn;
-
-- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
-+ 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");
-+
-+ if (jvm_init_rv == 0)
-+ return JavaMain((void*)&args);
-+ else
-+ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
- }
- }
-
---- openjdk/jdk/make/docs/Makefile~ 2008-05-30 09:50:36.000000000 +0200
-+++ openjdk/jdk/make/docs/Makefile 2008-07-02 14:26:54.306671792 +0200
-@@ -58,7 +58,7 @@
- ifeq ($(ARCH_DATA_MODEL),64)
- MAX_VM_MEMORY = 1024
- else
-- MAX_VM_MEMORY = 512
-+ MAX_VM_MEMORY = 768
- endif
-
- #
More information about the distro-pkg-dev
mailing list