[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-2-8-g49634c6

[Mirco Bauer]

The following commit has been merged in the master branch:
commit a8e3e6b080354e92b5465e180e0ac44f929dde6b
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 14:18:56 2009 +0200

      * debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch:
        + Fixes the build on PPC when using GCC 4.4.

diff --git a/debian/changelog b/debian/changelog
index b5d8e3b..e9547b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mono (2.4+dfsg-3) unstable; urgency=low
     debian/update-shlibs.local.sh:
     + Removed libgda-2 entry for the benefit of dh_clideps not picking that as
       Suggests for libmono-system-data{1,2}.0-cil up. (Closes: #531870)
+  * debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch:
+    + Fixes the build on PPC when using GCC 4.4.
 
  -- Mirco Bauer <meebey at debian.org>  Mon, 25 May 2009 20:46:12 +0200
 
diff --git a/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch b/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
new file mode 100755
index 0000000..4cd2596
--- /dev/null
+++ b/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_ppc_build_using_gcc-4.4_r131472.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch taken from upstream's SVN, revision: r131472
+## DP: 2009-04-10  Zoltan Varga  <vargaz at gmail.com>
+## DP: * include/private/gc_locks.h (GC_test_and_set): Merge a change from libgc
+## DP:   libatomic-ops to fix the ppc build with gcc 4.4.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/libgc/include/private/gc_locks.h mono-2.4+dfsg/libgc/include/private/gc_locks.h
+--- mono-2.4+dfsg~/libgc/include/private/gc_locks.h	2009-02-14 00:32:31.000000000 +0100
++++ mono-2.4+dfsg/libgc/include/private/gc_locks.h	2009-06-13 14:14:44.000000000 +0200
+@@ -160,15 +160,15 @@
+           int temp = 1; /* locked value */
+ 
+           __asm__ __volatile__(
+-               "1:\tlwarx %0,0,%3\n"   /* load and reserve               */
++               "1:\tlwarx %0,0,%1\n"   /* load and reserve               */
+                "\tcmpwi %0, 0\n"       /* if load is                     */
+                "\tbne 2f\n"            /*   non-zero, return already set */
+                "\tstwcx. %2,0,%1\n"    /* else store conditional         */
+                "\tbne- 1b\n"           /* retry if lost reservation      */
+                "\tsync\n"              /* import barrier                 */
+                "2:\t\n"                /* oldval is zero if we set       */
+-              : "=&r"(oldval), "=p"(addr)
+-              : "r"(temp), "1"(addr)
++              : "=&r"(oldval)
++              : "r"(addr), "r"(temp)
+               : "cr0","memory");
+           return oldval;
+         }
+y
\ No newline at end of file

-- 
mono