changeset in /hg/icedtea6: 2009-01-07 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset f8d68d85e72e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8d68d85e72e
description:
	2009-01-07  Matthias Klose  <doko at ubuntu.com>

	        * patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch: New, fix
	        build failure with GCC-4.4.
	        * Makefile.am: Apply.
	        * HACKING: Document the above.

diffstat:

4 files changed, 21 insertions(+), 1 deletion(-)
ChangeLog                                              |    7 +++++++
HACKING                                                |    1 +
Makefile.am                                            |    3 ++-
patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch |   11 +++++++++++

diffs (53 lines):

diff -r fc5078fb4df1 -r f8d68d85e72e ChangeLog
--- a/ChangeLog	Tue Jan 06 17:30:41 2009 -0500
+++ b/ChangeLog	Wed Jan 07 12:02:05 2009 +0100
@@ -1,3 +1,10 @@ 2009-01-06  Omair Majid  <omajid at redhat.
+2009-01-07  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch: New, fix
+	build failure with GCC-4.4.
+	* Makefile.am: Apply.
+	* HACKING: Document the above.
+
 2009-01-06  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-demo-swingapplet.patch: New file.
diff -r fc5078fb4df1 -r f8d68d85e72e HACKING
--- a/HACKING	Tue Jan 06 17:30:41 2009 -0500
+++ b/HACKING	Wed Jan 07 12:02:05 2009 +0100
@@ -80,6 +80,7 @@ The following patches are currently appl
 * icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
 * icedtea-a11y-property-change.patch: Dont fire PropertyChangeEvent if the property hasnt changed.
 * icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
+* icedtea-hotspot-dispatch.patch: Fix build failure with GCC-4.4 (PR 38725).
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r fc5078fb4df1 -r f8d68d85e72e Makefile.am
--- a/Makefile.am	Tue Jan 06 17:30:41 2009 -0500
+++ b/Makefile.am	Wed Jan 07 12:02:05 2009 +0100
@@ -649,7 +649,8 @@ ICEDTEA_PATCHES += \
 ICEDTEA_PATCHES += \
 	patches/icedtea-format-warnings.patch \
 	patches/icedtea-fortify-source.patch \
-	patches/hotspot/$(HSBUILD)/icedtea-sparc-buildfixes.patch
+	patches/hotspot/$(HSBUILD)/icedtea-sparc-buildfixes.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-hotspot-dispatch.patch
 endif
 
 if !WITH_ALT_HSBUILD
diff -r fc5078fb4df1 -r f8d68d85e72e patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch	Wed Jan 07 12:02:05 2009 +0100
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.old	2009-01-06 16:16:57.000000000 -0700
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2009-01-06 16:17:53.000000000 -0700
+@@ -163,7 +163,7 @@
+ #ifdef USELABELS
+ // Have to do this dispatch this way in C++ because otherwise gcc complains about crossing an
+ // initialization (which is is the initialization of the table pointer...)
+-#define DISPATCH(opcode) goto *dispatch_table[opcode]
++#define DISPATCH(opcode) goto *(void *)dispatch_table[opcode]
+ #define CONTINUE {                              \
+         opcode = *pc;                           \
+         DO_UPDATE_INSTRUCTION_COUNT(opcode);    \