/hg/icedtea: Use a Mercurial snapshot of CACAO 1.1.0pre rather t...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 21 13:38:51 PDT 2010
changeset c829a9d16fa0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c829a9d16fa0
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 21 21:38:43 2010 +0100
Use a Mercurial snapshot of CACAO 1.1.0pre rather than 0.99.4.
2010-06-21 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/native-resolve.patch,
* patches/cacao/no-mmap-first-page.patch,
* patches/cacao/no-strict-aliasing.patch,
* patches/cacao/openjdk7.patch,
* patches/cacao/versioninfo.patch,
* patches/cacao/xxoption-warning.patch: Dropped, either
upstreamed or redundant.
* Makefile.am: Use Mercurial snapshot of CACAO 1.1.0pre.
Drop unneeded patches.
* patches/cacao/6714758.patch: Drop Makefile.in fragment as
CACAO from hg needs the autotools to be run.
* patches/cacao/arm-arch-defines.patch,
* patches/cacao/jsig.patch: Recreated against hg snapshot of
CACAO.
diffstat:
11 files changed, 48 insertions(+), 368 deletions(-)
ChangeLog | 19 ++++
Makefile.am | 15 +--
patches/cacao/6714758.patch | 31 +++---
patches/cacao/arm-arch-defines.patch | 14 +--
patches/cacao/jsig.patch | 18 ----
patches/cacao/native-resolve.patch | 143 --------------------------------
patches/cacao/no-mmap-first-page.patch | 23 -----
patches/cacao/no-strict-aliasing.patch | 22 ----
patches/cacao/openjdk7.patch | 86 -------------------
patches/cacao/versioninfo.patch | 24 -----
patches/cacao/xxoption-warning.patch | 21 ----
diffs (truncated from 512 to 500 lines):
diff -r 4fed9f38e501 -r c829a9d16fa0 ChangeLog
--- a/ChangeLog Tue Jun 15 18:34:45 2010 +0100
+++ b/ChangeLog Mon Jun 21 21:38:43 2010 +0100
@@ -1,3 +1,22 @@ 2010-06-14 Andrew John Hughes <ahughes@
+2010-06-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/native-resolve.patch,
+ * patches/cacao/no-mmap-first-page.patch,
+ * patches/cacao/no-strict-aliasing.patch,
+ * patches/cacao/openjdk7.patch,
+ * patches/cacao/versioninfo.patch,
+ * patches/cacao/xxoption-warning.patch:
+ Dropped, either upstreamed or redundant.
+ * Makefile.am:
+ Use Mercurial snapshot of CACAO 1.1.0pre.
+ Drop unneeded patches.
+ * patches/cacao/6714758.patch:
+ Drop Makefile.in fragment as CACAO from hg
+ needs the autotools to be run.
+ * patches/cacao/arm-arch-defines.patch,
+ * patches/cacao/jsig.patch:
+ Recreated against hg snapshot of CACAO.
+
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
Don't print out the return value of pthread_self
diff -r 4fed9f38e501 -r c829a9d16fa0 Makefile.am
--- a/Makefile.am Tue Jun 15 18:34:45 2010 +0100
+++ b/Makefile.am Mon Jun 21 21:38:43 2010 +0100
@@ -18,10 +18,10 @@ LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d
LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8
OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f
-CACAO_VERSION = 0.99.4
-CACAO_SHA256SUM = 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56
-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
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/
@@ -339,13 +339,7 @@ if BUILD_CACAO
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/no-mmap-first-page.patch \
- patches/cacao/native-resolve.patch \
- patches/cacao/xxoption-warning.patch \
- patches/cacao/no-strict-aliasing.patch \
- patches/cacao/openjdk7.patch \
patches/cacao/version.patch \
- patches/cacao/versioninfo.patch \
patches/cacao/arm-arch-defines.patch \
patches/cacao/jsig.patch \
patches/cacao/6714758.patch
@@ -2332,6 +2326,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 4fed9f38e501 -r c829a9d16fa0 patches/cacao/6714758.patch
--- a/patches/cacao/6714758.patch Tue Jun 15 18:34:45 2010 +0100
+++ b/patches/cacao/6714758.patch Mon Jun 21 21:38:43 2010 +0100
@@ -1,7 +1,18 @@ diff -Nru cacao.orig/cacao/src/native/vm
-diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.c cacao/cacao/src/native/vm/openjdk/jvm.c
---- cacao.orig/cacao/src/native/vm/openjdk/jvm.c 2010-05-11 12:19:23.000000000 +0100
-+++ cacao/cacao/src/native/vm/openjdk/jvm.c 2010-05-11 12:19:47.000000000 +0100
-@@ -792,6 +792,9 @@
+diff -Nru cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product
+--- cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao-8948a434c10d/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-8948a434c10d/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp
+--- cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
+@@ -668,6 +668,9 @@
assert(throwError == false);
@@ -11,7 +22,7 @@ diff -Nru cacao.orig/cacao/src/native/vm
u = utf_new_char(name);
cl = loader_hashtable_classloader_add((java_handle_t *) loader);
-@@ -809,6 +812,15 @@
+@@ -685,6 +688,15 @@
}
@@ -27,13 +38,3 @@ diff -Nru cacao.orig/cacao/src/native/vm
/* JVM_FindClassFromClass */
jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from)
---- cacao.orig/cacao/contrib/mapfile-vers-product 2008-08-04 17:51:28.000000000 +0100
-+++ cacao/cacao/contrib/mapfile-vers-product 2010-05-11 12:47:51.000000000 +0100
-@@ -86,6 +86,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromBootLoader;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindLibraryEntry;
diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch Tue Jun 15 18:34:45 2010 +0100
+++ b/patches/cacao/arm-arch-defines.patch Mon Jun 21 21:38:43 2010 +0100
@@ -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-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
+--- cacao.orig/cacao-8948a434c10d/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-8948a434c10d/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-8948a434c10d/src/vm/jit/arm/md-atomic.hpp cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp
+--- cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao-8948a434c10d/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 4fed9f38e501 -r c829a9d16fa0 patches/cacao/jsig.patch
--- a/patches/cacao/jsig.patch Tue Jun 15 18:34:45 2010 +0100
+++ b/patches/cacao/jsig.patch Mon Jun 21 21:38:43 2010 +0100
@@ -16,21 +16,3 @@ diff -Nru cacao.orig/Makefile.am cacao/M
endif
-diff -Nru cacao.orig/Makefile.in cacao/Makefile.in
---- cacao.orig/cacao/src/cacao/Makefile.in 2009-03-16 11:44:18.000000000 +0000
-+++ cacao/cacao/src/cacao/Makefile.in 2010-05-11 10:30:06.000000000 +0100
-@@ -625,12 +625,12 @@
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
-- at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+ at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
-
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE at uninstall-local:
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
- @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
-- at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+ at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/native-resolve.patch
--- a/patches/cacao/native-resolve.patch Tue Jun 15 18:34:45 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-
-# HG changeset patch
-# User Stefan Ring <stefan at complang.tuwien.ac.at>
-# Date 1244023392 -7200
-# Node ID 8e8a38453f6c1e11e057457daf979a1acb40d9bf
-# Parent 5fdb98095047abf89f3d3298417499c2c06f8d56
-Fixes PR128 (changed resolution order for native methods).
-* src/native/native.c (native_method_resolve): Consider internal
-methods before descending into java.lang.ClassLoader.
-
---- cacao/cacao/src/native/native.c Wed Jun 03 01:35:48 2009 +0200
-+++ cacao/cacao/src/native/native.c Wed Jun 03 12:03:12 2009 +0200
-@@ -1,6 +1,6 @@
- /* src/native/native.c - native library support
-
-- Copyright (C) 1996-2005, 2006, 2007, 2008
-+ Copyright (C) 1996-2005, 2006, 2007, 2008, 2009
- CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-
- This file is part of CACAO.
-@@ -529,39 +529,47 @@
-
- newname = native_make_overloaded_function(name, m->descriptor);
-
-+ /* Try to find the native function symbol in the main program. */
-+
-+ f = native_method_find(m);
-+
-+ if (f != NULL)
-+ if (opt_verbosejni)
-+ printf("internal ]\n");
-+
-+#if defined(ENABLE_DL)
- /* check the library hash entries of the classloader of the
- methods's class */
-
-- f = NULL;
-+ if (f == NULL) {
-+ /* Get the classloader. */
-
--#if defined(ENABLE_DL)
-- /* Get the classloader. */
-+ cl = class_get_classloader(m->clazz);
-
-- cl = class_get_classloader(m->clazz);
-+ /* normally addresses are aligned to 4, 8 or 16 bytes */
-
-- /* normally addresses are aligned to 4, 8 or 16 bytes */
-+ key = ((u4) (ptrint) cl) >> 4; /* align to 16-byte */
-+ slot = key & (hashtable_library->size - 1);
-+ le = hashtable_library->ptr[slot];
-
-- key = ((u4) (ptrint) cl) >> 4; /* align to 16-byte */
-- slot = key & (hashtable_library->size - 1);
-- le = hashtable_library->ptr[slot];
-+ /* iterate through loaders in this hash slot */
-
-- /* iterate through loaders in this hash slot */
-+ while ((le != NULL) && (f == NULL)) {
-+ /* iterate through names in this loader */
-
-- while ((le != NULL) && (f == NULL)) {
-- /* iterate through names in this loader */
-+ ne = le->namelink;
-
-- ne = le->namelink;
--
-- while ((ne != NULL) && (f == NULL)) {
-- f = (functionptr) (ptrint) system_dlsym(ne->handle, name->text);
-+ while ((ne != NULL) && (f == NULL)) {
-+ f = (functionptr) (ptrint) system_dlsym(ne->handle, name->text);
-
-- if (f == NULL)
-- f = (functionptr) (ptrint) system_dlsym(ne->handle, newname->text);
-+ if (f == NULL)
-+ f = (functionptr) (ptrint) system_dlsym(ne->handle, newname->text);
-
-- ne = ne->hashlink;
-+ ne = ne->hashlink;
-+ }
-+
-+ le = le->hashlink;
- }
--
-- le = le->hashlink;
- }
-
- # if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-@@ -577,23 +585,22 @@
- class_java_lang_ClassLoader,
- true);
-
-- if (method_findNative == NULL)
-- return NULL;
-+ if (method_findNative != NULL) {
-+ /* try the normal name */
-
-- /* try the normal name */
--
-- s = javastring_new(name);
--
-- f = (functionptr) (intptr_t) vm_call_method_long(method_findNative,
-- NULL, cl, s);
--
-- /* if not found, try the mangled name */
--
-- if (f == NULL) {
-- s = javastring_new(newname);
-+ s = javastring_new(name);
-
- f = (functionptr) (intptr_t) vm_call_method_long(method_findNative,
- NULL, cl, s);
-+
-+ /* if not found, try the mangled name */
-+
-+ if (f == NULL) {
-+ s = javastring_new(newname);
-+
-+ f = (functionptr) (intptr_t) vm_call_method_long(method_findNative,
-+ NULL, cl, s);
-+ }
- }
- }
- # endif
-@@ -602,17 +609,6 @@
- if (opt_verbosejni)
- printf("JNI ]\n");
- #endif
--
-- /* If not found, try to find the native function symbol in the
-- main program. */
--
-- if (f == NULL) {
-- f = native_method_find(m);
--
-- if (f != NULL)
-- if (opt_verbosejni)
-- printf("internal ]\n");
-- }
-
- #if defined(ENABLE_JVMTI)
- /* fire Native Method Bind event */
-
diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/no-mmap-first-page.patch
--- a/patches/cacao/no-mmap-first-page.patch Tue Jun 15 18:34:45 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 4fed9f38e501 -r c829a9d16fa0 patches/cacao/no-strict-aliasing.patch
--- a/patches/cacao/no-strict-aliasing.patch Tue Jun 15 18:34:45 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 4fed9f38e501 -r c829a9d16fa0 patches/cacao/openjdk7.patch
--- a/patches/cacao/openjdk7.patch Tue Jun 15 18:34:45 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-diff -Nru src.orig/native/vm/sun_misc_Unsafe.c src/native/vm/sun_misc_Unsafe.c
---- cacao/cacao/src.orig/native/vm/sun_misc_Unsafe.c 2009-03-19 17:31:38.000000000 +0000
-+++ cacao/cacao/src/native/vm/sun_misc_Unsafe.c 2009-03-19 17:34:57.000000000 +0000
-@@ -104,14 +104,8 @@
- { "putDouble", "(JD)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_putDouble__JD },
- { "objectFieldOffset", "(Ljava/lang/reflect/Field;)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_objectFieldOffset },
- { "allocateMemory", "(J)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_allocateMemory },
--#if 0
-- /* OpenJDK 7 */
- { "setMemory", "(Ljava/lang/Object;JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory },
- { "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 },
-- { "copyMemory", "(JJJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory },
--#endif
- { "freeMemory", "(J)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_freeMemory },
- { "staticFieldOffset", "(Ljava/lang/reflect/Field;)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_staticFieldOffset },
- { "staticFieldBase", "(Ljava/lang/reflect/Field;)Ljava/lang/Object;", (void *) (intptr_t) &Java_sun_misc_Unsafe_staticFieldBase },
-@@ -758,7 +752,6 @@
- }
-
-
--#if 0
- /* OpenJDK 7 */
-
- /*
-@@ -816,59 +809,6 @@
-
- system_memcpy(dest, src, length);
- }
--#else
--/*
-- * Class: sun/misc/Unsafe
-- * Method: setMemory
-- * Signature: (JJB)V
-- */
--JNIEXPORT void JNICALL Java_sun_misc_Unsafe_setMemory(JNIEnv *env, sun_misc_Unsafe *this, int64_t address, int64_t bytes, int32_t value)
--{
-- size_t length;
-- void *p;
--
-- length = (size_t) bytes;
--
-- if ((length != (uint64_t) bytes) || (bytes < 0)) {
-- exceptions_throw_illegalargumentexception();
-- return;
-- }
--
-- p = (void *) (intptr_t) address;
--
-- /* XXX Not sure this is correct. */
--
-- system_memset(p, value, length);
--}
--
--
--/*
-- * Class: sun/misc/Unsafe
-- * Method: copyMemory
-- * Signature: (JJJ)V
-- */
--JNIEXPORT void JNICALL Java_sun_misc_Unsafe_copyMemory(JNIEnv *env, sun_misc_Unsafe *this, int64_t srcAddress, int64_t destAddress, int64_t bytes)
--{
-- size_t length;
-- void *src;
-- void *dest;
--
-- if (bytes == 0)
-- return;
--
-- length = (size_t) bytes;
--
-- if ((length != (uint64_t) bytes) || (bytes < 0)) {
-- exceptions_throw_illegalargumentexception();
-- return;
-- }
--
-- src = (void *) (intptr_t) srcAddress;
-- dest = (void *) (intptr_t) destAddress;
--
-- system_memcpy(dest, src, length);
--}
--#endif
-
-
- /*
diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/versioninfo.patch
--- a/patches/cacao/versioninfo.patch Tue Jun 15 18:34:45 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.c cacao/cacao/src/native/vm/openjdk/jvm.c
---- cacao.orig/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:22:03.000000000 +0100
-+++ cacao/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:48:46.000000000 +0100
-@@ -3645,7 +3645,19 @@
-
- void JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size)
- {
-- log_println("JVM_GetVersionInfo: IMPLEMENT ME!");
-+ TRACEJVMCALLS(("JVM_GetVersionInfo(env=%p, info=%p, info_size=%ld)", env, info, info_size));
-+
-+ memset(info, 0, sizeof(info_size));
-+
-+ int major = atoi(VERSION);
-+ const char* minor_string = strchr(VERSION, '.');
-+ int minor = atoi(++minor_string);
-+ int micro = atoi(strchr(minor_string, '.') + 1);
-+
-+ info->jvm_version = (major << 24) | (minor << 16) | (micro << 8);
-+ info->update_version = 0;
-+ info->special_update_version = 0;
-+ info->is_attachable = 0;
- }
-
-
diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/xxoption-warning.patch
--- a/patches/cacao/xxoption-warning.patch Tue Jun 15 18:34:45 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Stefan Ring <stefan at complang.tuwien.ac.at>
-# Date 1243985748 -7200
-# Node ID 5fdb98095047abf89f3d3298417499c2c06f8d56
-# Parent 2d848ae770f5b7bfc59cf007ceae36f97adccc03
-* src/vm/options.c (options_xx): Don't clutter output with warning (print to
-stderr instead).
-
More information about the distro-pkg-dev
mailing list