changeset in /hg/icedtea: Fix CACAO build with GCC 4.4.

[Andrew John Hughes]

changeset a5e05eb00fc3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a5e05eb00fc3
description:
	Fix CACAO build with GCC 4.4.

	2009-05-27  Andrew John Hughes  <ahughes at redhat.com>

		* HACKING: Updated.
		* Makefile.am:
		Add new patch, move openjdk7 patch to be
		with others.
		* patches/cacao/no-strict-aliasing.patch:
		New patch to fix CACAO build on GCC 4.4 (see PR129).
		* patches/cacao/openjdk7.patch:
		Fixed paths to match other patches.

diffstat:

5 files changed, 35 insertions(+), 8 deletions(-)
ChangeLog                              |   11 +++++++++++
HACKING                                |   11 +++++++----
Makefile.am                            |    5 +++--
patches/cacao/no-strict-aliasing.patch |   12 ++++++++++++
patches/cacao/openjdk7.patch           |    4 ++--

diffs (96 lines):

diff -r 123d98a5d278 -r a5e05eb00fc3 ChangeLog
--- a/ChangeLog	Wed Jun 03 16:41:46 2009 +0200
+++ b/ChangeLog	Fri Jun 05 18:38:11 2009 +0100
@@ -1,3 +1,14 @@ 2009-06-03  Xerxes RÃ¥nby  <xerxes at zafen
+2009-05-27  Andrew John Hughes  <ahughes at redhat.com>
+
+	* HACKING: Updated.
+	* Makefile.am:
+	Add new patch, move openjdk7 patch to be
+	with others.
+	* patches/cacao/no-strict-aliasing.patch:
+	New patch to fix CACAO build on GCC 4.4 (see PR129).
+	* patches/cacao/openjdk7.patch:
+	Fixed paths to match other patches.
+
 2009-06-03  Xerxes RÃ¥nby  <xerxes at zafena.se>
 	    Stefan Ring  <stefan at complang.tuwien.ac.at>
 
diff -r 123d98a5d278 -r a5e05eb00fc3 HACKING
--- a/HACKING	Wed Jun 03 16:41:46 2009 +0200
+++ b/HACKING	Fri Jun 05 18:38:11 2009 +0100
@@ -71,10 +71,6 @@ The following patches are currently appl
 * icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS.
 * icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47)
 * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
-* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM.
-* cacao/no-mmap-first-page.patch: Don't mmap the first memory page.
-* cacao/native-resolve.patch: Changes CACAO resolution order for native methods. (cacao PR128).
-* cacao/xxoption-warning.patch: Makes CACAO print warnings to stderr (cacao PR128).
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
@@ -141,6 +137,13 @@ The following patches are only applied w
 The following patches are only applied when building with the CACAO virtual machine:
 
 * cacao/ignore-tests.patch: Ignore tests known to fail on CACAO.
+* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM.
+* cacao/no-mmap-first-page.patch: Don't mmap the first memory page.
+* cacao/native-resolve.patch: Changes CACAO resolution order for native methods. (cacao PR128).
+* cacao/xxoption-warning.patch: Makes CACAO print warnings to stderr (cacao PR128).
+* cacao/openjdk7.patch: Turn on java.c functions for OpenJDK7.
+* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier
+  				  when building with GCC 4.4 (cacao PR129).
 
 The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
 
diff -r 123d98a5d278 -r a5e05eb00fc3 Makefile.am
--- a/Makefile.am	Wed Jun 03 16:41:46 2009 +0200
+++ b/Makefile.am	Fri Jun 05 18:38:11 2009 +0100
@@ -2089,7 +2089,9 @@ 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/xxoption-warning.patch \
+	patches/cacao/no-strict-aliasing.patch \
+	patches/cacao/openjdk7.patch
 endif
 
 if WITH_CACAO
@@ -2248,7 +2250,6 @@ if !USE_SYSTEM_CACAO
 	  dir=$$(basename cacao/cacao-*) ; \
 	  ln -s $$dir cacao/cacao ; \
 	  cd cacao/cacao ; \
-	  $(PATCH) -l -p0 < $(abs_top_srcdir)/patches/cacao/openjdk7.patch ; \
 	  cd .. ; \
 	fi
 endif
diff -r 123d98a5d278 -r a5e05eb00fc3 patches/cacao/no-strict-aliasing.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/no-strict-aliasing.patch	Fri Jun 05 18:38:11 2009 +0100
@@ -0,0 +1,12 @@
+diff -ur cacao-0.99.4.orig/configure cacao-0.99.4/configure
+--- cacao.orig/cacao/configure		2009-03-16 12:44:25.000000000 +0100
++++ cacao/cacao/configure		2009-06-05 17:58:48.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
diff -r 123d98a5d278 -r a5e05eb00fc3 patches/cacao/openjdk7.patch
--- a/patches/cacao/openjdk7.patch	Wed Jun 03 16:41:46 2009 +0200
+++ b/patches/cacao/openjdk7.patch	Fri Jun 05 18:38:11 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru src.orig/native/vm/sun_misc_Un
 diff -Nru src.orig/native/vm/sun_misc_Unsafe.c src/native/vm/sun_misc_Unsafe.c
---- src.orig/native/vm/sun_misc_Unsafe.c	2009-03-19 17:31:38.000000000 +0000
-+++ src/native/vm/sun_misc_Unsafe.c	2009-03-19 17:34:57.000000000 +0000
+--- 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              },