Mercurial > hg > release > icedtea6-1.4.1
changeset 1317:15b39cd337dc
2009-01-20 Gary Benson <gbenson@redhat.com>
Matthias Klose <doko@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.
| author | doko@ubuntu.com |
|---|---|
| date | Tue, 20 Jan 2009 15:28:47 +0100 |
| parents | c63cc0eff68b |
| children | bfe44d820632 |
| files | ChangeLog ports/hotspot/src/cpu/zero/vm/frame_zero.hpp ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp |
| diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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-20 Gary Benson <gbenson@redhat.com> + Matthias Klose <doko@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@redhat.com> * IcedTeaPlugin.cc: Add "Java" in the plugin description string.
--- 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
--- 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