Don't use matching constraints for asm mem parameters. This makes the code

Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>

        * glib/gatomic.c: Don't use matching constraints for asm mem
        parameters. This makes the code match with current glibc, and
        quiets some warnings with gcc 3.4.

diff --git a/ChangeLog b/ChangeLog
index 8b02addf239dc58f1c152b82167fc76a44d1dd0b..b0a7047cfdd480255c4731744a887ce01c70e5a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/gatomic.c: Don't use matching constraints for asm mem
+       parameters. This makes the code match with current glibc, and
+       quiets some warnings with gcc 3.4.
+
 2005-02-05  Tor Lillqvist  <tml@novell.com>
 
        * configure.in (G_LIBS_EXTRA)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8b02addf239dc58f1c152b82167fc76a44d1dd0b..b0a7047cfdd480255c4731744a887ce01c70e5a6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/gatomic.c: Don't use matching constraints for asm mem
+       parameters. This makes the code match with current glibc, and
+       quiets some warnings with gcc 3.4.
+
 2005-02-05  Tor Lillqvist  <tml@novell.com>
 
        * configure.in (G_LIBS_EXTRA)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8b02addf239dc58f1c152b82167fc76a44d1dd0b..b0a7047cfdd480255c4731744a887ce01c70e5a6 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/gatomic.c: Don't use matching constraints for asm mem
+       parameters. This makes the code match with current glibc, and
+       quiets some warnings with gcc 3.4.
+
 2005-02-05  Tor Lillqvist  <tml@novell.com>
 
        * configure.in (G_LIBS_EXTRA)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8b02addf239dc58f1c152b82167fc76a44d1dd0b..b0a7047cfdd480255c4731744a887ce01c70e5a6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Feb  6 12:09:55 2005  Manish Singh  <yosh@gimp.org>
+
+       * glib/gatomic.c: Don't use matching constraints for asm mem
+       parameters. This makes the code match with current glibc, and
+       quiets some warnings with gcc 3.4.
+
 2005-02-05  Tor Lillqvist  <tml@novell.com>
 
        * configure.in (G_LIBS_EXTRA)

diff --git a/glib/gatomic.c b/glib/gatomic.c
index a8aca71b708b6719a272eaa34b174c49b2379d1b..d4af389944d7773223593708b8554734b7702e1d 100644 (file)
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -264,9 +264,9 @@ g_atomic_pointer_compare_and_exchange (gpointer *atomic,
 }
 
 # elif defined (G_ATOMIC_POWERPC)
-/* Adapted from CVS version 1.12 of glibc's sysdeps/powerpc/bits/atomic.h 
- * and CVS version 1.3 of glibc's sysdeps/powerpc/powerpc32/bits/atomic.h 
- * and CVS version 1.2 of glibc's sysdeps/powerpc/powerpc64/bits/atomic.h 
+/* Adapted from CVS version 1.16 of glibc's sysdeps/powerpc/bits/atomic.h 
+ * and CVS version 1.4 of glibc's sysdeps/powerpc/powerpc32/bits/atomic.h 
+ * and CVS version 1.7 of glibc's sysdeps/powerpc/powerpc64/bits/atomic.h 
  */
 #   ifdef __OPTIMIZE__
 /* Non-optimizing compile bails on the following two asm statements
@@ -281,7 +281,7 @@ g_atomic_int_exchange_and_add (gint *atomic,
                        "         stwcx.  %1,0,%3\n"
                        "         bne-    1b"
                        : "=&b" (result), "=&r" (temp), "=m" (*atomic)
-                       : "b" (atomic), "r" (val), "2" (*atomic)
+                       : "b" (atomic), "r" (val), "m" (*atomic)
                        : "cr0", "memory");
   return result;
 }
@@ -297,7 +297,7 @@ g_atomic_int_add (gint *atomic,
                        "         stwcx.  %1,0,%3\n"
                        "         bne-    1b"
                        : "=&b" (result), "=&r" (temp), "=m" (*atomic)
-                       : "b" (atomic), "r" (val), "2" (*atomic)
+                       : "b" (atomic), "r" (val), "m" (*atomic)
                        : "cr0", "memory");
 }
 #   else /* !__OPTIMIZE__ */