changeset 798:a5c32475a2e8 icedtea6-1.1

2008-04-04 Gary Benson <gbenson@redhat.com> * patches/icedtea-ia64-bugfix.patch: New file. * Makefile.am: Added the above. * Makefile.in: Regenerated.
author Gary Benson <gbenson@redhat.com>
date Fri, 04 Apr 2008 04:40:21 -0400
parents f9549e833bc4
children 26bd96e2a20b
files ChangeLog Makefile.am Makefile.in patches/icedtea-ia64-bugfix.patch
diffstat 4 files changed, 26 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 03 14:04:06 2008 -0400
+++ b/ChangeLog	Fri Apr 04 04:40:21 2008 -0400
@@ -1,3 +1,9 @@
+2008-04-04  Gary Benson  <gbenson@redhat.com>
+
+	* patches/icedtea-ia64-bugfix.patch: New file.
+	* Makefile.am: Added the above.
+	* Makefile.in: Regenerated.
+
 2008-04-03  Lillian Angel  <langel@redhat.com>
 
 	* acinclude.m4: Fixed typo.
--- a/Makefile.am	Thu Apr 03 14:04:06 2008 -0400
+++ b/Makefile.am	Fri Apr 04 04:40:21 2008 -0400
@@ -233,7 +233,8 @@
 	patches/icedtea-signature-iterator.patch \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
-	patches/icedtea-zero.patch
+	patches/icedtea-zero.patch \
+	patches/icedtea-ia64-bugfix.patch
 
 if ZERO_BUILD
   ZERO_PATCHES_COND = $(ZERO_PATCHES)
--- a/Makefile.in	Thu Apr 03 14:04:06 2008 -0400
+++ b/Makefile.in	Fri Apr 04 04:40:21 2008 -0400
@@ -354,7 +354,8 @@
 	patches/icedtea-signature-iterator.patch \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
-	patches/icedtea-zero.patch
+	patches/icedtea-zero.patch \
+	patches/icedtea-ia64-bugfix.patch
 
 @ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
 @ZERO_BUILD_TRUE@ZERO_PATCHES_COND = $(ZERO_PATCHES)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ia64-bugfix.patch	Fri Apr 04 04:40:21 2008 -0400
@@ -0,0 +1,16 @@
+diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 04 09:33:18 2008 +0100
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 04 09:34:11 2008 +0100
+@@ -1281,12 +1281,7 @@ run:
+           jfloat f;
+           jdouble r;
+           f = STACK_FLOAT(-1);
+-#ifdef IA64
+-          // IA64 gcc bug
+-          r = ( f == 0.0f ) ? (jdouble) f : (jdouble) f + ia64_double_zero;
+-#else
+           r = (jdouble) f;
+-#endif
+           MORE_STACK(-1); // POP
+           SET_STACK_DOUBLE(r, 1);
+           UPDATE_PC_AND_TOS_AND_CONTINUE(1, 2);