changeset in /hg/icedtea6: 2009-01-20 Gary Benson <gbenson at red...

[doko at ubuntu.com]

changeset 15b39cd337dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=15b39cd337dc
description:
	2009-01-20  Gary Benson  <gbenson at redhat.com>
	            Matthias Klose  <doko at ubuntu.com>

	        * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.[ch]pp (i486): Rename
	        to x86.
	        * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp (fp): Remove PRODUCT
	        conditional, make the not-PRODUCT bit the default.

diffstat:

4 files changed, 11 insertions(+), 7 deletions(-)
ChangeLog                                           |    8 ++++++++
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp        |    6 +-----
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp |    2 +-
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp |    2 +-

diffs (53 lines):

diff -r c63cc0eff68b -r 15b39cd337dc ChangeLog
--- a/ChangeLog	Mon Jan 19 14:41:10 2009 -0500
+++ b/ChangeLog	Tue Jan 20 15:28:47 2009 +0100
@@ -1,3 +1,11 @@ 2009-01-19  Deepak Bhole  <dbhole at redhat
+2009-01-20  Gary Benson  <gbenson at redhat.com>
+	    Matthias Klose  <doko at ubuntu.com>
+
+	* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.[ch]pp (i486): Rename
+	to x86.
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp (fp): Remove PRODUCT
+	conditional, make the not-PRODUCT bit the default.
+
 2009-01-19  Deepak Bhole  <dbhole at redhat.com>
 
 	* IcedTeaPlugin.cc: Add "Java" in the plugin description string. 
diff -r c63cc0eff68b -r 15b39cd337dc ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Mon Jan 19 14:41:10 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Tue Jan 20 15:28:47 2009 +0100
@@ -41,11 +41,7 @@
   // accessors for the instance variables
   intptr_t* fp() const
   {
-#ifdef PRODUCT
-    ShouldNotCallThis();
-#else
-    return (intptr_t *) -1; // make frame::print_value_on work
-#endif // !PRODUCT
+    return (intptr_t *) -1;
   }
 
 #ifdef CC_INTERP
diff -r c63cc0eff68b -r 15b39cd337dc ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp	Mon Jan 19 14:41:10 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp	Tue Jan 20 15:28:47 2009 +0100
@@ -27,5 +27,5 @@
 #include "incls/_stubRoutines_zero.cpp.incl"
 
 #ifdef IA32
-address StubRoutines::i486::_call_stub_compiled_return = NULL;
+address StubRoutines::x86::_call_stub_compiled_return = NULL;
 #endif // IA32
diff -r c63cc0eff68b -r 15b39cd337dc ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp	Mon Jan 19 14:41:10 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp	Tue Jan 20 15:28:47 2009 +0100
@@ -45,7 +45,7 @@
   };                     // them if that happens.
 
 #ifdef IA32
-  class i486
+  class x86
   {
     friend class VMStructs;