changeset in /hg/icedtea6: 2008-07-11 Gary Benson <gbenson at red...

[Gary Benson]

changeset 2aaceb7b1ec6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2aaceb7b1ec6
description:
	2008-07-11  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero.patch: Build non-product correctly on ia64.

diffstat:

2 files changed, 19 insertions(+)
ChangeLog                  |    4 ++++
patches/icedtea-zero.patch |   15 +++++++++++++++

diffs (33 lines):

diff -r a4405408e867 -r 2aaceb7b1ec6 ChangeLog
--- a/ChangeLog	Fri Jul 11 10:23:29 2008 +0200
+++ b/ChangeLog	Fri Jul 11 12:20:44 2008 -0400
@@ -1,3 +1,7 @@ 2008-07-11  Christian Thalinger  <twisti
+2008-07-11  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero.patch: Build non-product correctly on ia64.
+
 2008-07-11  Christian Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* Makefile.am (CACAO_VERSION): Updated to 0.99.2
diff -r a4405408e867 -r 2aaceb7b1ec6 patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Fri Jul 11 10:23:29 2008 +0200
+++ b/patches/icedtea-zero.patch	Fri Jul 11 12:20:44 2008 -0400
@@ -159,3 +159,18 @@ diff -r 789c601c8ba9 openjdk/hotspot/src
    #endif
  
    // Identify compatability class for VM's architecture and library's architecture
+diff -r 3e7fbd955f0b openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Jul 10 14:08:04 2008 -0400
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Jul 10 14:11:25 2008 -0400
+@@ -3025,9 +3025,9 @@
+   tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
+   tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);
+ #endif
+-#ifdef IA64
++#if defined(IA64) && !defined(ZERO)
+   tty->print_cr("last_Java_fp: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_fp);
+-#endif // IA64
++#endif // IA64 && !ZERO
+   tty->print_cr("self_link: " INTPTR_FORMAT, (uintptr_t) this->_self_link);
+ }
+