/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jan 11 12:08:02 PST 2010
changeset dd10f9a2e531 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dd10f9a2e531
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 11 20:09:51 2010 +0000
Fix -fno-strict-aliasing and NIO2 issues with the CACAO build.
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
Fix issues with the CACAO build.
* Makefile.am: Add new CACAO nio2 patch.
* patches/cacao/nio2.patch: Implement different functions in
sun.misc.Unsafe (copyMemory backported from OpenJDK7).
* patches/cacao/no-strict-aliasing.patch: Always append -fno-
strict-aliasing, even if CFLAGS are specified. Otherwise, a
broken CACAO results.
changeset 8577904b8e6f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8577904b8e6f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 11 20:12:43 2010 +0000
Decide on libjpeg library at compile-time not runtime.
2010-01-11 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-libraries.patch: Decide which
libjpeg library to load at compile-time not runtime using
JPEG_LIB_VERSION. (See http://bugs.debian.org/563999)
diffstat:
5 files changed, 85 insertions(+), 21 deletions(-)
ChangeLog | 22 ++++++++++++++++-
Makefile.am | 3 ++
patches/cacao/nio2.patch | 41 ++++++++++++++++++++++++++++++++
patches/cacao/no-strict-aliasing.patch | 31 +++++++++++-------------
patches/icedtea-libraries.patch | 9 +++----
diffs (155 lines):
diff -r a2af332e20ab -r 8577904b8e6f ChangeLog
--- a/ChangeLog Mon Jan 11 17:44:21 2010 +0100
+++ b/ChangeLog Mon Jan 11 20:12:43 2010 +0000
@@ -1,4 +1,24 @@ 2009-01-11 Nobuhiro Iwamatsu <iwamatsu@
-2009-01-11 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+2010-01-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-libraries.patch:
+ Decide which libjpeg library to load
+ at compile-time not runtime using
+ JPEG_LIB_VERSION.
+ (See http://bugs.debian.org/563999)
+
+2010-01-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix issues with the CACAO build.
+ * Makefile.am:
+ Add new CACAO nio2 patch.
+ * patches/cacao/nio2.patch:
+ Implement different functions in sun.misc.Unsafe
+ (copyMemory backported from OpenJDK7).
+ * patches/cacao/no-strict-aliasing.patch:
+ Always append -fno-strict-aliasing, even if CFLAGS
+ are specified. Otherwise, a broken CACAO results.
+
+2010-01-11 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Matthias Klose <doko at ubuntu.com>
* patches/icedtea-sh4-support.patch: Add zero support for Hitachi SH.
diff -r a2af332e20ab -r 8577904b8e6f Makefile.am
--- a/Makefile.am Mon Jan 11 17:44:21 2010 +0100
+++ b/Makefile.am Mon Jan 11 20:12:43 2010 +0000
@@ -314,6 +314,9 @@ ICEDTEA_PATCHES += \
patches/icedtea-cacao-no-mmap-first-page.patch \
patches/cacao/no-strict-aliasing.patch \
patches/cacao/arm-arch-defines.patch
+if ENABLE_NIO2
+ICEDTEA_PATCHES += patches/cacao/nio2.patch
+endif
endif
if WITH_CACAO
ICEDTEA_PATCHES += \
diff -r a2af332e20ab -r 8577904b8e6f patches/cacao/nio2.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/nio2.patch Mon Jan 11 20:12:43 2010 +0000
@@ -0,0 +1,41 @@
+--- 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 a2af332e20ab -r 8577904b8e6f patches/cacao/no-strict-aliasing.patch
--- a/patches/cacao/no-strict-aliasing.patch Mon Jan 11 17:44:21 2010 +0100
+++ b/patches/cacao/no-strict-aliasing.patch Mon Jan 11 20:12:43 2010 +0000
@@ -1,23 +1,22 @@
---- cacao/cacao/configure.ac~ 2009-03-16 12:42:56.000000000 +0100
-+++ cacao/cacao/configure.ac 2009-06-23 16:19:20.000000000 +0200
-@@ -37,7 +37,7 @@
-
- dnl set optimization and debugging for all architectures and systems
- if test x"$CFLAGS" = "x"; then
-- OPT_CFLAGS="-g -O2"
-+ OPT_CFLAGS="-g -O2 -fno-strict-aliasing"
+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
-diff -ur cacao-0.99.4.orig/configure cacao-0.99.4/configure
---- cacao/cacao/configure 2009-03-16 12:42:56.000000000 +0100
-+++ cacao/cacao/configure 2009-06-23 16:19:21.000000000 +0200
-@@ -2825,7 +2825,7 @@
++OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing"
-
- if test x"$CFLAGS" = "x"; then
-- OPT_CFLAGS="-g -O2"
-+ OPT_CFLAGS="-g -O2 -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 a2af332e20ab -r 8577904b8e6f patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Mon Jan 11 17:44:21 2010 +0100
+++ b/patches/icedtea-libraries.patch Mon Jan 11 20:12:43 2010 +0000
@@ -25045,17 +25045,18 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
-@@ -2317,6 +2377,145 @@
+@@ -2317,6 +2377,146 @@
/********************** end of destination manager ************/
+METHODDEF(void)
+initIDs()
+{
++#if JPEG_LIB_VERSION >= 70
+ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-+ if (handle == NULL) {
-+ handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-+ }
++#else
++ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
+
+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
+ if (jpegstderror == NULL) {
More information about the distro-pkg-dev
mailing list