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 /libc/sysdeps/linux/sparc | |
parent | 59f3d4df3b644583311e89e84cc3fbae6aec8b32 (diff) |
use uniform form of C99 keywords
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/sysdeps/linux/sparc')
-rw-r--r-- | libc/sysdeps/linux/sparc/bits/atomic.h | 20 | ||||
-rw-r--r-- | libc/sysdeps/linux/sparc/bits/syscalls.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libc/sysdeps/linux/sparc/bits/atomic.h b/libc/sysdeps/linux/sparc/bits/atomic.h index f625eb92a..16c3c78c9 100644 --- a/libc/sysdeps/linux/sparc/bits/atomic.h +++ b/libc/sysdeps/linux/sparc/bits/atomic.h @@ -69,7 +69,7 @@ volatile unsigned char __sparc32_atomic_locks[64] unsigned int __idx = (((long) addr >> 2) ^ ((long) addr >> 12)) \ & 63; \ do \ - __asm __volatile ("ldstub %1, %0" \ + __asm__ __volatile__ ("ldstub %1, %0" \ : "=r" (__old_lock), \ "=m" (__sparc32_atomic_locks[__idx]) \ : "m" (__sparc32_atomic_locks[__idx]) \ @@ -83,7 +83,7 @@ volatile unsigned char __sparc32_atomic_locks[64] { \ __sparc32_atomic_locks[(((long) addr >> 2) \ ^ ((long) addr >> 12)) & 63] = 0; \ - __asm __volatile ("" ::: "memory"); \ + __asm__ __volatile__ ("" ::: "memory"); \ } \ while (0) @@ -92,7 +92,7 @@ volatile unsigned char __sparc32_atomic_locks[64] { \ unsigned int __old_lock; \ do \ - __asm __volatile ("ldstub %1, %0" \ + __asm__ __volatile__ ("ldstub %1, %0" \ : "=r" (__old_lock), "=m" (*(addr)) \ : "m" (*(addr)) \ : "memory"); \ @@ -104,7 +104,7 @@ volatile unsigned char __sparc32_atomic_locks[64] do \ { \ *(char *) (addr) = 0; \ - __asm __volatile ("" ::: "memory"); \ + __asm__ __volatile__ ("" ::: "memory"); \ } \ while (0) @@ -112,14 +112,14 @@ volatile unsigned char __sparc32_atomic_locks[64] #ifndef SHARED # define __v9_compare_and_exchange_val_32_acq(mem, newval, oldval) \ ({ \ - register __typeof (*(mem)) __acev_tmp __asm ("%g6"); \ - register __typeof (mem) __acev_mem __asm ("%g1") = (mem); \ - register __typeof (*(mem)) __acev_oldval __asm ("%g5"); \ + register __typeof (*(mem)) __acev_tmp __asm__ ("%g6"); \ + register __typeof (mem) __acev_mem __asm__ ("%g1") = (mem); \ + register __typeof (*(mem)) __acev_oldval __asm__ ("%g5"); \ __acev_tmp = (newval); \ __acev_oldval = (oldval); \ /* .word 0xcde05005 is cas [%g1], %g5, %g6. Can't use cas here though, \ because as will then mark the object file as V8+ arch. */ \ - __asm __volatile (".word 0xcde05005" \ + __asm__ __volatile__ (".word 0xcde05005" \ : "+r" (__acev_tmp), "=m" (*__acev_mem) \ : "r" (__acev_oldval), "m" (*__acev_mem), \ "r" (__acev_mem) : "memory"); \ @@ -187,7 +187,7 @@ volatile unsigned char __sparc32_atomic_locks[64] *__acev_memp = __acev_newval; \ else \ __sparc32_atomic_do_unlock24 (__acev_memp); \ - __asm __volatile ("" ::: "memory"); \ + __asm__ __volatile__ ("" ::: "memory"); \ __acev_ret; }) #define __v7_exchange_24_rel(mem, newval) \ @@ -198,7 +198,7 @@ volatile unsigned char __sparc32_atomic_locks[64] __sparc32_atomic_do_lock24 (__acev_memp); \ __acev_ret = *__acev_memp & 0xffffff; \ *__acev_memp = __acev_newval; \ - __asm __volatile ("" ::: "memory"); \ + __asm__ __volatile__ ("" ::: "memory"); \ __acev_ret; }) #ifdef SHARED diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h index 78f143911..dc8d63713 100644 --- a/libc/sysdeps/linux/sparc/bits/syscalls.h +++ b/libc/sysdeps/linux/sparc/bits/syscalls.h @@ -78,7 +78,7 @@ register long __o3 __asm__ ("o3") = (long)(arg4); \ register long __o4 __asm__ ("o4") = (long)(arg5); \ register long __g1 __asm__ ("g1") = __NR_clone; \ - __asm __volatile (__CLONE_SYSCALL_STRING : \ + __asm__ __volatile__ (__CLONE_SYSCALL_STRING : \ "=r" (__g1), "=r" (__o0), "=r" (__o1) : \ "0" (__g1), "1" (__o0), "2" (__o1), \ "r" (__o2), "r" (__o3), "r" (__o4) : \ |