summaryrefslogtreecommitdiffstats
path: root/libpthread/nptl/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread/nptl/sysdeps')
-rw-r--r--libpthread/nptl/sysdeps/sh/pthread_spin_lock.c2
-rw-r--r--libpthread/nptl/sysdeps/sh/pthreaddef.h4
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h30
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h64
4 files changed, 50 insertions, 50 deletions
diff --git a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c
index e73264108..d158183f0 100644
--- a/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c
+++ b/libpthread/nptl/sysdeps/sh/pthread_spin_lock.c
@@ -25,7 +25,7 @@ pthread_spin_lock (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 70c6a850b..c1902fb54 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/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index e6ea68dfb..45339f5e0 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -183,11 +183,11 @@ typedef int lll_lock_t;
#define lll_futex_wait(futex, val) \
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") = FUTEX_WAIT; \
- register unsigned long __r6 asm ("r6") = (unsigned long) (val); \
- register unsigned long __r7 asm ("r7") = 0; \
+ register unsigned long __r3 __asm ("r3") = SYS_futex; \
+ register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \
+ register unsigned long __r5 __asm ("r5") = FUTEX_WAIT; \
+ register unsigned long __r6 __asm ("r6") = (unsigned long) (val); \
+ register unsigned long __r7 __asm ("r7") = 0; \
__asm __volatile (SYSCALL_WITH_INST_PAD \
: "=z" (__ignore) \
: "r" (__r3), "r" (__r4), "r" (__r5), \
@@ -198,11 +198,11 @@ typedef int lll_lock_t;
#define lll_futex_timed_wait(futex, val, timeout) \
({ \
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") = FUTEX_WAIT; \
- register unsigned long __r6 asm ("r6") = (unsigned long) (val); \
- register unsigned long __r7 asm ("r7") = (timeout); \
+ register unsigned long __r3 __asm ("r3") = SYS_futex; \
+ register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \
+ register unsigned long __r5 __asm ("r5") = FUTEX_WAIT; \
+ 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), \
@@ -215,11 +215,11 @@ typedef int lll_lock_t;
#define lll_futex_wake(futex, nr) \
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") = FUTEX_WAKE; \
- register unsigned long __r6 asm ("r6") = (unsigned long) (nr); \
- register unsigned long __r7 asm ("r7") = 0; \
+ register unsigned long __r3 __asm ("r3") = SYS_futex; \
+ register unsigned long __r4 __asm ("r4") = (unsigned long) (futex); \
+ register unsigned long __r5 __asm ("r5") = FUTEX_WAKE; \
+ 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), \
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h
index 3bb0b32a0..fc2d71591 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h
@@ -255,39 +255,39 @@
#define SUBSTITUTE_ARGS_0()
#define SUBSTITUTE_ARGS_1(arg1) \
long int _arg1 = (long int) (arg1); \
- register long int r4 asm ("%r4") = (long int) (_arg1)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1)
#define SUBSTITUTE_ARGS_2(arg1, arg2) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
- register long int r4 asm ("%r4") = (long int) (_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2)
#define SUBSTITUTE_ARGS_3(arg1, arg2, arg3) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
long int _arg3 = (long int) (arg3); \
- register long int r4 asm ("%r4") = (long int) (_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2); \
- register long int r6 asm ("%r6") = (long int) (_arg3)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2); \
+ register long int r6 __asm__ ("%r6") = (long int) (_arg3)
#define SUBSTITUTE_ARGS_4(arg1, arg2, arg3, arg4) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
long int _arg3 = (long int) (arg3); \
long int _arg4 = (long int) (arg4); \
- register long int r4 asm ("%r4") = (long int) (_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2); \
- register long int r6 asm ("%r6") = (long int) (_arg3); \
- register long int r7 asm ("%r7") = (long int) (_arg4)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2); \
+ register long int r6 __asm__ ("%r6") = (long int) (_arg3); \
+ register long int r7 __asm__ ("%r7") = (long int) (_arg4)
#define SUBSTITUTE_ARGS_5(arg1, arg2, arg3, arg4, arg5) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
long int _arg3 = (long int) (arg3); \
long int _arg4 = (long int) (arg4); \
long int _arg5 = (long int) (arg5); \
- register long int r4 asm ("%r4") = (long int) (_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2); \
- register long int r6 asm ("%r6") = (long int) (_arg3); \
- register long int r7 asm ("%r7") = (long int) (_arg4); \
- register long int r0 asm ("%r0") = (long int) (_arg5)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2); \
+ register long int r6 __asm__ ("%r6") = (long int) (_arg3); \
+ register long int r7 __asm__ ("%r7") = (long int) (_arg4); \
+ register long int r0 __asm__ ("%r0") = (long int) (_arg5)
#define SUBSTITUTE_ARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
@@ -295,12 +295,12 @@
long int _arg4 = (long int) (arg4); \
long int _arg5 = (long int) (arg5); \
long int _arg6 = (long int) (arg6); \
- register long int r4 asm ("%r4") = (long int)(_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2); \
- register long int r6 asm ("%r6") = (long int) (_arg3); \
- register long int r7 asm ("%r7") = (long int) (_arg4); \
- register long int r0 asm ("%r0") = (long int) (_arg5); \
- register long int r1 asm ("%r1") = (long int) (_arg6)
+ register long int r4 __asm__ ("%r4") = (long int)(_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2); \
+ register long int r6 __asm__ ("%r6") = (long int) (_arg3); \
+ register long int r7 __asm__ ("%r7") = (long int) (_arg4); \
+ register long int r0 __asm__ ("%r0") = (long int) (_arg5); \
+ register long int r1 __asm__ ("%r1") = (long int) (_arg6)
#define SUBSTITUTE_ARGS_7(arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
long int _arg1 = (long int) (arg1); \
long int _arg2 = (long int) (arg2); \
@@ -309,13 +309,13 @@
long int _arg5 = (long int) (arg5); \
long int _arg6 = (long int) (arg6); \
long int _arg7 = (long int) (arg7); \
- register long int r4 asm ("%r4") = (long int) (_arg1); \
- register long int r5 asm ("%r5") = (long int) (_arg2); \
- register long int r6 asm ("%r6") = (long int) (_arg3); \
- register long int r7 asm ("%r7") = (long int) (_arg4); \
- register long int r0 asm ("%r0") = (long int) (_arg5); \
- register long int r1 asm ("%r1") = (long int) (_arg6); \
- register long int r2 asm ("%r2") = (long int) (_arg7)
+ register long int r4 __asm__ ("%r4") = (long int) (_arg1); \
+ register long int r5 __asm__ ("%r5") = (long int) (_arg2); \
+ register long int r6 __asm__ ("%r6") = (long int) (_arg3); \
+ register long int r7 __asm__ ("%r7") = (long int) (_arg4); \
+ register long int r0 __asm__ ("%r0") = (long int) (_arg5); \
+ register long int r1 __asm__ ("%r1") = (long int) (_arg6); \
+ register long int r2 __asm__ ("%r2") = (long int) (_arg7)
#undef INLINE_SYSCALL
#define INLINE_SYSCALL(name, nr, args...) \
@@ -332,10 +332,10 @@
#define INTERNAL_SYSCALL(name, err, nr, args...) \
({ \
unsigned long int resultvar; \
- register long int r3 asm ("%r3") = SYS_ify (name); \
+ register long int r3 __asm__ ("%r3") = SYS_ify (name); \
SUBSTITUTE_ARGS_##nr(args); \
\
- asm volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \
+ __asm__ volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \
: "=z" (resultvar) \
: "r" (r3) ASMFMT_##nr \
: "memory"); \
@@ -346,10 +346,10 @@
#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
({ \
unsigned long int resultvar; \
- register long int r3 asm ("%r3") = (name); \
+ register long int r3 __asm__ ("%r3") = (name); \
SUBSTITUTE_ARGS_##nr(args); \
\
- asm volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \
+ __asm__ volatile (SYSCALL_INST_STR##nr SYSCALL_INST_PAD \
: "=z" (resultvar) \
: "r" (r3) ASMFMT_##nr \
: "memory"); \