diff options
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/i386')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/i386/pspinlock.c | 6 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/i386/tls.h | 10 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/i386/useldt.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libpthread/linuxthreads/sysdeps/i386/pspinlock.c b/libpthread/linuxthreads/sysdeps/i386/pspinlock.c index e4ec24a0b..c9c62724b 100644 --- a/libpthread/linuxthreads/sysdeps/i386/pspinlock.c +++ b/libpthread/linuxthreads/sysdeps/i386/pspinlock.c @@ -35,7 +35,7 @@ int __pthread_spin_lock (pthread_spinlock_t *lock) { - asm volatile + __asm__ __volatile__ ("\n" "1:\n\t" "lock; decl %0\n\t" @@ -58,7 +58,7 @@ __pthread_spin_trylock (pthread_spinlock_t *lock) { int oldval; - asm volatile + __asm__ __volatile__ ("xchgl %0,%1" : "=r" (oldval), "=m" (*lock) : "0" (0)); @@ -70,7 +70,7 @@ weak_alias (__pthread_spin_trylock, pthread_spin_trylock) int __pthread_spin_unlock (pthread_spinlock_t *lock) { - asm volatile + __asm__ __volatile__ ("movl $1,%0" : "=m" (*lock)); return 0; diff --git a/libpthread/linuxthreads/sysdeps/i386/tls.h b/libpthread/linuxthreads/sysdeps/i386/tls.h index f230a33ba..2abd3a093 100644 --- a/libpthread/linuxthreads/sysdeps/i386/tls.h +++ b/libpthread/linuxthreads/sysdeps/i386/tls.h @@ -136,7 +136,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ { nr, (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \ 1, 0, 0, 1, 0, 1, 0 }; \ int result; \ - asm volatile (TLS_LOAD_EBX \ + __asm__ __volatile__ (TLS_LOAD_EBX \ "int $0x80\n\t" \ TLS_LOAD_EBX \ : "=a" (result) \ @@ -147,7 +147,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ "m" (ldt_entry), TLS_EBX_ARG (1), "c" (&ldt_entry), \ "d" (sizeof (ldt_entry))); \ __builtin_expect (result, 0) == 0 \ - ? ({ asm ("movw %w0, %%gs" : : "q" ((nr) * 8 + 7)); NULL; }) \ + ? ({ __asm__ ("movw %w0, %%gs" : : "q" ((nr) * 8 + 7)); NULL; }) \ : "cannot set up LDT for thread-local storage\n"; \ })) @@ -159,9 +159,9 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ int result; \ if (secondcall) \ ldt_entry.entry_number = ({ int _gs; \ - asm ("movw %%gs, %w0" : "=q" (_gs)); \ + __asm__ ("movw %%gs, %w0" : "=q" (_gs)); \ (_gs & 0xffff) >> 3; }); \ - asm volatile (TLS_LOAD_EBX \ + __asm__ __volatile__ (TLS_LOAD_EBX \ "int $0x80\n\t" \ TLS_LOAD_EBX \ : "=a" (result), "=m" (ldt_entry.entry_number) \ @@ -171,7 +171,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ here. */ \ TLS_EBX_ARG (&ldt_entry), "m" (ldt_entry)); \ if (__builtin_expect (result, 0) == 0) \ - asm ("movw %w0, %%gs" : : "q" (ldt_entry.entry_number * 8 + 3)); \ + __asm__ ("movw %w0, %%gs" : : "q" (ldt_entry.entry_number * 8 + 3)); \ result; \ }) diff --git a/libpthread/linuxthreads/sysdeps/i386/useldt.h b/libpthread/linuxthreads/sysdeps/i386/useldt.h index 4ac82f1ab..a2eb53fed 100644 --- a/libpthread/linuxthreads/sysdeps/i386/useldt.h +++ b/libpthread/linuxthreads/sysdeps/i386/useldt.h @@ -72,7 +72,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); 1, 0, 0, 1, 0, 1, 0 }; \ if (__modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) \ abort (); \ - asm ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \ + __asm__ ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \ }) #ifdef __PIC__ @@ -98,14 +98,14 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); int __gs; \ if (DO_SET_THREAD_AREA_REUSE (nr)) \ { \ - asm ("movw %%gs, %w0" : "=q" (__gs)); \ + __asm__ ("movw %%gs, %w0" : "=q" (__gs)); \ struct modify_ldt_ldt_s ldt_entry = \ { (__gs & 0xffff) >> 3, \ (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \ 1, 0, 0, 1, 0, 1, 0 }; \ \ int __result; \ - __asm (USETLS_LOAD_EBX \ + __asm__ (USETLS_LOAD_EBX \ "movl %2, %%eax\n\t" \ "int $0x80\n\t" \ USETLS_LOAD_EBX \ @@ -114,7 +114,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); "m" (ldt_entry) \ : "memory"); \ if (__result == 0) \ - asm ("movw %w0, %%gs" :: "q" (__gs)); \ + __asm__ ("movw %w0, %%gs" :: "q" (__gs)); \ else \ __gs = -1; \ } \ @@ -125,7 +125,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \ 1, 0, 0, 1, 0, 1, 0 }; \ int __result; \ - __asm (USETLS_LOAD_EBX \ + __asm__ (USETLS_LOAD_EBX \ "movl %2, %%eax\n\t" \ "int $0x80\n\t" \ USETLS_LOAD_EBX \ @@ -136,7 +136,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); if (__result == 0) \ { \ __gs = (ldt_entry.entry_number << 3) + 3; \ - asm ("movw %w0, %%gs" : : "q" (__gs)); \ + __asm__ ("movw %w0, %%gs" : : "q" (__gs)); \ } \ else \ __gs = -1; \ |