/hg/icedtea6: Fix hs17 build.

[andrew at icedtea.classpath.org]

changeset 17a509b8bf75 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=17a509b8bf75
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Apr 18 18:07:25 2010 +0100

	Fix hs17 build.

	2010-04-18 Andrew John Hughes <ahughes at 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.


diffstat:

5 files changed, 40 insertions(+), 16 deletions(-)
ChangeLog                                                     |   10 ++++++
Makefile.am                                                   |    2 -
patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch     |   14 +++++++++
patches/hotspot/original/shark_do_nothing_on_stub_frame.patch |   15 ++++++++++
patches/zero/shark_do_nothing_on_stub_frame.patch             |   15 ----------

diffs (85 lines):

diff -r 4d10e44726a4 -r 17a509b8bf75 ChangeLog
--- 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
+2010-04-18  Andrew John Hughes  <ahughes at 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 at redhat.com>
 
 	* hotspot.map:
diff -r 4d10e44726a4 -r 17a509b8bf75 Makefile.am
--- 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_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 \
diff -r 4d10e44726a4 -r 17a509b8bf75 patches/hotspot/hs17/shark_do_nothing_on_stub_frame.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();
+   }
diff -r 4d10e44726a4 -r 17a509b8bf75 patches/hotspot/original/shark_do_nothing_on_stub_frame.patch
--- /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();
+   }
diff -r 4d10e44726a4 -r 17a509b8bf75 patches/zero/shark_do_nothing_on_stub_frame.patch
--- 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();
-   }