diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-17 15:52:43 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-17 15:52:43 +0000 |
| commit | af3f2851b94863225c60ebb42a7636b304c467d4 (patch) | |
| tree | 6cb3be436b4116e2f57cb235adaf66f2c8d0ff65 | |
| parent | 08b75763d15cf9e5f45eef70fe7e30ce2b748ae3 (diff) | |
- pull fix for unwinding from the NPTL branch (Johannes Stezenbach)
Repair C89 compliance and severe whitespace-defects while at it.
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/syscalls.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h index af6cf843d..45180b636 100644 --- a/libc/sysdeps/linux/arm/bits/syscalls.h +++ b/libc/sysdeps/linux/arm/bits/syscalls.h @@ -137,17 +137,21 @@ return (type) (INLINE_SYSCALL(name, 7, arg1, arg2, arg3, arg4, arg5, arg6, arg7) (int) __sys_result; }) #endif #else /* !defined(__thumb__) */ - +/* We can't use push/pop inside the asm because that breaks + unwinding (ie. thread cancellation). + */ #define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ unsigned int __sys_result; \ { \ + int _sys_buf[2]; \ register int _a1 __asm__ ("a1"); \ + register int *_v3 __asm__ ("v3") = _sys_buf; \ + *_v3 = (int) (SYS_ify(name)); \ LOAD_ARGS_##nr (args) \ - register int _v3 __asm__ ("v3") = (int) (SYS_ify(name)); \ - __asm__ __volatile__ ("push {r7}\n" \ - "\tmov r7, v3\n" \ - "\tswi 0 @ syscall " #name "\n" \ - "\tpop {r7}" \ + __asm__ __volatile__ ("str r7, [v3, #4]\n" \ + "\tldr r7, [v3]\n" \ + "\tswi 0 @ syscall " #name "\n" \ + "\tldr r7, [v3, #4]" \ : "=r" (_a1) \ : "r" (_v3) ASM_ARGS_##nr \ : "memory"); \ |