diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-06-24 15:10:48 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-06-24 15:10:48 +0200 |
| commit | 1dc2afe522b1c6d23c4d16b23e083cc38c69da55 (patch) | |
| tree | 9d7e6a83cb9714c3147bce7accfd0642fa5c2581 /libpthread/nptl/sysdeps/sh | |
| parent | 59f3d4df3b644583311e89e84cc3fbae6aec8b32 (diff) | |
use uniform form of C99 keywords
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/sh')
| -rw-r--r-- | libpthread/nptl/sysdeps/sh/pthread_spin_lock.c | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sh/pthreaddef.h | 4 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sh/tls.h | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c index 2c72eb610..74fad3388 100644 --- a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c +++ b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c @@ -24,7 +24,7 @@ pthread_spin_lock (pthread_spinlock_t *lock) unsigned int val; do - __asm__ volatile ("tas.b @%1; movt %0" + __asm__ __volatile__ ("tas.b @%1; movt %0" : "=&r" (val) : "r" (lock) : "memory"); diff --git a/libpthread/nptl/sysdeps/sh/pthreaddef.h b/libpthread/nptl/sysdeps/sh/pthreaddef.h index c1902fb54..dc6a4f907 100644 --- a/libpthread/nptl/sysdeps/sh/pthreaddef.h +++ b/libpthread/nptl/sysdeps/sh/pthreaddef.h @@ -41,9 +41,9 @@ #define __exit_thread_inline(val) \ while (1) { \ if (__builtin_constant_p (val) && (val) == 0) \ - __asm__ volatile ("mov #0,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ + __asm__ __volatile__ ("mov #0,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ :: "i" (__NR_exit)); \ else \ - __asm__ volatile ("mov %1,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ + __asm__ __volatile__ ("mov %1,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \ :: "i" (__NR_exit), "r" (val)); \ } diff --git a/libpthread/nptl/sysdeps/sh/tls.h b/libpthread/nptl/sysdeps/sh/tls.h index 2c538eded..bbb11187a 100644 --- a/libpthread/nptl/sysdeps/sh/tls.h +++ b/libpthread/nptl/sysdeps/sh/tls.h @@ -94,7 +94,7 @@ typedef struct /* Install new dtv for current thread. */ # define INSTALL_NEW_DTV(dtv) \ ({ tcbhead_t *__tcbp; \ - __asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \ + __asm__ __volatile__ ("stc gbr,%0" : "=r" (__tcbp)); \ __tcbp->dtv = (dtv);}) /* Return dtv of given thread descriptor. */ @@ -105,12 +105,12 @@ typedef struct special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ # define TLS_INIT_TP(tcbp, secondcall) \ - ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); 0; }) + ({ __asm__ __volatile__ ("ldc %0,gbr" : : "r" (tcbp)); 0; }) /* Return the address of the dtv for the current thread. */ # define THREAD_DTV() \ ({ tcbhead_t *__tcbp; \ - __asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \ + __asm__ __volatile__ ("stc gbr,%0" : "=r" (__tcbp)); \ __tcbp->dtv;}) /* Return the thread descriptor for the current thread. @@ -120,7 +120,7 @@ typedef struct do not get optimized away. */ # define THREAD_SELF \ ({ struct pthread *__self; \ - __asm ("stc gbr,%0" : "=r" (__self)); \ + __asm__ ("stc gbr,%0" : "=r" (__self)); \ __self - 1;}) /* Magic for libthread_db to know how to do THREAD_SELF. */ @@ -143,15 +143,15 @@ typedef struct #define THREAD_GET_POINTER_GUARD() \ ({ tcbhead_t *__tcbp; \ - __asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \ + __asm__ __volatile__ ("stc gbr,%0" : "=r" (__tcbp)); \ __tcbp->pointer_guard;}) #define THREAD_SET_POINTER_GUARD(value) \ ({ tcbhead_t *__tcbp; \ - __asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \ + __asm__ __volatile__ ("stc gbr,%0" : "=r" (__tcbp)); \ __tcbp->pointer_guard = (value);}) #define THREAD_COPY_POINTER_GUARD(descr) \ ({ tcbhead_t *__tcbp; \ - __asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \ + __asm__ __volatile__ ("stc gbr,%0" : "=r" (__tcbp)); \ ((tcbhead_t *) (descr + 1))->pointer_guard = __tcbp->pointer_guard;}) /* Get and set the global scope generation counter in struct pthread. */ |