diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:38:49 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:38:49 +0000 |
| commit | e0c349b40c4f51589c2adb63ccdaaf4dcc0fb1ea (patch) | |
| tree | af09f53a8011b770b7a71d917905d462125147c9 | |
| parent | 1769608794096c835095826559c0ba1555f43fc0 (diff) | |
| download | glibc-e0c349b40c4f51589c2adb63ccdaaf4dcc0fb1ea.tar.gz | |
Use better variable names in MIPS syscall macros.
Carlos noted in
<https://sourceware.org/ml/libc-alpha/2015-05/msg00680.html> that
various ports use potentially problematic short variables names in
their syscall macros, which could shadow variables with the same name
from containing scopes.
This patch fixes variables called err and ret in MIPS macros. (I left
result_var and _sys_result - separate variables in different macros,
which need separate names - alone.)
Tested for mips64 (all three ABIs) that installed stripped shared
libraries are unchanged by this patch.
* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (INLINE_SYSCALL):
Use variable name _sc_err instead of err.
[__mips16] (INTERNAL_SYSCALL_NCS): Use variable name _sc_ret
instead of ret.
* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
(INLINE_SYSCALL): Use variable name _sc_err instead of err.
* sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
(INLINE_SYSCALL): Likewise.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/sysdep.h | 16 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h | 8 |
4 files changed, 25 insertions, 16 deletions
@@ -1,5 +1,14 @@ 2015-06-02 Joseph Myers <joseph@codesourcery.com> + * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (INLINE_SYSCALL): + Use variable name _sc_err instead of err. + [__mips16] (INTERNAL_SYSCALL_NCS): Use variable name _sc_ret + instead of ret. + * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h + (INLINE_SYSCALL): Use variable name _sc_err instead of err. + * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h + (INLINE_SYSCALL): Likewise. + * string/strnlen.c [!STRNLEN] (__strnlen): Use libc_hidden_def. * include/string.h (__strnlen): Use libc_hidden_proto. * sysdeps/aarch64/strnlen.S (__strnlen): Use libc_hidden_def. diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h index e5025bad5b..a2aa38ddd7 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h @@ -49,11 +49,11 @@ call. */ #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ - ({ INTERNAL_SYSCALL_DECL(err); \ - long result_var = INTERNAL_SYSCALL (name, err, nr, args); \ - if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ + long 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, err)); \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ result_var = -1L; \ } \ result_var; }) @@ -111,10 +111,10 @@ # define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \ ({ \ - union __mips16_syscall_return ret; \ - ret.val = __mips16_syscall##nr (args, number); \ - err = ret.reg.v1; \ - ret.reg.v0; \ + union __mips16_syscall_return _sc_ret; \ + _sc_ret.val = __mips16_syscall##nr (args, number); \ + err = _sc_ret.reg.v1; \ + _sc_ret.reg.v0; \ }) # define INTERNAL_SYSCALL_MIPS16(number, err, nr, args...) \ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h index ac663bc1f2..4c28af6c3e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h @@ -51,11 +51,11 @@ call. */ #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ - ({ INTERNAL_SYSCALL_DECL(err); \ - long result_var = INTERNAL_SYSCALL (name, err, nr, args); \ - if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ + long 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, err)); \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ result_var = -1L; \ } \ result_var; }) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h index 312f21007d..1fc038c27f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h @@ -47,11 +47,11 @@ call. */ #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ - ({ INTERNAL_SYSCALL_DECL(err); \ - long result_var = INTERNAL_SYSCALL (name, err, nr, args); \ - if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \ + ({ INTERNAL_SYSCALL_DECL (_sc_err); \ + long 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, err)); \ + __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \ result_var = -1L; \ } \ result_var; }) |