/hg/release/icedtea6-1.9: PR689: Shark fails to find LLVM 2.9 Sy...

[xranby at icedtea.classpath.org]

changeset 495cac553ab0 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=495cac553ab0
author: Xerxes R?nby <xerxes at zafena.se>
date: Tue Apr 12 15:47:27 2011 +0200

	PR689: Shark fails to find LLVM 2.9 System headers during build

	2011-04-12 Xerxes R?nby <xerxes at zafena.se>

	 PR689: Shark fails to find LLVM 2.9 System headers during
	build
		* Makefile.am: Add patch.
		* patches/shark-llvm-2.9.patch: In LLVM 2.9 System headers are
	moved to Support.
		* NEWS: Updated.


diffstat:

 ChangeLog                    |   8 ++++++++
 Makefile.am                  |   3 ++-
 NEWS                         |   2 ++
 patches/shark-llvm-2.9.patch |  28 ++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletions(-)

diffs (73 lines):

diff -r e4336b504f8a -r 495cac553ab0 ChangeLog
--- a/ChangeLog	Fri Mar 25 15:04:00 2011 -0400
+++ b/ChangeLog	Tue Apr 12 15:47:27 2011 +0200
@@ -1,3 +1,11 @@
+2011-04-12  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	PR689: Shark fails to find LLVM 2.9 System headers during build
+	* Makefile.am: Add patch.
+	* patches/shark-llvm-2.9.patch:
+	In LLVM 2.9 System headers are moved to Support.
+	* NEWS: Updated.
+
 2010-11-01  Deepak Bhole <dbhole at redhat.com>
 
 	PR542: Plugin fails with NPE on
diff -r e4336b504f8a -r 495cac553ab0 Makefile.am
--- a/Makefile.am	Fri Mar 25 15:04:00 2011 -0400
+++ b/Makefile.am	Tue Apr 12 15:47:27 2011 +0200
@@ -340,7 +340,8 @@
 	patches/latent_jaxp_bug.patch \
 	patches/openjdk/6675802-securityExceptions-applets.patch \
 	patches/openjdk/6691503-malicious-applet-always-on-top.patch \
-	patches/jtreg-LastErrorString.patch
+	patches/jtreg-LastErrorString.patch \
+	patches/shark-llvm-2.9.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r e4336b504f8a -r 495cac553ab0 NEWS
--- a/NEWS	Fri Mar 25 15:04:00 2011 -0400
+++ b/NEWS	Tue Apr 12 15:47:27 2011 +0200
@@ -16,6 +16,8 @@
   - S6980392, PR642: simple correction in testcase, added missing bracket
 * Plugin
   - PR542: Plugin fails with NPE on http://www.openprocessing.org/visuals/iframe.php?visualID=2615
+* Shark
+  - PR689: Shark fails to find LLVM 2.9 System headers during build
 
 New in release 1.9.7 (2011-02-15):
 
diff -r e4336b504f8a -r 495cac553ab0 patches/shark-llvm-2.9.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/shark-llvm-2.9.patch	Tue Apr 12 15:47:27 2011 +0200
@@ -0,0 +1,29 @@
+Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp
+===================================================================
+--- openjdk.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-08 11:48:09.270716001 +0200
++++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-08 11:49:54.714716002 +0200
+@@ -43,7 +43,11 @@
+ #include <llvm/ModuleProvider.h>
+ #endif
+ #include <llvm/Support/IRBuilder.h>
++#if SHARK_LLVM_VERSION >= 29
++#include <llvm/Support/Threading.h>
++#else
+ #include <llvm/System/Threading.h>
++#endif
+ #include <llvm/Target/TargetSelect.h>
+ #include <llvm/Type.h>
+ #include <llvm/ExecutionEngine/JITMemoryManager.h>
+@@ -52,8 +56,12 @@
+ #include <llvm/ExecutionEngine/JIT.h>
+ #include <llvm/ADT/StringMap.h>
+ #include <llvm/Support/Debug.h>
++#if SHARK_LLVM_VERSION >= 29
++#include <llvm/Support/Host.h>
++#else
+ #include <llvm/System/Host.h>
+ #endif
++#endif
+ 
+ #include <map>
+