powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]

LOADARGS_N in powerpc/sysdep.h uses argN as local variables.  It breaks
when argN is also a function argument.  Rename argN to _argN to avoid
conflict.

(cherry picked from commit 14f43dd34dcf1ba29386c01cd0b286dffb37412d)

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
index bdbab8e41b7732839b42fd1811bbaf5b041a8d2f..3181182eeb23e4c8c1aa27abd0fcfe432e1112b5 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
@@ -156,47 +156,47 @@
 # define LOADARGS_0(name, dummy)                                             \
        r0 = name
 # define LOADARGS_1(name, __arg1) \
-       long int arg1 = (long int) (__arg1);    \
+       long int _arg1 = (long int) (__arg1);   \
   LOADARGS_0(name, 0);                                    \
        extern void __illegally_sized_syscall_arg1 (void); \
        if (__builtin_classify_type (__arg1) != 5 && sizeof (__arg1) > 4) \
          __illegally_sized_syscall_arg1 (); \
-       r3 = arg1
+       r3 = _arg1
 # define LOADARGS_2(name, __arg1, __arg2) \
-       long int arg2 = (long int) (__arg2); \
+       long int _arg2 = (long int) (__arg2); \
        LOADARGS_1(name, __arg1); \
        extern void __illegally_sized_syscall_arg2 (void); \
        if (__builtin_classify_type (__arg2) != 5 && sizeof (__arg2) > 4) \
          __illegally_sized_syscall_arg2 (); \
-       r4 = arg2
+       r4 = _arg2
 # define LOADARGS_3(name, __arg1, __arg2, __arg3) \
-       long int arg3 = (long int) (__arg3); \
+       long int _arg3 = (long int) (__arg3); \
        LOADARGS_2(name, __arg1, __arg2); \
        extern void __illegally_sized_syscall_arg3 (void); \
        if (__builtin_classify_type (__arg3) != 5 && sizeof (__arg3) > 4) \
          __illegally_sized_syscall_arg3 (); \
-       r5 = arg3
+       r5 = _arg3
 # define LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4) \
-       long int arg4 = (long int) (__arg4); \
+       long int _arg4 = (long int) (__arg4); \
        LOADARGS_3(name, __arg1, __arg2, __arg3); \
        extern void __illegally_sized_syscall_arg4 (void); \
        if (__builtin_classify_type (__arg4) != 5 && sizeof (__arg4) > 4) \
          __illegally_sized_syscall_arg4 (); \
-       r6 = arg4
+       r6 = _arg4
 # define LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5) \
-       long int arg5 = (long int) (__arg5); \
+       long int _arg5 = (long int) (__arg5); \
        LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4); \
        extern void __illegally_sized_syscall_arg5 (void); \
        if (__builtin_classify_type (__arg5) != 5 && sizeof (__arg5) > 4) \
          __illegally_sized_syscall_arg5 (); \
-       r7 = arg5
+       r7 = _arg5
 # define LOADARGS_6(name, __arg1, __arg2, __arg3, __arg4, __arg5, __arg6) \
-       long int arg6 = (long int) (__arg6); \
+       long int _arg6 = (long int) (__arg6); \
        LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5); \
        extern void __illegally_sized_syscall_arg6 (void); \
        if (__builtin_classify_type (__arg6) != 5 && sizeof (__arg6) > 4) \
          __illegally_sized_syscall_arg6 (); \
-       r8 = arg6
+       r8 = _arg6
 
 # define ASM_INPUT_0 "0" (r0)
 # define ASM_INPUT_1 ASM_INPUT_0, "1" (r3)

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index 294517e3f3e4f3061b0f18f3047e85284a72558a..e9dd0b389a389ae9347631fbd7bdc3c888918e2f 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -163,47 +163,47 @@
 #define LOADARGS_0(name, dummy) \
        r0 = name
 #define LOADARGS_1(name, __arg1) \
-       long int arg1 = (long int) (__arg1); \
+       long int _arg1 = (long int) (__arg1); \
        LOADARGS_0(name, 0); \
        extern void __illegally_sized_syscall_arg1 (void); \
        if (__builtin_classify_type (__arg1) != 5 && sizeof (__arg1) > 8) \
          __illegally_sized_syscall_arg1 (); \
-       r3 = arg1
+       r3 = _arg1
 #define LOADARGS_2(name, __arg1, __arg2) \
-       long int arg2 = (long int) (__arg2); \
+       long int _arg2 = (long int) (__arg2); \
        LOADARGS_1(name, __arg1); \
        extern void __illegally_sized_syscall_arg2 (void); \
        if (__builtin_classify_type (__arg2) != 5 && sizeof (__arg2) > 8) \
          __illegally_sized_syscall_arg2 (); \
-       r4 = arg2
+       r4 = _arg2
 #define LOADARGS_3(name, __arg1, __arg2, __arg3) \
-       long int arg3 = (long int) (__arg3); \
+       long int _arg3 = (long int) (__arg3); \
        LOADARGS_2(name, __arg1, __arg2); \
        extern void __illegally_sized_syscall_arg3 (void); \
        if (__builtin_classify_type (__arg3) != 5 && sizeof (__arg3) > 8) \
          __illegally_sized_syscall_arg3 (); \
-       r5 = arg3
+       r5 = _arg3
 #define LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4) \
-       long int arg4 = (long int) (__arg4); \
+       long int _arg4 = (long int) (__arg4); \
        LOADARGS_3(name, __arg1, __arg2, __arg3); \
        extern void __illegally_sized_syscall_arg4 (void); \
        if (__builtin_classify_type (__arg4) != 5 && sizeof (__arg4) > 8) \
          __illegally_sized_syscall_arg4 (); \
-       r6 = arg4
+       r6 = _arg4
 #define LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5) \
-       long int arg5 = (long int) (__arg5); \
+       long int _arg5 = (long int) (__arg5); \
        LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4); \
        extern void __illegally_sized_syscall_arg5 (void); \
        if (__builtin_classify_type (__arg5) != 5 && sizeof (__arg5) > 8) \
          __illegally_sized_syscall_arg5 (); \
-       r7 = arg5
+       r7 = _arg5
 #define LOADARGS_6(name, __arg1, __arg2, __arg3, __arg4, __arg5, __arg6) \
-       long int arg6 = (long int) (__arg6); \
+       long int _arg6 = (long int) (__arg6); \
        LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5); \
        extern void __illegally_sized_syscall_arg6 (void); \
        if (__builtin_classify_type (__arg6) != 5 && sizeof (__arg6) > 8) \
          __illegally_sized_syscall_arg6 (); \
-       r8 = arg6
+       r8 = _arg6
 
 #define ASM_INPUT_0 "0" (r0)
 #define ASM_INPUT_1 ASM_INPUT_0, "1" (r3)