[gentoo-commits] gentoo-x86 commit in dev-lang/mono/files: mono-2.4-ppcbuild-fix.patch

[gentoo-commits] gentoo-x86 commit in dev-lang/mono/files: mono-2.4-ppcbuild-fix.patch

[Peter Alfredsen (loki_val)]

loki_val    09/04/10 23:11:09

  Added:                mono-2.4-ppcbuild-fix.patch
  Log:
  Add fix for build on ppc/ppc64 from upstream CVS
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch?rev=1.1&content-type=text/plain

Index: mono-2.4-ppcbuild-fix.patch
===================================================================
# From upstream CVS, fixes build on PPC/PPC64

--- mono-2-4/mono/libgc/include/private/gc_locks.h	2009/04/10 14:32:31	131471
+++ mono-2-4/mono/libgc/include/private/gc_locks.h	2009/04/10 14:34:27	131472
@@ -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;
         }