From 1dc2afe522b1c6d23c4d16b23e083cc38c69da55 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 24 Jun 2010 15:10:48 +0200 Subject: use uniform form of C99 keywords Signed-off-by: Bernhard Reutner-Fischer --- .../sysdeps/unix/sysv/linux/alpha/pthread_once.c | 2 +- .../nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h | 20 ++++----- .../unix/sysv/linux/arm/unwind-forcedunwind.c | 4 +- .../sysdeps/unix/sysv/linux/arm/unwind-resume.c | 2 +- .../sysdeps/unix/sysv/linux/i386/lowlevellock.h | 34 +++++++-------- .../sysdeps/unix/sysv/linux/powerpc/lowlevellock.h | 2 +- .../sysdeps/unix/sysv/linux/powerpc/pthread_once.c | 2 +- .../unix/sysv/linux/powerpc/pthread_spin_unlock.c | 2 +- .../sysdeps/unix/sysv/linux/powerpc/sem_post.c | 4 +- .../nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h | 48 +++++++++++----------- .../sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 36 ++++++++-------- .../unix/sysv/linux/x86_64/pthread_setaffinity.c | 2 +- 12 files changed, 79 insertions(+), 79 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c index 8adf8b44e..86b062804 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c @@ -49,7 +49,7 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) Do this atomically. */ newval = __fork_generation | 1; - __asm __volatile ( + __asm__ __volatile__ ( "1: ldl_l %0, %2\n" " and %0, 2, %1\n" " bne %1, 2f\n" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h index b0586ea1e..8f63e2510 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h @@ -72,11 +72,11 @@ void __arm_link_error (void); /* Thumb-2 has ldrex/strex. However it does not have barrier instructions, so we still need to use the kernel helper. */ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ - ({ register __typeof (oldval) a_oldval asm ("r0"); \ - register __typeof (oldval) a_newval asm ("r1") = (newval); \ - register __typeof (mem) a_ptr asm ("r2") = (mem); \ - register __typeof (oldval) a_tmp asm ("r3"); \ - register __typeof (oldval) a_oldval2 asm ("r4") = (oldval); \ + ({ register __typeof (oldval) a_oldval __asm__ ("r0"); \ + register __typeof (oldval) a_newval __asm__ ("r1") = (newval); \ + register __typeof (mem) a_ptr __asm__ ("r2") = (mem); \ + register __typeof (oldval) a_tmp __asm__ ("r3"); \ + register __typeof (oldval) a_oldval2 __asm__ ("r4") = (oldval); \ __asm__ __volatile__ \ ("0:\tldr\t%[tmp],[%[ptr]]\n\t" \ "cmp\t%[tmp], %[old2]\n\t" \ @@ -95,11 +95,11 @@ void __arm_link_error (void); a_tmp; }) #else #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ - ({ register __typeof (oldval) a_oldval asm ("r0"); \ - register __typeof (oldval) a_newval asm ("r1") = (newval); \ - register __typeof (mem) a_ptr asm ("r2") = (mem); \ - register __typeof (oldval) a_tmp asm ("r3"); \ - register __typeof (oldval) a_oldval2 asm ("r4") = (oldval); \ + ({ register __typeof (oldval) a_oldval __asm__ ("r0"); \ + register __typeof (oldval) a_newval __asm__ ("r1") = (newval); \ + register __typeof (mem) a_ptr __asm__ ("r2") = (mem); \ + register __typeof (oldval) a_tmp __asm__ ("r3"); \ + register __typeof (oldval) a_oldval2 __asm__ ("r4") = (oldval); \ __asm__ __volatile__ \ ("0:\tldr\t%[tmp],[%[ptr]]\n\t" \ "cmp\t%[tmp], %[old2]\n\t" \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c index 011746d0e..b6253dd6b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c @@ -40,7 +40,7 @@ pthread_cancel_init (void) if (__builtin_expect (libgcc_s_handle != NULL, 1)) { /* Force gcc to reload all values. */ - asm volatile ("" ::: "memory"); + __asm__ __volatile__ ("" ::: "memory"); return; } @@ -85,7 +85,7 @@ __unwind_freeres (void) ARM unwinder relies on register state at entrance. So we write this in assembly. */ -asm ( +__asm__ ( " .globl _Unwind_Resume\n" " .type _Unwind_Resume, %function\n" "_Unwind_Resume:\n" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c index cdab10e30..afafcdacf 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c @@ -48,7 +48,7 @@ init (void) ARM unwinder relies on register state at entrance. So we write this in assembly. */ -asm ( +__asm__ ( " .globl _Unwind_Resume\n" " .type _Unwind_Resume, %function\n" "_Unwind_Resume:\n" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index a40d84e75..ab1a9395e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -210,7 +210,7 @@ LLL_STUB_UNWIND_INFO_END ({ \ int __status; \ register __typeof (val) _val __asm__ ("edx") = (val); \ - __asm__ __volatile (LLL_EBX_LOAD \ + __asm__ __volatile__ (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ : "=a" (__status) \ @@ -226,7 +226,7 @@ LLL_STUB_UNWIND_INFO_END do { \ int __ignore; \ register __typeof (nr) _nr __asm__ ("edx") = (nr); \ - __asm__ __volatile (LLL_EBX_LOAD \ + __asm__ __volatile__ (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ : "=a" (__ignore) \ @@ -254,7 +254,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_trylock(futex) \ ({ int ret; \ - __asm__ __volatile (__lll_trylock_asm \ + __asm__ __volatile__ (__lll_trylock_asm \ : "=a" (ret), "=m" (futex) \ : "r" (LLL_LOCK_INITIALIZER_LOCKED), "m" (futex), \ "0" (LLL_LOCK_INITIALIZER), \ @@ -264,7 +264,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_trylock(futex, id) \ ({ int ret; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (futex) \ : "r" (id), "m" (futex), \ "0" (LLL_LOCK_INITIALIZER) \ @@ -274,7 +274,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_cond_trylock(futex) \ ({ int ret; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (futex) \ : "r" (LLL_LOCK_INITIALIZER_WAITERS), \ "m" (futex), "0" (LLL_LOCK_INITIALIZER) \ @@ -294,7 +294,7 @@ LLL_STUB_UNWIND_INFO_END (void) \ ({ int ignore1, ignore2; \ if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \ - __asm__ __volatile (__lll_lock_asm_start \ + __asm__ __volatile__ (__lll_lock_asm_start \ "jnz _L_lock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_lock_%=,@function\n" \ @@ -313,7 +313,7 @@ LLL_STUB_UNWIND_INFO_END else \ { \ int ignore3; \ - __asm__ __volatile (__lll_lock_asm_start \ + __asm__ __volatile__ (__lll_lock_asm_start \ "jnz _L_lock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_lock_%=,@function\n" \ @@ -337,7 +337,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_lock(futex, id, private) \ ({ int __result, ignore1, ignore2; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ "jnz _L_robust_lock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_lock_%=,@function\n" \ @@ -362,7 +362,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_cond_lock(futex, private) \ (void) \ ({ int ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ "jnz _L_cond_lock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_cond_lock_%=,@function\n" \ @@ -384,7 +384,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_cond_lock(futex, id, private) \ ({ int __result, ignore1, ignore2; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %2\n\t" \ "jnz _L_robust_cond_lock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_cond_lock_%=,@function\n" \ @@ -407,7 +407,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_timedlock(futex, timeout, private) \ ({ int __result, ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ "jnz _L_timedlock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_timedlock_%=,@function\n" \ @@ -430,7 +430,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_timedlock(futex, timeout, id, private) \ ({ int __result, ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ "jnz _L_robust_timedlock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_timedlock_%=,@function\n" \ @@ -463,7 +463,7 @@ LLL_STUB_UNWIND_INFO_END (void) \ ({ int ignore; \ if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \ - __asm__ __volatile (__lll_unlock_asm \ + __asm__ __volatile__ (__lll_unlock_asm \ "jne _L_unlock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_unlock_%=,@function\n" \ @@ -481,7 +481,7 @@ LLL_STUB_UNWIND_INFO_END else \ { \ int ignore2; \ - __asm__ __volatile (__lll_unlock_asm \ + __asm__ __volatile__ (__lll_unlock_asm \ "jne _L_unlock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_unlock_%=,@function\n" \ @@ -504,7 +504,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_unlock(futex, private) \ (void) \ ({ int ignore, ignore2; \ - __asm__ __volatile (LOCK_INSTR "andl %3, %0\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "andl %3, %0\n\t" \ "jne _L_robust_unlock_%=\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_unlock_%=,@function\n" \ @@ -528,7 +528,7 @@ LLL_STUB_UNWIND_INFO_END (void) \ ({ int __ignore; \ register int _nr __asm__ ("edx") = 1; \ - __asm__ __volatile (LOCK_INSTR "orl %5, (%2)\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "orl %5, (%2)\n\t" \ LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ @@ -553,7 +553,7 @@ LLL_STUB_UNWIND_INFO_END int __ignore; \ register __typeof (tid) _tid __asm__ ("edx") = (tid); \ if (_tid != 0) \ - __asm__ __volatile (LLL_EBX_LOAD \ + __asm__ __volatile__ (LLL_EBX_LOAD \ "1:\tmovl %1, %%eax\n\t" \ LLL_ENTER_KERNEL \ "cmpl $0, (%%ebx)\n\t" \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h index ecfa9702e..2c2557d56 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h @@ -164,7 +164,7 @@ /* Set *futex to ID if it is 0, atomically. Returns the old value */ #define __lll_robust_trylock(futex, id) \ ({ int __val; \ - __asm __volatile ("1: lwarx %0,0,%2" MUTEX_HINT_ACQ "\n" \ + __asm__ __volatile__ ("1: lwarx %0,0,%2" MUTEX_HINT_ACQ "\n" \ " cmpwi 0,%0,0\n" \ " bne 2f\n" \ " stwcx. %3,0,%2\n" \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c index bc5f3f0f1..a495b64f3 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c @@ -52,7 +52,7 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) Do this atomically. */ newval = __fork_generation | 1; - __asm __volatile ("1: lwarx %0,0,%3\n" + __asm__ __volatile__ ("1: lwarx %0,0,%3\n" " andi. %1,%0,2\n" " bne 2f\n" " stwcx. %4,0,%3\n" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c index 90f2dc67c..4be31ff6b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c @@ -23,7 +23,7 @@ int pthread_spin_unlock (pthread_spinlock_t *lock) { - __asm __volatile (__lll_rel_instr ::: "memory"); + __asm__ __volatile__ (__lll_rel_instr ::: "memory"); *lock = 0; return 0; } diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c index 0082c570a..cdc8be7e7 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c @@ -29,9 +29,9 @@ __new_sem_post (sem_t *sem) { struct new_sem *isem = (struct new_sem *) sem; - __asm __volatile (__lll_rel_instr ::: "memory"); + __asm__ __volatile__ (__lll_rel_instr ::: "memory"); atomic_increment (&isem->value); - __asm __volatile (__lll_acq_instr ::: "memory"); + __asm__ __volatile__ (__lll_acq_instr ::: "memory"); if (isem->nwaiters > 0) { int err = lll_futex_wake (&isem->value, 1, diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h index 19ce7fe40..0ea67e0ef 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h @@ -99,7 +99,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_trylock(futex) \ ({ unsigned char __result; \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -121,7 +121,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_trylock(futex, id) \ ({ unsigned char __result; \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -143,7 +143,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_cond_trylock(futex) \ ({ unsigned char __result; \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -165,7 +165,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_lock(futex, private) \ (void) ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -190,7 +190,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_lock(futex, id, private) \ ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -211,7 +211,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; always wakeup waiters. */ #define lll_cond_lock(futex, private) \ (void) ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -229,7 +229,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_cond_lock(futex, id, private) \ ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -248,7 +248,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_timedlock(futex, timeout, private) \ ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -267,7 +267,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_timedlock(futex, timeout, id, private) \ ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ nop\n\ @@ -287,7 +287,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_unlock(futex, private) \ (void) ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ mov r15,r1\n\ @@ -310,7 +310,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_unlock(futex, private) \ (void) ({ int __result, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ mov r15,r1\n\ @@ -326,7 +326,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_robust_dead(futex, private) \ (void) ({ int __ignore, *__futex = &(futex); \ - __asm __volatile ("\ + __asm__ __volatile__ ("\ .align 2\n\ mova 1f,r0\n\ mov r15,r1\n\ @@ -354,13 +354,13 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_futex_timed_wait(futex, val, timeout, private) \ ({ \ int __status; \ - register unsigned long __r3 __asm ("r3") = SYS_futex; \ - register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \ - register unsigned long __r5 __asm ("r5") \ + register unsigned long __r3 __asm__ ("r3") = SYS_futex; \ + register unsigned long __r4 __asm__ ("r4") = (unsigned long) (futex); \ + register unsigned long __r5 __asm__ ("r5") \ = __lll_private_flag (FUTEX_WAIT, private); \ - register unsigned long __r6 __asm ("r6") = (unsigned long) (val); \ - register unsigned long __r7 __asm ("r7") = (timeout); \ - __asm __volatile (SYSCALL_WITH_INST_PAD \ + register unsigned long __r6 __asm__ ("r6") = (unsigned long) (val); \ + register unsigned long __r7 __asm__ ("r7") = (timeout); \ + __asm__ __volatile__ (SYSCALL_WITH_INST_PAD \ : "=z" (__status) \ : "r" (__r3), "r" (__r4), "r" (__r5), \ "r" (__r6), "r" (__r7) \ @@ -372,13 +372,13 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden; #define lll_futex_wake(futex, nr, private) \ do { \ int __ignore; \ - register unsigned long __r3 __asm ("r3") = SYS_futex; \ - register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \ - register unsigned long __r5 __asm ("r5") \ + register unsigned long __r3 __asm__ ("r3") = SYS_futex; \ + register unsigned long __r4 __asm__ ("r4") = (unsigned long) (futex); \ + register unsigned long __r5 __asm__ ("r5") \ = __lll_private_flag (FUTEX_WAKE, private); \ - register unsigned long __r6 __asm ("r6") = (unsigned long) (nr); \ - register unsigned long __r7 __asm ("r7") = 0; \ - __asm __volatile (SYSCALL_WITH_INST_PAD \ + register unsigned long __r6 __asm__ ("r6") = (unsigned long) (nr); \ + register unsigned long __r7 __asm__ ("r7") = 0; \ + __asm__ __volatile__ (SYSCALL_WITH_INST_PAD \ : "=z" (__ignore) \ : "r" (__r3), "r" (__r4), "r" (__r5), \ "r" (__r6), "r" (__r7) \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 7c042fc80..ffab81eb5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -212,7 +212,7 @@ LLL_STUB_UNWIND_INFO_END register const struct timespec *__to __asm__ ("r10") = timeout; \ int __status; \ register __typeof (val) _val __asm__ ("edx") = (val); \ - __asm__ __volatile ("syscall" \ + __asm__ __volatile__ ("syscall" \ : "=a" (__status) \ : "0" (SYS_futex), "D" (futex), \ "S" (__lll_private_flag (FUTEX_WAIT, private)), \ @@ -226,7 +226,7 @@ LLL_STUB_UNWIND_INFO_END do { \ int __ignore; \ register __typeof (nr) _nr __asm__ ("edx") = (nr); \ - __asm__ __volatile ("syscall" \ + __asm__ __volatile__ ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ "S" (__lll_private_flag (FUTEX_WAKE, private)), \ @@ -253,7 +253,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_trylock(futex) \ ({ int ret; \ - __asm__ __volatile (__lll_trylock_asm \ + __asm__ __volatile__ (__lll_trylock_asm \ : "=a" (ret), "=m" (futex) \ : "r" (LLL_LOCK_INITIALIZER_LOCKED), "m" (futex), \ "0" (LLL_LOCK_INITIALIZER) \ @@ -262,7 +262,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_trylock(futex, id) \ ({ int ret; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (futex) \ : "r" (id), "m" (futex), "0" (LLL_LOCK_INITIALIZER) \ : "memory"); \ @@ -270,7 +270,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_cond_trylock(futex) \ ({ int ret; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %2, %1" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %2, %1" \ : "=a" (ret), "=m" (futex) \ : "r" (LLL_LOCK_INITIALIZER_WAITERS), \ "m" (futex), "0" (LLL_LOCK_INITIALIZER) \ @@ -294,7 +294,7 @@ LLL_STUB_UNWIND_INFO_END (void) \ ({ int ignore1, ignore2, ignore3; \ if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \ - __asm__ __volatile (__lll_lock_asm_start \ + __asm__ __volatile__ (__lll_lock_asm_start \ ".subsection 1\n\t" \ ".type _L_lock_%=, @function\n" \ "_L_lock_%=:\n" \ @@ -312,7 +312,7 @@ LLL_STUB_UNWIND_INFO_END : "0" (1), "m" (futex), "3" (0) \ : "cx", "r11", "cc", "memory"); \ else \ - __asm__ __volatile (__lll_lock_asm_start \ + __asm__ __volatile__ (__lll_lock_asm_start \ ".subsection 1\n\t" \ ".type _L_lock_%=, @function\n" \ "_L_lock_%=:\n" \ @@ -333,7 +333,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_lock(futex, id, private) \ ({ int result, ignore1, ignore2; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_lock_%=, @function\n" \ @@ -356,7 +356,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_cond_lock(futex, private) \ (void) \ ({ int ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_cond_lock_%=, @function\n" \ @@ -378,7 +378,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_cond_lock(futex, id, private) \ ({ int result, ignore1, ignore2; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %4, %2\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_cond_lock_%=, @function\n" \ @@ -401,7 +401,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_timedlock(futex, timeout, private) \ ({ int result, ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %4\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %4\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_timedlock_%=, @function\n" \ @@ -425,7 +425,7 @@ LLL_STUB_UNWIND_INFO_END #define lll_robust_timedlock(futex, timeout, id, private) \ ({ int result, ignore1, ignore2, ignore3; \ - __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %4\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %4\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_timedlock_%=, @function\n" \ @@ -464,7 +464,7 @@ LLL_STUB_UNWIND_INFO_END (void) \ ({ int ignore; \ if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \ - __asm__ __volatile (__lll_unlock_asm_start \ + __asm__ __volatile__ (__lll_unlock_asm_start \ ".subsection 1\n\t" \ ".type _L_unlock_%=, @function\n" \ "_L_unlock_%=:\n" \ @@ -481,7 +481,7 @@ LLL_STUB_UNWIND_INFO_END : "m" (futex) \ : "ax", "cx", "r11", "cc", "memory"); \ else \ - __asm__ __volatile (__lll_unlock_asm_start \ + __asm__ __volatile__ (__lll_unlock_asm_start \ ".subsection 1\n\t" \ ".type _L_unlock_%=, @function\n" \ "_L_unlock_%=:\n" \ @@ -503,7 +503,7 @@ LLL_STUB_UNWIND_INFO_END do \ { \ int ignore; \ - __asm__ __volatile (LOCK_INSTR "andl %2, %0\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "andl %2, %0\n\t" \ "jne 1f\n\t" \ ".subsection 1\n\t" \ ".type _L_robust_unlock_%=, @function\n" \ @@ -528,7 +528,7 @@ LLL_STUB_UNWIND_INFO_END do \ { \ int ignore; \ - __asm__ __volatile (LOCK_INSTR "orl %3, (%2)\n\t" \ + __asm__ __volatile__ (LOCK_INSTR "orl %3, (%2)\n\t" \ "syscall" \ : "=m" (futex), "=a" (ignore) \ : "D" (&(futex)), "i" (FUTEX_OWNER_DIED), \ @@ -544,7 +544,7 @@ LLL_STUB_UNWIND_INFO_END register int __nr_move __asm__ ("r10") = nr_move; \ register void *__mutex __asm__ ("r8") = mutex; \ register int __val __asm__ ("r9") = val; \ - __asm__ __volatile ("syscall" \ + __asm__ __volatile__ ("syscall" \ : "=a" (__res) \ : "0" (__NR_futex), "D" ((void *) ftx), \ "S" (__lll_private_flag (FUTEX_CMP_REQUEUE, \ @@ -568,7 +568,7 @@ LLL_STUB_UNWIND_INFO_END int __ignore; \ register __typeof (tid) _tid __asm__ ("edx") = (tid); \ if (_tid != 0) \ - __asm__ __volatile ("xorq %%r10, %%r10\n\t" \ + __asm__ __volatile__ ("xorq %%r10, %%r10\n\t" \ "1:\tmovq %2, %%rax\n\t" \ "syscall\n\t" \ "cmpl $0, (%%rdi)\n\t" \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c index 640d3044f..e60113a76 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c @@ -2,7 +2,7 @@ #define RESET_VGETCPU_CACHE() \ do { \ - asm volatile ("movl %0, %%fs:%P1\n\t" \ + __asm__ __volatile__ ("movl %0, %%fs:%P1\n\t" \ "movl %0, %%fs:%P2" \ : \ : "ir" (0), "i" (offsetof (struct pthread, \ -- cgit v1.2.3