5ea879a
# HG changeset patch
5ea879a
# User aph
5ea879a
# Date 1338206478 14400
5ea879a
#      Mon May 28 08:01:18 2012 -0400
5ea879a
# Node ID 6275d7b419091092752d5a1854194c98897892ba
5ea879a
# Parent  be1379a186ba527b32c93a83e04c9600735fe44b
5ea879a
PR3559: Use ldrexd for atomic reads on ARMv7.
5ea879a
5ea879a
2012-05-28  Andrew Haley  <aph@redhat.com>
5ea879a
5ea879a
	* os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads
5ea879a
	on ARMv7.
5ea879a
5ea879a
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
5ea879a
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
5ea879a
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
5ea879a
@@ -54,6 +54,12 @@
5ea879a
                   "std %0, 0(%2)\n"
5ea879a
                   : "=r"(tmp)
5ea879a
                   : "a"(src), "a"(dst));
5ea879a
+#elif defined(__ARM_ARCH_7A__)
5ea879a
+    jlong tmp;
5ea879a
+    asm volatile ("ldrexd  %0, [%1]\n"
5ea879a
+                  : "=r"(tmp)
5ea879a
+                  : "r"(src), "m"(src));
5ea879a
+    *(jlong *) dst = tmp;
5ea879a
 #else
5ea879a
     *(jlong *) dst = *(jlong *) src;
5ea879a
 #endif