diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2020-02-16 16:12:30 +0100 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2020-02-16 16:12:30 +0100 |
commit | c7df6aa07f9402cf15a10c4156aa1645f7caf13c (patch) | |
tree | 4f1235ad64ae54ff1469fcc70ba5cc1d757779e5 | |
parent | d4fb6e5cbe20da930f947fe26491878c8177d36f (diff) |
debian/patches/git-updates.diff: update from upstream stable branch.
-rw-r--r-- | debian/patches/git-updates.diff | 1256 | ||||
-rw-r--r-- | debian/patches/series | 2 |
2 files changed, 1257 insertions, 1 deletions
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff index f9395175..64a06000 100644 --- a/debian/patches/git-updates.diff +++ b/debian/patches/git-updates.diff @@ -1,2 +1,1258 @@ GIT update of https://sourceware.org/git/glibc.git/release/2.31/master from glibc-2.31 +diff --git a/NEWS b/NEWS +index 292fbc595a..64e21b1c50 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,6 +4,12 @@ See the end for copying conditions. + + Please send GNU C library bug reports via <https://sourceware.org/bugzilla/> + using `glibc' in the "product" field. ++ ++Version 2.31.1 ++ ++The following bugs are resolved with this release: ++ [25523] MIPS/Linux inline syscall template is miscompiled ++ + + Version 2.31 + +diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h +index ed873d9dd4..796663a23a 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h ++++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h +@@ -209,8 +209,8 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall0(name,dummy) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ ++ register long int __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r12) \ +@@ -219,9 +219,10 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall1(name,arg1) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ ++ long int __arg1 = (long int) (arg1); \ ++ register long int __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r12) \ +@@ -230,10 +231,12 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall2(name,arg1,arg2) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ +- register long __r6 __asm__("r6") = (long)(arg2); \ ++ long int __arg1 = (long int) (arg1); \ ++ long int __arg2 = (long int) (arg2); \ ++ register long int __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ ++ register long int __r6 __asm__("r6") = __arg2; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r6), "r"(__r12) \ +@@ -243,11 +246,14 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall3(name,arg1,arg2,arg3) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ +- register long __r6 __asm__("r6") = (long)(arg2); \ +- register long __r7 __asm__("r7") = (long)(arg3); \ ++ long int __arg1 = (long int) (arg1); \ ++ long int __arg2 = (long int) (arg2); \ ++ long int __arg3 = (long int) (arg3); \ ++ register long int __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ ++ register long int __r6 __asm__("r6") = __arg2; \ ++ register long int __r7 __asm__("r7") = __arg3; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r6), "r"(__r7), "r"(__r12) \ +@@ -257,12 +263,16 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall4(name,arg1,arg2,arg3,arg4) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ +- register long __r6 __asm__("r6") = (long)(arg2); \ +- register long __r7 __asm__("r7") = (long)(arg3); \ +- register long __r8 __asm__("r8") = (long)(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 __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ ++ register long int __r6 __asm__("r6") = __arg2; \ ++ register long int __r7 __asm__("r7") = __arg3; \ ++ register long int __r8 __asm__("r8") = __arg4; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r6), "r"(__r7), "r"(__r8),"r"(__r12) \ +@@ -272,13 +282,18 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ +- register long __r6 __asm__("r6") = (long)(arg2); \ +- register long __r7 __asm__("r7") = (long)(arg3); \ +- register long __r8 __asm__("r8") = (long)(arg4); \ +- register long __r9 __asm__("r9") = (long)(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 __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ ++ register long int __r6 __asm__("r6") = __arg2; \ ++ register long int __r7 __asm__("r7") = __arg3; \ ++ register long int __r8 __asm__("r8") = __arg4; \ ++ register long int __r9 __asm__("r9") = __arg5; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r6), "r"(__r7), "r"(__r8),"r"(__r9), "r"(__r12) \ +@@ -288,14 +303,20 @@ SYSCALL_ERROR_LABEL_DCL: \ + + # define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6) \ + ({ \ +- register long __ret __asm__("r3"); \ +- register long __r12 __asm__("r12") = name; \ +- register long __r5 __asm__("r5") = (long)(arg1); \ +- register long __r6 __asm__("r6") = (long)(arg2); \ +- register long __r7 __asm__("r7") = (long)(arg3); \ +- register long __r8 __asm__("r8") = (long)(arg4); \ +- register long __r9 __asm__("r9") = (long)(arg5); \ +- register long __r10 __asm__("r10") = (long)(arg6); \ ++ 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); \ ++ long int __arg6 = (long int) (arg6); \ ++ register long int __ret __asm__("r3"); \ ++ register long int __r12 __asm__("r12") = name; \ ++ register long int __r5 __asm__("r5") = __arg1; \ ++ register long int __r6 __asm__("r6") = __arg2; \ ++ register long int __r7 __asm__("r7") = __arg3; \ ++ register long int __r8 __asm__("r8") = __arg4; \ ++ register long int __r9 __asm__("r9") = __arg5; \ ++ register long int __r10 __asm__("r10") = __arg6; \ + __asm__ __volatile__( "brki r14,8; nop;" \ + : "=r"(__ret) \ + : "r"(__r5), "r"(__r6), "r"(__r7), "r"(__r8),"r"(__r9), "r"(__r10), \ +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall5.S b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall5.S +index b2bbf10181..ff445a5406 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall5.S ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall5.S +@@ -22,9 +22,9 @@ + .text + .set nomips16 + +-/* long long __mips_syscall5 (long arg1, long arg2, long arg3, long arg4, +- long arg5, +- long number) */ ++/* long long int __mips_syscall5 (long int arg1, long int arg2, long int arg3, ++ long int arg4, long int arg5, ++ long int number) */ + + ENTRY(__mips_syscall5) + lw v0, 20(sp) +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall6.S b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall6.S +index 572d7c1137..2b4a3117d1 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall6.S ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall6.S +@@ -22,9 +22,9 @@ + .text + .set nomips16 + +-/* long long __mips_syscall6 (long arg1, long arg2, long arg3, long arg4, +- long arg5, long arg6, +- long number) */ ++/* long long int __mips_syscall6 (long int arg1, long int arg2, long int arg3, ++ long int arg4, long int arg5, long int arg6, ++ long int number) */ + + ENTRY(__mips_syscall6) + lw v0, 24(sp) +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall7.S b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall7.S +index 05164cb253..2723bbb138 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall7.S ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips-syscall7.S +@@ -22,9 +22,10 @@ + .text + .set nomips16 + +-/* long long __mips_syscall7 (long arg1, long arg2, long arg3, long arg4, +- long arg5, long arg6, long arg7, +- long number) */ ++/* long long int __mips_syscall7 (long int arg1, long int arg2, long int arg3, ++ long int arg4, long int arg5, long int arg6, ++ long int arg7, ++ long int number) */ + + ENTRY(__mips_syscall7) + lw v0, 28(sp) +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall.h b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall.h +index 9bf551ace8..f23ede0259 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall.h +@@ -19,51 +19,57 @@ + #ifndef MIPS16_SYSCALL_H + #define MIPS16_SYSCALL_H 1 + +-long long __nomips16 __mips16_syscall0 (long number); ++long long int __nomips16 __mips16_syscall0 (long int number); + #define __mips16_syscall0(dummy, number) \ +- __mips16_syscall0 ((long) (number)) ++ __mips16_syscall0 ((long int) (number)) + +-long long __nomips16 __mips16_syscall1 (long a0, +- long number); ++long long int __nomips16 __mips16_syscall1 (long int a0, ++ long int number); + #define __mips16_syscall1(a0, number) \ +- __mips16_syscall1 ((long) (a0), \ +- (long) (number)) ++ __mips16_syscall1 ((long int) (a0), \ ++ (long int) (number)) + +-long long __nomips16 __mips16_syscall2 (long a0, long a1, +- long number); ++long long int __nomips16 __mips16_syscall2 (long int a0, long int a1, ++ long int number); + #define __mips16_syscall2(a0, a1, number) \ +- __mips16_syscall2 ((long) (a0), (long) (a1), \ +- (long) (number)) ++ __mips16_syscall2 ((long int) (a0), (long int) (a1), \ ++ (long int) (number)) + +-long long __nomips16 __mips16_syscall3 (long a0, long a1, long a2, +- long number); ++long long int __nomips16 __mips16_syscall3 (long int a0, long int a1, ++ long int a2, ++ long int number); + #define __mips16_syscall3(a0, a1, a2, number) \ +- __mips16_syscall3 ((long) (a0), (long) (a1), (long) (a2), \ +- (long) (number)) ++ __mips16_syscall3 ((long int) (a0), (long int) (a1), \ ++ (long int) (a2), \ ++ (long int) (number)) + +-long long __nomips16 __mips16_syscall4 (long a0, long a1, long a2, long a3, +- long number); ++long long int __nomips16 __mips16_syscall4 (long int a0, long int a1, ++ long int a2, long int a3, ++ long int number); + #define __mips16_syscall4(a0, a1, a2, a3, number) \ +- __mips16_syscall4 ((long) (a0), (long) (a1), (long) (a2), \ +- (long) (a3), \ +- (long) (number)) ++ __mips16_syscall4 ((long int) (a0), (long int) (a1), \ ++ (long int) (a2), (long int) (a3), \ ++ (long int) (number)) + + /* The remaining ones use regular MIPS wrappers. */ + + #define __mips16_syscall5(a0, a1, a2, a3, a4, number) \ +- __mips_syscall5 ((long) (a0), (long) (a1), (long) (a2), \ +- (long) (a3), (long) (a4), \ +- (long) (number)) ++ __mips_syscall5 ((long int) (a0), (long int) (a1), \ ++ (long int) (a2), (long int) (a3), \ ++ (long int) (a4), \ ++ (long int) (number)) + + #define __mips16_syscall6(a0, a1, a2, a3, a4, a5, number) \ +- __mips_syscall6 ((long) (a0), (long) (a1), (long) (a2), \ +- (long) (a3), (long) (a4), (long) (a5), \ +- (long) (number)) ++ __mips_syscall6 ((long int) (a0), (long int) (a1), \ ++ (long int) (a2), (long int) (a3), \ ++ (long int) (a4), (long int) (a5), \ ++ (long int) (number)) + + #define __mips16_syscall7(a0, a1, a2, a3, a4, a5, a6, number) \ +- __mips_syscall7 ((long) (a0), (long) (a1), (long) (a2), \ +- (long) (a3), (long) (a4), (long) (a5), \ +- (long) (a6), \ +- (long) (number)) ++ __mips_syscall7 ((long int) (a0), (long int) (a1), \ ++ (long int) (a2), (long int) (a3), \ ++ (long int) (a4), (long int) (a5), \ ++ (long int) (a6), \ ++ (long int) (number)) + + #endif +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall0.c b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall0.c +index 92f16e2724..43c05f8050 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall0.c ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall0.c +@@ -20,8 +20,8 @@ + + #undef __mips16_syscall0 + +-long long __nomips16 +-__mips16_syscall0 (long number) ++long long int __nomips16 ++__mips16_syscall0 (long int number) + { + union __mips_syscall_return ret; + ret.reg.v0 = INTERNAL_SYSCALL_MIPS16 (number, ret.reg.v1, 0); +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall1.c b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall1.c +index fa985a96e5..16a567e834 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall1.c ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall1.c +@@ -20,9 +20,9 @@ + + #undef __mips16_syscall1 + +-long long __nomips16 +-__mips16_syscall1 (long a0, +- long number) ++long long int __nomips16 ++__mips16_syscall1 (long int a0, ++ long int number) + { + union __mips_syscall_return ret; + ret.reg.v0 = INTERNAL_SYSCALL_MIPS16 (number, ret.reg.v1, 1, +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall2.c b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall2.c +index f042ac815d..c0a856c344 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall2.c ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall2.c +@@ -20,9 +20,9 @@ + + #undef __mips16_syscall2 + +-long long __nomips16 +-__mips16_syscall2 (long a0, long a1, +- long number) ++long long int __nomips16 ++__mips16_syscall2 (long int a0, long int a1, ++ long int number) + { + union __mips_syscall_return ret; + ret.reg.v0 = INTERNAL_SYSCALL_MIPS16 (number, ret.reg.v1, 2, +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall3.c b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall3.c +index dfe2f7feb5..042768ebf2 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall3.c ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall3.c +@@ -20,9 +20,9 @@ + + #undef __mips16_syscall3 + +-long long __nomips16 +-__mips16_syscall3 (long a0, long a1, long a2, +- long number) ++long long int __nomips16 ++__mips16_syscall3 (long int a0, long int a1, long int a2, ++ long int number) + { + union __mips_syscall_return ret; + ret.reg.v0 = INTERNAL_SYSCALL_MIPS16 (number, ret.reg.v1, 3, +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall4.c b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall4.c +index 39de510357..8658d822ab 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall4.c ++++ b/sysdeps/unix/sysv/linux/mips/mips32/mips16/mips16-syscall4.c +@@ -20,9 +20,9 @@ + + #undef __mips16_syscall4 + +-long long __nomips16 +-__mips16_syscall4 (long a0, long a1, long a2, long a3, +- long number) ++long long int __nomips16 ++__mips16_syscall4 (long int a0, long int a1, long int a2, long int a3, ++ long int number) + { + union __mips_syscall_return ret; + ret.reg.v0 = INTERNAL_SYSCALL_MIPS16 (number, ret.reg.v1, 4, +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +index beefcf284b..0c6a83e9b3 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h ++++ b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +@@ -52,7 +52,7 @@ + #undef INLINE_SYSCALL + #define INLINE_SYSCALL(name, nr, args...) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ +- long result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ ++ long int result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ + if ( INTERNAL_SYSCALL_ERROR_P (result_var, _sc_err) ) \ + { \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ +@@ -61,10 +61,10 @@ + result_var; }) + + #undef INTERNAL_SYSCALL_DECL +-#define INTERNAL_SYSCALL_DECL(err) long err __attribute__ ((unused)) ++#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused)) + + #undef INTERNAL_SYSCALL_ERROR_P +-#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long) (err)) ++#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long int) (err)) + + #undef INTERNAL_SYSCALL_ERRNO + #define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val) +@@ -103,11 +103,11 @@ + + union __mips_syscall_return + { +- long long val; ++ long long int val; + struct + { +- long v0; +- long v1; ++ long int v0; ++ long int v1; + } + reg; + }; +@@ -152,13 +152,13 @@ union __mips_syscall_return + + #define internal_syscall0(v0_init, input, number, err, dummy...) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -175,14 +175,15 @@ union __mips_syscall_return + + #define internal_syscall1(v0_init, input, number, err, arg1) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -199,15 +200,17 @@ union __mips_syscall_return + + #define internal_syscall2(v0_init, input, number, err, arg1, arg2) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -225,16 +228,19 @@ union __mips_syscall_return + #define internal_syscall3(v0_init, input, number, err, \ + arg1, arg2, arg3) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ ++ long int _arg3 = (long int) (arg3); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -252,16 +258,20 @@ union __mips_syscall_return + #define internal_syscall4(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ 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 __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7") = (long) (arg4); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7") = _arg4; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -285,63 +295,66 @@ union __mips_syscall_return + compiler specifics required for the stack arguments to be pushed, + which would be the case if these syscalls were inlined. */ + +-long long __nomips16 __mips_syscall5 (long arg1, long arg2, long arg3, +- long arg4, long arg5, +- long number); ++long long int __nomips16 __mips_syscall5 (long int arg1, long int arg2, ++ long int arg3, long int arg4, ++ long int arg5, ++ long int number); + libc_hidden_proto (__mips_syscall5, nomips16) + + #define internal_syscall5(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5) \ + ({ \ + union __mips_syscall_return _sc_ret; \ +- _sc_ret.val = __mips_syscall5 ((long) (arg1), \ +- (long) (arg2), \ +- (long) (arg3), \ +- (long) (arg4), \ +- (long) (arg5), \ +- (long) (number)); \ ++ _sc_ret.val = __mips_syscall5 ((long int) (arg1), \ ++ (long int) (arg2), \ ++ (long int) (arg3), \ ++ (long int) (arg4), \ ++ (long int) (arg5), \ ++ (long int) (number)); \ + err = _sc_ret.reg.v1; \ + _sc_ret.reg.v0; \ + }) + +-long long __nomips16 __mips_syscall6 (long arg1, long arg2, long arg3, +- long arg4, long arg5, long arg6, +- long number); ++long long int __nomips16 __mips_syscall6 (long int arg1, long int arg2, ++ long int arg3, long int arg4, ++ long int arg5, long int arg6, ++ long int number); + libc_hidden_proto (__mips_syscall6, nomips16) + + #define internal_syscall6(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5, arg6) \ + ({ \ + union __mips_syscall_return _sc_ret; \ +- _sc_ret.val = __mips_syscall6 ((long) (arg1), \ +- (long) (arg2), \ +- (long) (arg3), \ +- (long) (arg4), \ +- (long) (arg5), \ +- (long) (arg6), \ +- (long) (number)); \ ++ _sc_ret.val = __mips_syscall6 ((long int) (arg1), \ ++ (long int) (arg2), \ ++ (long int) (arg3), \ ++ (long int) (arg4), \ ++ (long int) (arg5), \ ++ (long int) (arg6), \ ++ (long int) (number)); \ + err = _sc_ret.reg.v1; \ + _sc_ret.reg.v0; \ + }) + +-long long __nomips16 __mips_syscall7 (long arg1, long arg2, long arg3, +- long arg4, long arg5, long arg6, +- long arg7, +- long number); ++long long int __nomips16 __mips_syscall7 (long int arg1, long int arg2, ++ long int arg3, long int arg4, ++ long int arg5, long int arg6, ++ long int arg7, ++ long int number); + libc_hidden_proto (__mips_syscall7, nomips16) + + #define internal_syscall7(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5, arg6, arg7) \ + ({ \ + union __mips_syscall_return _sc_ret; \ +- _sc_ret.val = __mips_syscall7 ((long) (arg1), \ +- (long) (arg2), \ +- (long) (arg3), \ +- (long) (arg4), \ +- (long) (arg5), \ +- (long) (arg6), \ +- (long) (arg7), \ +- (long) (number)); \ ++ _sc_ret.val = __mips_syscall7 ((long int) (arg1), \ ++ (long int) (arg2), \ ++ (long int) (arg3), \ ++ (long int) (arg4), \ ++ (long int) (arg5), \ ++ (long int) (arg6), \ ++ (long int) (arg7), \ ++ (long int) (number)); \ + err = _sc_ret.reg.v1; \ + _sc_ret.reg.v0; \ + }) +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +index f96636538a..4a9d7054f9 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +@@ -47,14 +47,14 @@ + + /* Convert X to a long long, without losing any bits if it is one + already or warning if it is a 32-bit pointer. */ +-#define ARGIFY(X) ((long long) (__typeof__ ((X) - (X))) (X)) ++#define ARGIFY(X) ((long long int) (__typeof__ ((X) - (X))) (X)) + + /* Define a macro which expands into the inline wrapper code for a system + call. */ + #undef INLINE_SYSCALL + #define INLINE_SYSCALL(name, nr, args...) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ +- long result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ ++ long int result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ + if ( INTERNAL_SYSCALL_ERROR_P (result_var, _sc_err) ) \ + { \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ +@@ -63,10 +63,10 @@ + result_var; }) + + #undef INTERNAL_SYSCALL_DECL +-#define INTERNAL_SYSCALL_DECL(err) long err __attribute__ ((unused)) ++#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused)) + + #undef INTERNAL_SYSCALL_ERROR_P +-#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long) (err)) ++#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long int) (err)) + + #undef INTERNAL_SYSCALL_ERRNO + #define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val) +@@ -112,13 +112,13 @@ + + #define internal_syscall0(v0_init, input, number, err, dummy...) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a3 asm ("$7"); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -135,14 +135,15 @@ + + #define internal_syscall1(v0_init, input, number, err, arg1) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a3 asm ("$7"); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -159,15 +160,17 @@ + + #define internal_syscall2(v0_init, input, number, err, arg1, arg2) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ long long int _arg2 = ARGIFY (arg2); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a1 asm ("$5") = ARGIFY (arg2); \ +- register long long __a3 asm ("$7"); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a1 asm ("$5") = _arg2; \ ++ register long long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -185,16 +188,19 @@ + #define internal_syscall3(v0_init, input, number, err, \ + arg1, arg2, arg3) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ long long int _arg2 = ARGIFY (arg2); \ ++ long long int _arg3 = ARGIFY (arg3); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a1 asm ("$5") = ARGIFY (arg2); \ +- register long long __a2 asm ("$6") = ARGIFY (arg3); \ +- register long long __a3 asm ("$7"); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a1 asm ("$5") = _arg2; \ ++ register long long int __a2 asm ("$6") = _arg3; \ ++ register long long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -212,16 +218,20 @@ + #define internal_syscall4(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ long long int _arg2 = ARGIFY (arg2); \ ++ long long int _arg3 = ARGIFY (arg3); \ ++ long long int _arg4 = ARGIFY (arg4); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a1 asm ("$5") = ARGIFY (arg2); \ +- register long long __a2 asm ("$6") = ARGIFY (arg3); \ +- register long long __a3 asm ("$7") = ARGIFY (arg4); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a1 asm ("$5") = _arg2; \ ++ register long long int __a2 asm ("$6") = _arg3; \ ++ register long long int __a3 asm ("$7") = _arg4; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -239,17 +249,22 @@ + #define internal_syscall5(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ long long int _arg2 = ARGIFY (arg2); \ ++ long long int _arg3 = ARGIFY (arg3); \ ++ long long int _arg4 = ARGIFY (arg4); \ ++ long long int _arg5 = ARGIFY (arg5); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a1 asm ("$5") = ARGIFY (arg2); \ +- register long long __a2 asm ("$6") = ARGIFY (arg3); \ +- register long long __a3 asm ("$7") = ARGIFY (arg4); \ +- register long long __a4 asm ("$8") = ARGIFY (arg5); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a1 asm ("$5") = _arg2; \ ++ register long long int __a2 asm ("$6") = _arg3; \ ++ register long long int __a3 asm ("$7") = _arg4; \ ++ register long long int __a4 asm ("$8") = _arg5; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -267,18 +282,24 @@ + #define internal_syscall6(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5, arg6) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long long int _arg1 = ARGIFY (arg1); \ ++ long long int _arg2 = ARGIFY (arg2); \ ++ long long int _arg3 = ARGIFY (arg3); \ ++ long long int _arg4 = ARGIFY (arg4); \ ++ long long int _arg5 = ARGIFY (arg5); \ ++ long long int _arg6 = ARGIFY (arg6); \ ++ register long long int __s0 asm ("$16") __attribute__ ((unused))\ + = (number); \ +- register long long __v0 asm ("$2"); \ +- register long long __a0 asm ("$4") = ARGIFY (arg1); \ +- register long long __a1 asm ("$5") = ARGIFY (arg2); \ +- register long long __a2 asm ("$6") = ARGIFY (arg3); \ +- register long long __a3 asm ("$7") = ARGIFY (arg4); \ +- register long long __a4 asm ("$8") = ARGIFY (arg5); \ +- register long long __a5 asm ("$9") = ARGIFY (arg6); \ ++ register long long int __v0 asm ("$2"); \ ++ register long long int __a0 asm ("$4") = _arg1; \ ++ register long long int __a1 asm ("$5") = _arg2; \ ++ register long long int __a2 asm ("$6") = _arg3; \ ++ register long long int __a3 asm ("$7") = _arg4; \ ++ register long long int __a4 asm ("$8") = _arg5; \ ++ register long long int __a5 asm ("$9") = _arg6; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +index 9d30291f84..3e1f1cc3c5 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +@@ -50,7 +50,7 @@ + #undef INLINE_SYSCALL + #define INLINE_SYSCALL(name, nr, args...) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ +- long result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ ++ long int result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \ + if ( INTERNAL_SYSCALL_ERROR_P (result_var, _sc_err) ) \ + { \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ +@@ -59,10 +59,10 @@ + result_var; }) + + #undef INTERNAL_SYSCALL_DECL +-#define INTERNAL_SYSCALL_DECL(err) long err __attribute__ ((unused)) ++#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused)) + + #undef INTERNAL_SYSCALL_ERROR_P +-#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long) (err)) ++#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long int) (err)) + + #undef INTERNAL_SYSCALL_ERRNO + #define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val) +@@ -108,13 +108,13 @@ + + #define internal_syscall0(v0_init, input, number, err, dummy...) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -131,14 +131,15 @@ + + #define internal_syscall1(v0_init, input, number, err, arg1) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -155,15 +156,17 @@ + + #define internal_syscall2(v0_init, input, number, err, arg1, arg2) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -181,16 +184,19 @@ + #define internal_syscall3(v0_init, input, number, err, \ + arg1, arg2, arg3) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ ++ long int _arg3 = (long int) (arg3); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7"); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7"); \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -208,16 +214,20 @@ + #define internal_syscall4(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ 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 __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7") = (long) (arg4); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7") = _arg4; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -235,17 +245,22 @@ + #define internal_syscall5(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ 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 __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7") = (long) (arg4); \ +- register long __a4 asm ("$8") = (long) (arg5); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7") = _arg4; \ ++ register long int __a4 asm ("$8") = _arg5; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +@@ -263,18 +278,24 @@ + #define internal_syscall6(v0_init, input, number, err, \ + arg1, arg2, arg3, arg4, arg5, arg6) \ + ({ \ +- long _sys_result; \ ++ long int _sys_result; \ + \ + { \ +- register long __s0 asm ("$16") __attribute__ ((unused)) \ ++ 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); \ ++ long int _arg6 = (long int) (arg6); \ ++ register long int __s0 asm ("$16") __attribute__ ((unused)) \ + = (number); \ +- register long __v0 asm ("$2"); \ +- register long __a0 asm ("$4") = (long) (arg1); \ +- register long __a1 asm ("$5") = (long) (arg2); \ +- register long __a2 asm ("$6") = (long) (arg3); \ +- register long __a3 asm ("$7") = (long) (arg4); \ +- register long __a4 asm ("$8") = (long) (arg5); \ +- register long __a5 asm ("$9") = (long) (arg6); \ ++ register long int __v0 asm ("$2"); \ ++ register long int __a0 asm ("$4") = _arg1; \ ++ register long int __a1 asm ("$5") = _arg2; \ ++ register long int __a2 asm ("$6") = _arg3; \ ++ register long int __a3 asm ("$7") = _arg4; \ ++ register long int __a4 asm ("$8") = _arg5; \ ++ register long int __a5 asm ("$9") = _arg6; \ + __asm__ volatile ( \ + ".set\tnoreorder\n\t" \ + v0_init \ +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscall.S b/sysdeps/unix/sysv/linux/mips/mips64/syscall.S +index 26adf2cd04..a9baff3c17 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/syscall.S ++++ b/sysdeps/unix/sysv/linux/mips/mips64/syscall.S +@@ -20,7 +20,7 @@ + #include <sys/asm.h> + + /* Usage: +- long syscall (syscall_number, arg1, arg2, arg3, arg4, arg5, arg6, arg7) ++ long int syscall (syscall_number, arg1, arg2, arg3, arg4, arg5, arg6, arg7) + + We need to do some arg shifting, syscall_number will be in v0. */ + +diff --git a/sysdeps/unix/sysv/linux/mips/sysdep.h b/sysdeps/unix/sysv/linux/mips/sysdep.h +index cdfc0b1b58..a4cf1540fe 100644 +--- a/sysdeps/unix/sysv/linux/mips/sysdep.h ++++ b/sysdeps/unix/sysv/linux/mips/sysdep.h +@@ -36,8 +36,8 @@ + the INTERNAL_SYSCALL_{ERROR_P,ERRNO} macros work correctly. */ + #define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...) \ + ({ \ +- long _ret = funcptr (args); \ +- err = ((unsigned long) (_ret) >= (unsigned long) -4095L); \ ++ long int _ret = funcptr (args); \ ++ err = ((unsigned long int) (_ret) >= (unsigned long int) -4095L); \ + if (err) \ + _ret = -_ret; \ + _ret; \ +diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h +index 201bf9a91b..2bd9b16f32 100644 +--- a/sysdeps/unix/sysv/linux/riscv/sysdep.h ++++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h +@@ -176,10 +176,11 @@ + # define internal_syscall1(number, err, arg0) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ + \ + { \ + register long int __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ ++ register long int __a0 asm ("a0") = _arg0; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -193,11 +194,13 @@ + # define internal_syscall2(number, err, arg0, arg1) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ long int _arg1 = (long int) (arg1); \ + \ + { \ + register long int __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -211,12 +214,15 @@ + # define internal_syscall3(number, err, arg0, arg1, arg2) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ + \ + { \ + register long int __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ +- register long int __a2 asm ("a2") = (long int) (arg2); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ ++ register long int __a2 asm ("a2") = _arg2; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -230,13 +236,17 @@ + # define internal_syscall4(number, err, arg0, arg1, arg2, arg3) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ long int _arg1 = (long int) (arg1); \ ++ long int _arg2 = (long int) (arg2); \ ++ long int _arg3 = (long int) (arg3); \ + \ + { \ + register long int __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ +- register long int __a2 asm ("a2") = (long int) (arg2); \ +- register long int __a3 asm ("a3") = (long int) (arg3); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ ++ register long int __a2 asm ("a2") = _arg2; \ ++ register long int __a3 asm ("a3") = _arg3; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -250,14 +260,19 @@ + # define internal_syscall5(number, err, arg0, arg1, arg2, arg3, arg4) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ 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 __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ +- register long int __a2 asm ("a2") = (long int) (arg2); \ +- register long int __a3 asm ("a3") = (long int) (arg3); \ +- register long int __a4 asm ("a4") = (long int) (arg4); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ ++ register long int __a2 asm ("a2") = _arg2; \ ++ register long int __a3 asm ("a3") = _arg3; \ ++ register long int __a4 asm ("a4") = _arg4; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -271,15 +286,21 @@ + # define internal_syscall6(number, err, arg0, arg1, arg2, arg3, arg4, arg5) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ 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 __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ +- register long int __a2 asm ("a2") = (long int) (arg2); \ +- register long int __a3 asm ("a3") = (long int) (arg3); \ +- register long int __a4 asm ("a4") = (long int) (arg4); \ +- register long int __a5 asm ("a5") = (long int) (arg5); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ ++ register long int __a2 asm ("a2") = _arg2; \ ++ register long int __a3 asm ("a3") = _arg3; \ ++ register long int __a4 asm ("a4") = _arg4; \ ++ register long int __a5 asm ("a5") = _arg5; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ +@@ -294,16 +315,23 @@ + # define internal_syscall7(number, err, arg0, arg1, arg2, arg3, arg4, arg5, arg6) \ + ({ \ + long int _sys_result; \ ++ long int _arg0 = (long int) (arg0); \ ++ 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); \ ++ long int _arg6 = (long int) (arg6); \ + \ + { \ + register long int __a7 asm ("a7") = number; \ +- register long int __a0 asm ("a0") = (long int) (arg0); \ +- register long int __a1 asm ("a1") = (long int) (arg1); \ +- register long int __a2 asm ("a2") = (long int) (arg2); \ +- register long int __a3 asm ("a3") = (long int) (arg3); \ +- register long int __a4 asm ("a4") = (long int) (arg4); \ +- register long int __a5 asm ("a5") = (long int) (arg5); \ +- register long int __a6 asm ("a6") = (long int) (arg6); \ ++ register long int __a0 asm ("a0") = _arg0; \ ++ register long int __a1 asm ("a1") = _arg1; \ ++ register long int __a2 asm ("a2") = _arg2; \ ++ register long int __a3 asm ("a3") = _arg3; \ ++ register long int __a4 asm ("a4") = _arg4; \ ++ register long int __a5 asm ("a5") = _arg5; \ ++ register long int __a6 asm ("a6") = _arg6; \ + __asm__ volatile ( \ + "scall\n\t" \ + : "+r" (__a0) \ diff --git a/debian/patches/series b/debian/patches/series index 89637cc2..f631ec8f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -#git-updates.diff +git-updates.diff locale/check-unknown-symbols.diff locale/locale-print-LANGUAGE.diff |