Mercurial > hg > release > icedtea6-1.6

changeset 1616:629f7b7a918f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New patch to fix CACAO build on GCC 4.4 2009-06-24 Andrew John Hughes <ahughes@redhat.com> * patches/cacao/no-strict-aliasing.patch: New patch to fix CACAO build on GCC 4.4 (see PR129). * Makefile.am: Add new patch. * HACKING: Update.
author doko@ubuntu.com
date Wed, 24 Jun 2009 10:26:38 +0200
parents 46341fc21171
children 1ba29bfca5a0
files ChangeLog HACKING Makefile.am patches/cacao/no-strict-aliasing.patch
diffstat 4 files changed, 34 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 23 16:31:22 2009 +0200
+++ b/ChangeLog	Wed Jun 24 10:26:38 2009 +0200
@@ -1,3 +1,10 @@
+2009-06-24  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/cacao/no-strict-aliasing.patch:
+	New patch to fix CACAO build on GCC 4.4 (see PR129).
+	* Makefile.am: Add new patch.
+	* HACKING: Update.
+
 2009-06-23  Matthias Klose  <doko@ubuntu.com>
 
 	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Fix header location.
--- a/HACKING	Tue Jun 23 16:31:22 2009 +0200
+++ b/HACKING	Wed Jun 24 10:26:38 2009 +0200
@@ -98,6 +98,8 @@
 * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
 * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
 * icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
+* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
+
 * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
 * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
 * icedtea-signature-iterator.patch: Add zero-specific signature handling.
--- a/Makefile.am	Tue Jun 23 16:31:22 2009 +0200
+++ b/Makefile.am	Wed Jun 24 10:26:38 2009 +0200
@@ -614,7 +614,8 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/icedtea-cacao.patch \
-	patches/icedtea-cacao-no-mmap-first-page.patch
+	patches/icedtea-cacao-no-mmap-first-page.patch \
+	patches/cacao/no-strict-aliasing.patch
 endif
 if WITH_CACAO
 ICEDTEA_PATCHES += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/no-strict-aliasing.patch	Wed Jun 24 10:26:38 2009 +0200
@@ -0,0 +1,23 @@
+--- 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"
+ 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 @@
+ 
+ 
+ if test x"$CFLAGS" = "x"; then
+-    OPT_CFLAGS="-g -O2"
++    OPT_CFLAGS="-g -O2 -fno-strict-aliasing"
+ else
+     OPT_CFLAGS=$CFLAGS
+ fi