diff options
| author |   Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-18 00:06:46 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-21 12:33:11 +0100 |
| commit | c79fd9b1616499dcb44e1408399cdfe54f3ccfe2 (patch) | |
| tree | a5922f52eeee1a75901d757332e6b988d825cab7 /recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch | |
| parent | 2fd114ae2977202ca2762f6ebb9be9c5d88072e2 (diff) | |
| download | openembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.tar.gz | |
openjdk: backport 1.11.1 release from meta-java
* shark is disabled since 1.11
* rework patches
* rework inc files for jamvm
* bump PR
Diffstat (limited to 'recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch')
| -rw-r--r-- | recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch b/recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch new file mode 100644 index 0000000000..e47ee50c6d --- /dev/null +++ b/recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch @@ -0,0 +1,29 @@ +Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp +=================================================================== +--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 20:38:09.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 21:03:15.781644337 +0100 +@@ -38,7 +38,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> +@@ -47,8 +51,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> + |