--- a/ChangeLog	Thu Feb 24 01:40:07 2011 +0000
+++ b/ChangeLog	Thu Feb 24 03:22:54 2011 +0000
@@ -1,3 +1,14 @@
+2011-02-24  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/pr639-missing_shark_include.patch:
+	Renamed.
+	* Makefile.am: Fix name of patch.
+	* NEWS: Updated.
+	* patches/pr639-broken_shark_build.patch:
+	Fix other Shark build issues with missing
+	compilation of Shark files and lack of
+	LLVM linker flags for the launcher.
+
 2011-02-24  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Thu Feb 24 01:40:07 2011 +0000
+++ b/Makefile.am	Thu Feb 24 03:22:54 2011 +0000
@@ -334,7 +334,7 @@
 	patches/openjdk/6997495-test_correction_6857159.patch
 else
 ICEDTEA_PATCHES += \
-	patches/pr639-missing_shark_include.patch
+	patches/pr639-broken_shark_build.patch
 endif
 
 if WITH_RHINO

--- a/NEWS	Thu Feb 24 01:40:07 2011 +0000
+++ b/NEWS	Thu Feb 24 03:22:54 2011 +0000
@@ -440,7 +440,7 @@
   - PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart
   - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
   - PR586: Sources missing from src.zip
-  - PR639: Add missing include line for Shark.
+  - PR639: Add missing include line, paths and LLVM flags for Shark.
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr639-broken_shark_build.patch	Thu Feb 24 03:22:54 2011 +0000
@@ -0,0 +1,44 @@
+--- 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
+ //
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2011-02-23 21:28:45.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/vm.make	2011-02-24 02:17:30.000000000 +0000
+@@ -139,13 +139,15 @@
+ COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt
+ COMPILER2_PATHS +=  $(GENERATED)/adfiles
+ 
++SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
++
+ # Include dirs per type.
+ Src_Dirs/CORE      := $(CORE_PATHS)
+ Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
+ Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
+ Src_Dirs/TIERED    := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
+ Src_Dirs/ZERO      := $(CORE_PATHS)
+-Src_Dirs/SHARK     := $(CORE_PATHS)
++Src_Dirs/SHARK     := $(CORE_PATHS) $(SHARK_PATHS)
+ Src_Dirs := $(Src_Dirs/$(TYPE))
+ 
+ COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make	2011-02-22 16:51:24.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/launcher.make	2011-02-24 03:01:36.000000000 +0000
+@@ -52,6 +52,10 @@
+   LAUNCHER.o                 = launcher.o
+   LFLAGS_LAUNCHER           += -L `pwd`
+   LIBS_LAUNCHER             += -l$(JVM) $(LIBS)
++  ifeq ($(SHARK_BUILD), true)
++    LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
++    LIBS_LAUNCHER   += $(LLVM_LIBS)
++  endif
+ endif
+ 
+ LINK_LAUNCHER = $(LINK.c)

--- a/patches/pr639-missing_shark_include.patch	Thu Feb 24 01:40:07 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- 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
- //