summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-07-14 21:57:53 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-07-14 21:57:53 +0200
commit01d14e299c20dc1d79180de27cfe5971e0b8f720 (patch)
treee4f5a44fd83741dc7c04531549dd179bc30c7d5e /libc
parent3199c47d7077410fe837f096de8ed70bdcf3e56d (diff)
silence shadow warnings
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc')
-rw-r--r--libc/sysdeps/linux/arm/bits/syscalls.h42
-rw-r--r--libc/sysdeps/linux/avr32/bits/syscalls.h30
-rw-r--r--libc/sysdeps/linux/x86_64/bits/syscalls.h24
3 files changed, 48 insertions, 48 deletions
diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h
index 4b587e4f5..92bba7da3 100644
--- a/libc/sysdeps/linux/arm/bits/syscalls.h
+++ b/libc/sysdeps/linux/arm/bits/syscalls.h
@@ -44,14 +44,14 @@
#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
({unsigned int __internal_sys_result; \
{ \
- register int _a1 __asm__ ("r0"), _nr __asm__ ("r7"); \
+ register int __a1 __asm__ ("r0"), _nr __asm__ ("r7"); \
LOAD_ARGS_##nr (args) \
_nr = (name); \
__asm__ __volatile__ ("swi 0x0 @ syscall " #name \
- : "=r" (_a1) \
+ : "=r" (__a1) \
: "r" (_nr) ASM_ARGS_##nr \
: "memory"); \
- __internal_sys_result = _a1; \
+ __internal_sys_result = __a1; \
} \
(int) __internal_sys_result; })
#else /* defined(__ARM_EABI__) */
@@ -59,13 +59,13 @@
#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
({ unsigned int __internal_sys_result; \
{ \
- register int _a1 __asm__ ("a1"); \
+ register int __a1 __asm__ ("a1"); \
LOAD_ARGS_##nr (args) \
__asm__ __volatile__ ("swi %1 @ syscall " #name \
- : "=r" (_a1) \
+ : "=r" (__a1) \
: "i" (name) ASM_ARGS_##nr \
: "memory"); \
- __internal_sys_result = _a1; \
+ __internal_sys_result = __a1; \
} \
(int) __internal_sys_result; })
#endif
@@ -77,7 +77,7 @@
({ unsigned int __internal_sys_result; \
{ \
int _sys_buf[2]; \
- register int _a1 __asm__ ("a1"); \
+ register int __a1 __asm__ ("a1"); \
register int *_v3 __asm__ ("v3") = _sys_buf; \
*_v3 = (int) (name); \
LOAD_ARGS_##nr (args) \
@@ -85,10 +85,10 @@
"\tldr r7, [v3]\n" \
"\tswi 0 @ syscall " #name "\n" \
"\tldr r7, [v3, #4]" \
- : "=r" (_a1) \
+ : "=r" (__a1) \
: "r" (_v3) ASM_ARGS_##nr \
: "memory"); \
- __internal_sys_result = _a1; \
+ __internal_sys_result = __a1; \
} \
(int) __internal_sys_result; })
#endif /*!defined(__thumb__)*/
@@ -99,25 +99,25 @@
#define LOAD_ARGS_0()
#define ASM_ARGS_0
#define LOAD_ARGS_1(a1) \
- int _a1tmp = (int) (a1); \
+ int __a1tmp = (int) (a1); \
LOAD_ARGS_0 () \
- _a1 = _a1tmp;
-#define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
+ __a1 = __a1tmp;
+#define ASM_ARGS_1 ASM_ARGS_0, "r" (__a1)
#define LOAD_ARGS_2(a1, a2) \
- int _a2tmp = (int) (a2); \
+ int __a2tmp = (int) (a2); \
LOAD_ARGS_1 (a1) \
- register int _a2 __asm__ ("a2") = _a2tmp;
-#define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
+ register int __a2 __asm__ ("a2") = __a2tmp;
+#define ASM_ARGS_2 ASM_ARGS_1, "r" (__a2)
#define LOAD_ARGS_3(a1, a2, a3) \
- int _a3tmp = (int) (a3); \
+ int __a3tmp = (int) (a3); \
LOAD_ARGS_2 (a1, a2) \
- register int _a3 __asm__ ("a3") = _a3tmp;
-#define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3)
+ register int __a3 __asm__ ("a3") = __a3tmp;
+#define ASM_ARGS_3 ASM_ARGS_2, "r" (__a3)
#define LOAD_ARGS_4(a1, a2, a3, a4) \
- int _a4tmp = (int) (a4); \
+ int __a4tmp = (int) (a4); \
LOAD_ARGS_3 (a1, a2, a3) \
- register int _a4 __asm__ ("a4") = _a4tmp;
-#define ASM_ARGS_4 ASM_ARGS_3, "r" (_a4)
+ register int __a4 __asm__ ("a4") = __a4tmp;
+#define ASM_ARGS_4 ASM_ARGS_3, "r" (__a4)
#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
int _v1tmp = (int) (a5); \
LOAD_ARGS_4 (a1, a2, a3, a4) \
diff --git a/libc/sysdeps/linux/avr32/bits/syscalls.h b/libc/sysdeps/linux/avr32/bits/syscalls.h
index 48f15d473..836cb2d76 100644
--- a/libc/sysdeps/linux/avr32/bits/syscalls.h
+++ b/libc/sysdeps/linux/avr32/bits/syscalls.h
@@ -10,14 +10,14 @@
#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
({ \
- register int _a1 __asm__("r12"); \
+ register int __a1 __asm__("r12"); \
register int _scno __asm__("r8") = name; \
LOAD_ARGS_##nr (args); \
__asm__ __volatile__("scall /* syscall " #name " */" \
- : "=r" (_a1) \
+ : "=r" (__a1) \
: "r"(_scno) ASM_ARGS_##nr \
: "cc", "memory"); \
- _a1; \
+ __a1; \
})
#define INTERNAL_SYSCALL_ERROR_P(val, err) \
@@ -26,29 +26,29 @@
#define LOAD_ARGS_0() do { } while(0)
#define ASM_ARGS_0
#define LOAD_ARGS_1(a1) \
- _a1 = (int) (a1); \
+ __a1 = (int) (a1); \
LOAD_ARGS_0()
-#define ASM_ARGS_1 ASM_ARGS_0, "r"(_a1)
+#define ASM_ARGS_1 ASM_ARGS_0, "r"(__a1)
#define LOAD_ARGS_2(a1, a2) \
- register int _a2 __asm__("r11") = (int)(a2); \
+ register int __a2 __asm__("r11") = (int)(a2); \
LOAD_ARGS_1(a1)
-#define ASM_ARGS_2 ASM_ARGS_1, "r"(_a2)
+#define ASM_ARGS_2 ASM_ARGS_1, "r"(__a2)
#define LOAD_ARGS_3(a1, a2, a3) \
- register int _a3 __asm__("r10") = (int)(a3); \
+ register int __a3 __asm__("r10") = (int)(a3); \
LOAD_ARGS_2(a1, a2)
-#define ASM_ARGS_3 ASM_ARGS_2, "r"(_a3)
+#define ASM_ARGS_3 ASM_ARGS_2, "r"(__a3)
#define LOAD_ARGS_4(a1, a2, a3, a4) \
- register int _a4 __asm__("r9") = (int)(a4); \
+ register int __a4 __asm__("r9") = (int)(a4); \
LOAD_ARGS_3(a1, a2, a3)
-#define ASM_ARGS_4 ASM_ARGS_3, "r"(_a4)
+#define ASM_ARGS_4 ASM_ARGS_3, "r"(__a4)
#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
- register int _a5 __asm__("r5") = (int)(a5); \
+ register int __a5 __asm__("r5") = (int)(a5); \
LOAD_ARGS_4(a1, a2, a3, a4)
-#define ASM_ARGS_5 ASM_ARGS_4, "r"(_a5)
+#define ASM_ARGS_5 ASM_ARGS_4, "r"(__a5)
#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
- register int _a6 __asm__("r3") = (int)(a6); \
+ register int __a6 __asm__("r3") = (int)(a6); \
LOAD_ARGS_5(a1, a2, a3, a4, a5)
-#define ASM_ARGS_6 ASM_ARGS_5, "r"(_a6)
+#define ASM_ARGS_6 ASM_ARGS_5, "r"(__a6)
#endif /* __ASSEMBLER__ */
#endif /* _BITS_SYSCALLS_H */
diff --git a/libc/sysdeps/linux/x86_64/bits/syscalls.h b/libc/sysdeps/linux/x86_64/bits/syscalls.h
index d16addb4a..8042ab8b9 100644
--- a/libc/sysdeps/linux/x86_64/bits/syscalls.h
+++ b/libc/sysdeps/linux/x86_64/bits/syscalls.h
@@ -85,49 +85,49 @@
long int __arg1 = (long) (a1); \
LOAD_ARGS_0 ()
#define LOAD_REGS_1 \
- register long int _a1 __asm__ ("rdi") = __arg1; \
+ register long int __a1 __asm__ ("rdi") = __arg1; \
LOAD_REGS_0
-#define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
+#define ASM_ARGS_1 ASM_ARGS_0, "r" (__a1)
#define LOAD_ARGS_2(a1, a2) \
long int __arg2 = (long) (a2); \
LOAD_ARGS_1 (a1)
#define LOAD_REGS_2 \
- register long int _a2 __asm__ ("rsi") = __arg2; \
+ register long int __a2 __asm__ ("rsi") = __arg2; \
LOAD_REGS_1
-#define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
+#define ASM_ARGS_2 ASM_ARGS_1, "r" (__a2)
#define LOAD_ARGS_3(a1, a2, a3) \
long int __arg3 = (long) (a3); \
LOAD_ARGS_2 (a1, a2)
#define LOAD_REGS_3 \
- register long int _a3 __asm__ ("rdx") = __arg3; \
+ register long int __a3 __asm__ ("rdx") = __arg3; \
LOAD_REGS_2
-#define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3)
+#define ASM_ARGS_3 ASM_ARGS_2, "r" (__a3)
#define LOAD_ARGS_4(a1, a2, a3, a4) \
long int __arg4 = (long) (a4); \
LOAD_ARGS_3 (a1, a2, a3)
#define LOAD_REGS_4 \
- register long int _a4 __asm__ ("r10") = __arg4; \
+ register long int __a4 __asm__ ("r10") = __arg4; \
LOAD_REGS_3
-#define ASM_ARGS_4 ASM_ARGS_3, "r" (_a4)
+#define ASM_ARGS_4 ASM_ARGS_3, "r" (__a4)
#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
long int __arg5 = (long) (a5); \
LOAD_ARGS_4 (a1, a2, a3, a4)
#define LOAD_REGS_5 \
- register long int _a5 __asm__ ("r8") = __arg5; \
+ register long int __a5 __asm__ ("r8") = __arg5; \
LOAD_REGS_4
-#define ASM_ARGS_5 ASM_ARGS_4, "r" (_a5)
+#define ASM_ARGS_5 ASM_ARGS_4, "r" (__a5)
#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
long int __arg6 = (long) (a6); \
LOAD_ARGS_5 (a1, a2, a3, a4, a5)
#define LOAD_REGS_6 \
- register long int _a6 __asm__ ("r9") = __arg6; \
+ register long int __a6 __asm__ ("r9") = __arg6; \
LOAD_REGS_5
-#define ASM_ARGS_6 ASM_ARGS_5, "r" (_a6)
+#define ASM_ARGS_6 ASM_ARGS_5, "r" (__a6)
#endif /* __ASSEMBLER__ */
#endif /* _BITS_SYSCALLS_H */