/hg/release/icedtea6-1.10: PR639: Add missing include line for S...

[andrew at icedtea.classpath.org]

changeset 31d8dc2212b0 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=31d8dc2212b0
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 24 00:44:14 2011 +0000

	PR639: Add missing include line for Shark.

	2011-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add new patch.
		* patches/pr639-missing_shark_include.patch: Add missing
	include for Shark.


diffstat:

3 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog                                 |    6 ++++++
Makefile.am                               |    3 ++-
patches/pr639-missing_shark_include.patch |   12 ++++++++++++

diffs (42 lines):

diff -r 11791e43c0f4 -r 31d8dc2212b0 ChangeLog
--- a/ChangeLog	Wed Feb 23 22:39:16 2011 +0000
+++ b/ChangeLog	Thu Feb 24 00:44:14 2011 +0000
@@ -1,3 +1,9 @@ 2011-02-23  Andrew John Hughes  <ahughes
+2011-02-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/pr639-missing_shark_include.patch:
+	Add missing include for Shark.
+
 2011-02-23  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r 11791e43c0f4 -r 31d8dc2212b0 Makefile.am
--- a/Makefile.am	Wed Feb 23 22:39:16 2011 +0000
+++ b/Makefile.am	Thu Feb 24 00:44:14 2011 +0000
@@ -325,7 +325,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6663040-com.sun.awt.patch \
 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
 	patches/openjdk/6766342-AA-simple-shape-performance.patch \
-	patches/pr600-arm-jvm.cfg.patch
+	patches/pr600-arm-jvm.cfg.patch \
+	patches/pr639-missing_shark_include.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 11791e43c0f4 -r 31d8dc2212b0 patches/pr639-missing_shark_include.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr639-missing_shark_include.patch	Thu Feb 24 00:44:14 2011 +0000
@@ -0,0 +1,12 @@
+--- openjdk.orig/hotspot/src/share/vm/ci/ciTypeFlow.cpp	2011-01-25 22:57:24.000000000 +0000
++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp	2011-02-24 00:28:58.000000000 +0000
+@@ -37,6 +37,9 @@
+ #include "memory/allocation.inline.hpp"
+ #include "runtime/deoptimization.hpp"
+ #include "utilities/growableArray.hpp"
++#ifdef SHARK
++#include "shark/shark_globals.hpp"
++#endif
+ 
+ // ciTypeFlow::JsrSet
+ //