Package: libatomic-ops-dev
Version: 7.3~alpha1+git20111031-1
Justification: fails to build from source
Severity: serious
Tags: patch

Upstream commit https://github.com/ivmai/libatomic_ops/commit/30cea1b
fixes AO_compare_double_and_swap_double_full() which is broken on
gcc/x86 and causes `make check' to fail (tested on a sid x86 chroot).

-- 
Emanuele
diff --git c/src/atomic_ops/sysdeps/gcc/x86.h i/src/atomic_ops/sysdeps/gcc/x86.h
index b304dd0..e49f057 100644
--- c/src/atomic_ops/sysdeps/gcc/x86.h
+++ i/src/atomic_ops/sysdeps/gcc/x86.h
@@ -161,13 +161,16 @@ AO_compare_double_and_swap_double_full(volatile AO_double_t *addr,
   /* If PIC is turned on, we can't use %ebx as it is reserved for the
      GOT pointer.  We can save and restore %ebx because GCC won't be
      using it for anything else (such as any of the m operands) */
-  __asm__ __volatile__("pushl %%ebx;"   /* save ebx used for PIC GOT ptr */
-                       "movl %6,%%ebx;" /* move new_val2 to %ebx */
+  /* We use %edi (for new_val1) instead of a memory operand and swap    */
+  /* instruction instead of push/pop because some GCC releases have     */
+  /* a bug in processing memory operands (if address base is %esp) in   */
+  /* the inline assembly after push.                                    */
+  __asm__ __volatile__("xchg %%ebx,%6;" /* swap GOT ptr and new_val1 */
                        "lock; cmpxchg8b %0; setz %1;"
-                       "pop %%ebx;"     /* restore %ebx */
+                       "xchg %%ebx,%6;" /* restore ebx and edi */
                        : "=m"(*addr), "=a"(result)
                        : "m"(*addr), "d" (old_val2), "a" (old_val1),
-                         "c" (new_val2), "m" (new_val1) : "memory");
+                         "c" (new_val2), "D" (new_val1) : "memory");
 #else
   /* We can't just do the same thing in non-PIC mode, because GCC
    * might be using %ebx as the memory operand.  We could have ifdef'd

Reply via email to