aboutsummaryrefslogtreecommitdiff
path: root/boehm-gc
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2009-12-13 22:44:27 +0000
committerMatthias Klose <doko@ubuntu.com>2009-12-13 22:44:27 +0000
commit636f443380d11a0783a7cce0d940656d8fde162a (patch)
treec905c4a14d4f1d7e89745b13416dac4037c5cab2 /boehm-gc
parentd6c6143a0e04f6512f70bad1c961edd0530fe18e (diff)
2009-12-09 Matthias Klose <doko@ubuntu.com>
* include/private/gc_locks.h: For __ARM_EABI__ define GC_test_and_set GC_clear to use the atomic builtins. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@155198 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
-rw-r--r--boehm-gc/ChangeLog5
-rw-r--r--boehm-gc/include/private/gc_locks.h8
2 files changed, 12 insertions, 1 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index dd87502774c..542ddc1e0b6 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-09 Matthias Klose <doko@ubuntu.com>
+
+ * include/private/gc_locks.h: For __ARM_EABI__ define
+ GC_test_and_set GC_clear to use the atomic builtins.
+
2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate.
diff --git a/boehm-gc/include/private/gc_locks.h b/boehm-gc/include/private/gc_locks.h
index d1bb2e4521a..54cfdb92d37 100644
--- a/boehm-gc/include/private/gc_locks.h
+++ b/boehm-gc/include/private/gc_locks.h
@@ -207,6 +207,12 @@
# define GC_CLEAR_DEFINED
# endif /* ALPHA */
# ifdef ARM32
+# define GC_TEST_AND_SET_DEFINED
+# if (__GNUC__>4)||((__GNUC__==4)&&(__GNUC_MINOR__>=5)) && defined(__ARM_EABI__)
+# define GC_CLEAR_DEFINED
+# define GC_test_and_set(addr) __sync_lock_test_and_set (addr, 1)
+# define GC_clear(addr) __sync_lock_release (addr)
+# else
inline static int GC_test_and_set(volatile unsigned int *addr) {
int oldval;
/* SWP on ARM is very similar to XCHG on x86. Doesn't lock the
@@ -219,7 +225,7 @@
: "memory");
return oldval;
}
-# define GC_TEST_AND_SET_DEFINED
+# endif
# endif /* ARM32 */
# ifdef CRIS
inline static int GC_test_and_set(volatile unsigned int *addr) {