From b78fc95424b5f0fb28246e8c61bb8b4d6a9d733a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 12 Jul 2010 13:29:16 +0200 Subject: openjdk: backport from openembedded-dev Acked-by: Stefan Schmidt Acked-by: Koen Kooi Acked-by: Marcin Juszkiewicz --- .../openjdk-6-6b18-1.8/zero-cmpswap-long.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes/openjdk/openjdk-6-6b18-1.8/zero-cmpswap-long.patch (limited to 'recipes/openjdk/openjdk-6-6b18-1.8/zero-cmpswap-long.patch') diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/zero-cmpswap-long.patch b/recipes/openjdk/openjdk-6-6b18-1.8/zero-cmpswap-long.patch new file mode 100644 index 0000000000..ca21ccfea4 --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b18-1.8/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, -- cgit 1.2.3-korg