[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36

[Jo Shields]

The following commit has been merged in the master branch:
commit 12f8950772bb45d0044ce77f09ba316ff6c326c3
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Nov 5 00:22:36 2010 +0000

    Import Ubuntu upload 2.3-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index db0667d..e500ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+moon (2.3-0ubuntu2) maverick; urgency=low
+
+  * mono-2.6/libgc/include/private/gc_locks.h: For __ARM_EABI__ define
+    GC_test_and_set and GC_clear to use the atomic builtins.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 19 Sep 2010 14:30:56 +0200
+
 moon (2.3-0ubuntu1) maverick; urgency=low
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index 20a62e7..4eafbfc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use_AC_PATH_PROGS_to_satisfy_chromium_search.patch
 use_bundled_mono_runtime_for_smcs.patch
 include_config.h_in_all_files.patch
+use_atomic_builtins_on_armel.patch
diff --git a/debian/patches/use_atomic_builtins_on_armel.patch b/debian/patches/use_atomic_builtins_on_armel.patch
new file mode 100644
index 0000000..e6979f5
--- /dev/null
+++ b/debian/patches/use_atomic_builtins_on_armel.patch
@@ -0,0 +1,24 @@
+--- a/mono-2-6/libgc/include/private/gc_locks.h
++++ b/mono-2-6/libgc/include/private/gc_locks.h
+@@ -217,6 +217,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
+@@ -229,7 +235,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) {

-- 
moon