/hg/icedtea6: PR689: Shark fails to find LLVM 2.9 System headers...

[xranby at icedtea.classpath.org]

changeset 307d19e0cca0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=307d19e0cca0
author: Xerxes R?nby <xerxes at zafena.se>
date: Tue Apr 12 15:56:56 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 ddd219edd416 -r 307d19e0cca0 ChangeLog
--- a/ChangeLog	Sun Apr 10 22:51:11 2011 +0200
+++ b/ChangeLog	Tue Apr 12 15:56:56 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-10  Yasumasa Suenaga  <suenaga.yasumasa at oss.ntt.co.jp>
 
 	* tapset/hotspot_jni.stp.in (hotspot.jni.CallNonvirtual*):
diff -r ddd219edd416 -r 307d19e0cca0 Makefile.am
--- a/Makefile.am	Sun Apr 10 22:51:11 2011 +0200
+++ b/Makefile.am	Tue Apr 12 15:56:56 2011 +0200
@@ -335,7 +335,8 @@
 	patches/g356743-libpng-1.5.patch \
 	patches/revert-6885123.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 ddd219edd416 -r 307d19e0cca0 NEWS
--- a/NEWS	Sun Apr 10 22:51:11 2011 +0200
+++ b/NEWS	Tue Apr 12 15:56:56 2011 +0200
@@ -46,6 +46,8 @@
   - On ARM, force interpreter to be built in ARM mode.
   - MIPS: 64-bit and interpreter inlining by default.
   - Trivial implementation of stubs for MIPS.
+* Shark
+  - PR689: Shark fails to find LLVM 2.9 System headers during build.
 
 New in release 1.10 (2011-XX-XX):
 
diff -r ddd219edd416 -r 307d19e0cca0 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:56:56 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>
+