Mercurial > hg > release > icedtea6-1.9
changeset 2064:17a509b8bf75
Fix hs17 build.
2010-04-18 Andrew John Hughes <ahughes@redhat.com>
* patches/zero/shark_do_nothing_on_stub_frame.patch:
Moved to hs16 and hs17 versions.
* Makefile.am:
Use $(HSBUILD) in path to Shark stub frame patch.
* patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch,
* patches/hotspot/original/shark_do_nothing_on_stub_frame.patch:
New HotSpot build-specific versions.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sun, 18 Apr 2010 18:07:25 +0100 |
| parents | 4d10e44726a4 |
| children | 8048dccbf481 |
| files | ChangeLog Makefile.am patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch patches/hotspot/original/shark_do_nothing_on_stub_frame.patch patches/zero/shark_do_nothing_on_stub_frame.patch |
| diffstat | 5 files changed, 40 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Apr 18 17:25:41 2010 +0100 +++ b/ChangeLog Sun Apr 18 18:07:25 2010 +0100 @@ -1,3 +1,13 @@ +2010-04-18 Andrew John Hughes <ahughes@redhat.com> + + * patches/zero/shark_do_nothing_on_stub_frame.patch: + Moved to hs16 and hs17 versions. + * Makefile.am: + Use $(HSBUILD) in path to Shark stub frame patch. + * patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch: + New HotSpot build-specific versions. + 2010-04-18 Andrew John Hughes <ahughes@redhat.com> * hotspot.map:
--- a/Makefile.am Sun Apr 18 17:25:41 2010 +0100 +++ b/Makefile.am Sun Apr 18 18:07:25 2010 +0100 @@ -224,7 +224,7 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - patches/zero/shark_do_nothing_on_stub_frame.patch \ + patches/hotspot/$(HSBUILD)/shark_do_nothing_on_stub_frame.patch \ patches/icedtea-notice-safepoints.patch \ patches/icedtea-parisc-opt.patch \ patches/icedtea-lucene-crash.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch Sun Apr 18 18:07:25 2010 +0100 @@ -0,0 +1,14 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp openjdk/hotspot/src/share/vm/runtime/frame.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp 2010-04-17 02:15:34.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-04-18 17:37:54.000000000 +0100 +@@ -1212,6 +1212,10 @@ + oops_entry_do(f, map); + } else if (CodeCache::contains(pc())) { + oops_code_blob_do(f, cf, map); ++#ifdef SHARK ++ } else if (is_fake_stub_frame()) { ++ // nothing to do ++#endif // SHARK + } else { + ShouldNotReachHere(); + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/original/shark_do_nothing_on_stub_frame.patch Sun Apr 18 18:07:25 2010 +0100 @@ -0,0 +1,15 @@ +Index: hotspot/src/share/vm/runtime/frame.cpp +=================================================================== +--- openjdk/hotspot.orig/src/share/vm/runtime/frame.cpp 2010-02-17 04:11:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-03-25 10:06:18.334380336 +0100 +@@ -1205,6 +1205,10 @@ + if (is_interpreted_frame()) { oops_interpreted_do(f, map, use_interpreter_oop_map_cache); + } else if (is_entry_frame()) { oops_entry_do (f, map); + } else if (CodeCache::contains(pc())) { oops_code_blob_do (f, map); ++#ifdef SHARK ++ } else if (is_fake_stub_frame()) { ++ // nothing to do ++#endif // SHARK + } else { + ShouldNotReachHere(); + }
--- a/patches/zero/shark_do_nothing_on_stub_frame.patch Sun Apr 18 17:25:41 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -Index: hotspot/src/share/vm/runtime/frame.cpp -=================================================================== ---- openjdk/hotspot.orig/src/share/vm/runtime/frame.cpp 2010-02-17 04:11:10.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-03-25 10:06:18.334380336 +0100 -@@ -1205,6 +1205,10 @@ - if (is_interpreted_frame()) { oops_interpreted_do(f, map, use_interpreter_oop_map_cache); - } else if (is_entry_frame()) { oops_entry_do (f, map); - } else if (CodeCache::contains(pc())) { oops_code_blob_do (f, map); -+#ifdef SHARK -+ } else if (is_fake_stub_frame()) { -+ // nothing to do -+#endif // SHARK - } else { - ShouldNotReachHere(); - }