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/zero-cmpswap-long.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/zero-cmpswap-long.patch')
| -rw-r--r-- | recipes/openjdk/openjdk-6/zero-cmpswap-long.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6/zero-cmpswap-long.patch b/recipes/openjdk/openjdk-6/zero-cmpswap-long.patch new file mode 100644 index 0000000000..ca21ccfea4 --- /dev/null +++ b/recipes/openjdk/openjdk-6/zero-cmpswap-long.patch @@ -0,0 +1,20 @@ +Index: icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp +=================================================================== +--- icedtea6-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:26:16.885292426 +0200 ++++ icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:29:19.034668305 +0200 +@@ -266,7 +266,15 @@ + volatile jlong* dest, + jlong compare_value) { + ++#ifdef ARM ++ return arm_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); ++#else ++#ifdef M68K ++ return m68k_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); ++#else + return __sync_val_compare_and_swap(dest, compare_value, exchange_value); ++#endif // M68K ++#endif // ARM + } + + inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, |