fix some symbol resolution issues in dynamic linker

[musl] / arch / x86_64 / atomic.h

diff --git a/arch/x86_64/atomic.h b/arch/x86_64/atomic.h
index e74e453..3235db1 100644 (file)
--- a/arch/x86_64/atomic.h
+++ b/arch/x86_64/atomic.h
@@ -1,37 +1,42 @@
-#ifndef _INTERNAA_ATOMIC_H
-#define _INTERNAA_ATOMIC_H
+#ifndef _INTERNAL_ATOMIC_H
+#define _INTERNAL_ATOMIC_H
 
 #include <stdint.h>
 
 static inline int a_ctz_64(uint64_t x)
 {
-       int r;
-       __asm__( "bsf %1,%0 ; jnz 1f ; bsf %2,%0 ; addl $32,%0\n1:"
-               : "=r"(r) : "r"((unsigned)x), "r"((unsigned)(x>>32)) );
+       long r;
+       __asm__( "bsf %1,%0" : "=r"(r) : "r"(x) );
        return r;
 }
 
+static inline int a_ctz_l(unsigned long x)
+{
+       long r;
+       __asm__( "bsf %1,%0" : "=r"(r) : "r"(x) );
+       return r;
+}
 
 static inline void a_and_64(volatile uint64_t *p, uint64_t v)
 {
-       __asm__( "lock ; andl %1, (%0) ; lock ; andl %2, 4(%0)"
-               : : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)) : "memory" );
+       __asm__( "lock ; andq %1, %0"
+                        : "=m"(*(long *)p) : "r"(v) : "memory" );
 }
 
 static inline void a_or_64(volatile uint64_t *p, uint64_t v)
 {
-       __asm__( "lock ; orl %1, (%0) ; lock ; orl %2, 4(%0)"
-               : : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)) : "memory" );
+       __asm__( "lock ; orq %1, %0"
+                        : "=m"(*(long *)p) : "r"(v) : "memory" );
 }
 
 static inline void a_store_l(volatile void *p, long x)
 {
-       __asm__( "movl %1, %0" : "=m"(*(long *)p) : "r"(x) : "memory" );
+       __asm__( "movq %1, %0" : "=m"(*(long *)p) : "r"(x) : "memory" );
 }
 
 static inline void a_or_l(volatile void *p, long v)
 {
-       __asm__( "lock ; orl %1, %0"
+       __asm__( "lock ; orq %1, %0"
                : "=m"(*(long *)p) : "r"(v) : "memory" );
 }
 
@@ -49,6 +54,13 @@ static inline long a_cas_l(volatile void *p, long t, long s)
        return t;
 }
 
+static inline int a_cas(volatile int *p, int t, int s)
+{
+       __asm__( "lock ; cmpxchgl %3, %1"
+               : "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+       return t;
+}
+
 static inline void *a_swap_p(void *volatile *x, void *v)
 {
        __asm__( "xchg %0, %1" : "=r"(v), "=m"(*(void **)x) : "0"(v) : "memory" );