/hg/icedtea6: Reapply ia64 build fix from patches/zero/6896043.p...

[Dr Andrew John Hughes]

On 13:01 Mon 29 Nov     , doko at icedtea.classpath.org wrote:
> changeset 19c298cbf34e in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=19c298cbf34e
> author: doko at ubuntu.com
> date: Mon Nov 29 14:00:48 2010 +0100
> 
> 	Reapply ia64 build fix from patches/zero/6896043.patch
> 
> 	2010-11-29 Matthias Klose <doko at ubuntu.com>
> 
> 	 * patches/hotspot/hs19/ia64-fix.patch: Reapply chunk from
> 	patches/zero/6896043.patch.
> 

Thanks for catching this.  Can you please also backport this to the 1.9 branch?

> 
> diffstat:
> 
> 3 files changed, 37 insertions(+), 1 deletion(-)
> ChangeLog                           |    5 +++++
> Makefile.am                         |    3 ++-
> patches/hotspot/hs19/ia64-fix.patch |   30 ++++++++++++++++++++++++++++++
> 
> diffs (59 lines):
> 
> diff -r c3150835fe12 -r 19c298cbf34e ChangeLog
> --- a/ChangeLog	Mon Nov 29 08:50:36 2010 +0100
> +++ b/ChangeLog	Mon Nov 29 14:00:48 2010 +0100
> @@ -1,3 +1,8 @@ 2010-11-29  Matthias Klose  <doko at ubuntu
> +2010-11-29  Matthias Klose  <doko at ubuntu.com>
> +
> +	* patches/hotspot/hs19/ia64-fix.patch: Reapply chunk from
> +	patches/zero/6896043.patch.
> +
>  2010-11-29  Matthias Klose  <doko at ubuntu.com>
>  
>  	* patches/hotspot/hs19/params-cast-size_t.patch: Update for hs19.
> diff -r c3150835fe12 -r 19c298cbf34e Makefile.am
> --- a/Makefile.am	Mon Nov 29 08:50:36 2010 +0100
> +++ b/Makefile.am	Mon Nov 29 14:00:48 2010 +0100
> @@ -306,7 +306,8 @@ ICEDTEA_PATCHES += \
>  ICEDTEA_PATCHES += \
>  	patches/openjdk/6994130-ppc_fix.patch \
>  	patches/disable-default-compoops.patch \
> -	patches/openjdk/6980392-fix_test6581734.patch
> +	patches/openjdk/6980392-fix_test6581734.patch \
> +	patches/hotspot/hs19/ia64-fix.patch
>  else
>  ICEDTEA_PATCHES += \
>  	patches/shark_do_nothing_on_stub_frame.patch \
> diff -r c3150835fe12 -r 19c298cbf34e patches/hotspot/hs19/ia64-fix.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/hotspot/hs19/ia64-fix.patch	Mon Nov 29 14:00:48 2010 +0100
> @@ -0,0 +1,30 @@
> +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp~	2010-10-08 20:29:24.000000000 +0000
> ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2010-11-29 07:56:22.000000000 +0000
> +@@ -1287,12 +1287,7 @@
> +           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);
> +--- openjdk/hotspot/src/share/vm/opto/connode.cpp~	2010-10-08 20:29:24.000000000 +0000
> ++++ openjdk/hotspot/src/share/vm/opto/connode.cpp	2010-11-29 07:57:22.000000000 +0000
> +@@ -712,12 +712,7 @@
> +   if( t == Type::TOP ) return Type::TOP;
> +   if( t == Type::FLOAT ) return Type::DOUBLE;
> +   const TypeF *tf = t->is_float_constant();
> +-#ifndef IA64
> +   return TypeD::make( (double)tf->getf() );
> +-#else
> +-  float x = tf->getf();
> +-  return TypeD::make( (x == 0.0f) ? (double)x : (double)x + ia64_double_zero );
> +-#endif
> + }
> + 
> + //=============================================================================

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8