RFC: PR698 Shark failes to find LLVM 2.9 System headers during build
Gary Benson
gbenson at redhat.com
Tue Apr 12 05:20:31 PDT 2011
Hi Xerxes,
The patches look good to me. Would you be able to submit them
upstream too? I can walk you through the process if you like.
Thanks,
Gary
Xerxes Rånby wrote:
> In LLVM 2.9
> llvm/System/Threading.h and llvm/System/Host.h
> have been moved to
> llvm/Support/Threading.h and llvm/Support/Host.h
>
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=689
>
> The attached patches use SHARK_LLVM_VERSION to include Support/*.h
> for LLVM 2.9 and later and still includes System/*.h for older LLVM
> releases.
>
> Ok to commit all attached patches to:
> Icedtea6-1.9 ?
>
> Icedtea6-1.10 ?
>
> Icedtea6 trunk?
>
>
> Cheers
> Xerxes
>
> Index: icedtea6-1.9/Makefile.am
> ===================================================================
> --- icedtea6-1.9.orig/Makefile.am 2011-04-08 12:41:33.894716001 +0200
> +++ icedtea6-1.9/Makefile.am 2011-04-08 12:43:04.274716002 +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 += \
> Index: icedtea6-1.9/patches/shark-llvm-2.9.patch
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6-1.9/patches/shark-llvm-2.9.patch 2011-04-08 12:41:27.358716002 +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>
> +
> Index: icedtea6-1.9/NEWS
> ===================================================================
> --- icedtea6-1.9.orig/NEWS 2011-04-08 12:45:29.482716000 +0200
> +++ icedtea6-1.9/NEWS 2011-04-08 12:54:16.214716001 +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 failes to find LLVM 2.9 System headers during build
>
> New in release 1.9.7 (2011-02-15):
>
> Index: icedtea6-1.9/ChangeLog
> ===================================================================
> --- icedtea6-1.9.orig/ChangeLog 2011-04-08 12:54:43.482716002 +0200
> +++ icedtea6-1.9/ChangeLog 2011-04-08 12:57:45.726716001 +0200
> @@ -1,3 +1,11 @@
> +2011-04-08 Xerxes R??nby <xerxes at zafena.se>
> +
> + PR689: Shark failes 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
> Index: icedtea6-1.10/patches/shark-llvm-2.9.patch
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6-1.10/patches/shark-llvm-2.9.patch 2011-04-08 13:00:48.446716001 +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>
> +
> Index: icedtea6-1.10/ChangeLog
> ===================================================================
> --- icedtea6-1.10.orig/ChangeLog 2011-04-08 12:37:14.000000000 +0200
> +++ icedtea6-1.10/ChangeLog 2011-04-08 13:01:40.018716003 +0200
> @@ -1,3 +1,11 @@
> +2011-04-08 Xerxes R??nby <xerxes at zafena.se>
> +
> + PR689: Shark failes 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.
> Index: icedtea6-1.10/NEWS
> ===================================================================
> --- icedtea6-1.10.orig/NEWS 2011-04-08 12:37:14.000000000 +0200
> +++ icedtea6-1.10/NEWS 2011-04-08 13:02:34.214716003 +0200
> @@ -11,6 +11,9 @@
>
> New in release 1.10.2 (20XX-XX-XX):
>
> +* Shark
> + - PR689: Shark failes to find LLVM 2.9 System headers during build.
> +
> New in release 1.10.1 (2011-04-04):
>
> * HotSpot 20 updated to b11.
> Index: icedtea6-1.10/Makefile.am
> ===================================================================
> --- icedtea6-1.10.orig/Makefile.am 2011-04-08 12:37:14.000000000 +0200
> +++ icedtea6-1.10/Makefile.am 2011-04-08 13:03:39.558716000 +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 += \
> Index: icedtea6/patches/shark-llvm-2.9.patch
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6/patches/shark-llvm-2.9.patch 2011-04-08 13:06:04.670716001 +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>
> +
> Index: icedtea6/ChangeLog
> ===================================================================
> --- icedtea6.orig/ChangeLog 2011-04-08 11:03:50.000000000 +0200
> +++ icedtea6/ChangeLog 2011-04-08 13:07:50.522716000 +0200
> @@ -1,3 +1,11 @@
> +2011-04-08 Xerxes R??nby <xerxes at zafena.se>
> +
> + PR689: Shark failes 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-03-31 Deepak Bhole <dbhole at redhat.com>
>
> S7031385, PR680: Incorrect register allocation in
> Index: icedtea6/NEWS
> ===================================================================
> --- icedtea6.orig/NEWS 2011-04-08 11:03:50.000000000 +0200
> +++ icedtea6/NEWS 2011-04-08 13:07:22.206716002 +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 failes to find LLVM 2.9 System headers during build.
>
> New in release 1.10 (2011-XX-XX):
>
> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am 2011-04-08 11:03:50.000000000 +0200
> +++ icedtea6/Makefile.am 2011-04-08 13:06:04.698716001 +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 += \
--
http://gbenson.net/
More information about the distro-pkg-dev
mailing list