/hg/release/icedtea6-1.10: PR689: Shark fails to find LLVM 2.9 S...

[xranby at icedtea.classpath.org]

changeset b142e8e007e6 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=b142e8e007e6
author: Xerxes R?nby <xerxes at zafena.se>
date: Tue Apr 12 15:50:57 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                         |   3 +++
 patches/shark-llvm-2.9.patch |  28 ++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletions(-)

diffs (74 lines):

diff -r 27de3493190b -r b142e8e007e6 ChangeLog
--- a/ChangeLog	Mon Apr 04 16:16:48 2011 +0100
+++ b/ChangeLog	Tue Apr 12 15:50:57 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.
+
 2011-04-04  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 1.10.2.
diff -r 27de3493190b -r b142e8e007e6 Makefile.am
--- a/Makefile.am	Mon Apr 04 16:16:48 2011 +0100
+++ b/Makefile.am	Tue Apr 12 15:50:57 2011 +0200
@@ -329,7 +329,8 @@
 	patches/g356743-libpng-1.5.patch \
 	patches/mark_sun_toolkit_privileged_code.patch \
 	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
-	patches/openjdk/7031385-gcc-register-allocation-fix.patch
+	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
+	patches/shark-llvm-2.9.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 27de3493190b -r b142e8e007e6 NEWS
--- a/NEWS	Mon Apr 04 16:16:48 2011 +0100
+++ b/NEWS	Tue Apr 12 15:50:57 2011 +0200
@@ -11,6 +11,9 @@
 
 New in release 1.10.2 (20XX-XX-XX):
 
+* Shark
+  - PR689: Shark fails to find LLVM 2.9 System headers during build.
+
 New in release 1.10.1 (2011-04-04):
 
 * HotSpot 20 updated to b11.
diff -r 27de3493190b -r b142e8e007e6 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:50:57 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>
+