2012-06-15 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* sysdep/s390/locks.h (compare_and_swap, release_set)
	(read_barrier, write_barrier): Use the GCC atomic builtins.

From-SVN: r188649

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9f7d38fa2109dbb7f4108ad680901811c355616a..dffa3682726b035d2e4b8ec29806a12dfcbf2ad3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-15  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * sysdep/s390/locks.h (compare_and_swap, release_set)
+       (read_barrier, write_barrier): Use the GCC atomic builtins.
+
 2012-06-14  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        * sysdep/sh/locks.h (__cas_lock): Remove.

diff --git a/libjava/sysdep/s390/locks.h b/libjava/sysdep/s390/locks.h
index b0f3185254fc7f6252f850b6f4c63e2ef1140dd2..96fb43d5647c1ccbc54a9ded1f40f7fcabed293d 100644 (file)
--- a/libjava/sysdep/s390/locks.h
+++ b/libjava/sysdep/s390/locks.h
@@ -1,6 +1,6 @@
 // locks.h - Thread synchronization primitives. S/390 implementation.
 
-/* Copyright (C) 2002  Free Software Foundation
+/* Copyright (C) 2002-2012  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -22,21 +22,7 @@ inline static bool
 compare_and_swap(volatile obj_addr_t *addr,
                 obj_addr_t old, obj_addr_t new_val) 
 {
-  int result;
-
-  __asm__ __volatile__ (
-#ifndef __s390x__
-    "       cs  %1,%2,0(%3)\n"
-#else
-    "       csg %1,%2,0(%3)\n"
-#endif
-    "       ipm %0\n"
-    "       srl %0,28\n"
-    : "=&d" (result), "+d" (old)
-    : "d" (new_val), "a" (addr)
-    : "cc", "memory");
-
-  return result == 0;
+  return __sync_bool_compare_and_swap (addr, old, new_val);
 }
 
 // Set *addr to new_val with release semantics, i.e. making sure
@@ -45,7 +31,7 @@ compare_and_swap(volatile obj_addr_t *addr,
 inline static void
 release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
 {
-  __asm__ __volatile__("bcr 15,0" : : : "memory");
+  __sync_synchronize ();
   *(addr) = new_val;
 }
 
@@ -64,7 +50,7 @@ compare_and_swap_release(volatile obj_addr_t *addr,
 inline static void
 read_barrier()
 {
-  __asm__ __volatile__("bcr 15,0" : : : "memory");
+  __sync_synchronize ();
 }
 
 // Ensure that prior stores to memory are completed with respect to other
@@ -72,6 +58,6 @@ read_barrier()
 inline static void
 write_barrier()
 {
-  __asm__ __volatile__("bcr 15,0" : : : "memory");
+  __sync_synchronize ();
 }
 #endif