diff options
| -rw-r--r-- | sysdeps/unix/sysv/linux/times.c | 28 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/times.c | 35 |
2 files changed, 59 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/times.c b/sysdeps/unix/sysv/linux/times.c index 19b77cf1e0..d2e9c2326b 100644 --- a/sysdeps/unix/sysv/linux/times.c +++ b/sysdeps/unix/sysv/linux/times.c @@ -19,14 +19,34 @@ #include <sys/times.h> #include <sysdep.h> +#ifndef INTERNAL_SYSCALL_TIMES_DECL +# define INTERNAL_SYSCALL_TIMES_DECL(err) \ + INTERNAL_SYSCALL_DECL (err) +#endif + +#ifndef INTERNAL_SYSCALL_TIMES +# define INTERNAL_SYSCALL_TIMES(err, buf) \ + INTERNAL_SYSCALL (times, err, 1, buf) +#endif + +#ifndef INTERNAL_SYSCALL_TIMES_ERROR_P +# define INTERNAL_SYSCALL_TIMES_ERROR_P(ret, err) \ + INTERNAL_SYSCALL_ERROR_P (ret, err) +#endif + +#ifndef INTERNAL_SYSCALL_TIMES_ERRNO +# define INTERNAL_SYSCALL_TIMES_ERRNO(ret, err) \ + INTERNAL_SYSCALL_ERRNO (ret, err) +#endif clock_t __times (struct tms *buf) { - INTERNAL_SYSCALL_DECL (err); - clock_t ret = INTERNAL_SYSCALL (times, err, 1, buf); - if (INTERNAL_SYSCALL_ERROR_P (ret, err) - && __builtin_expect (INTERNAL_SYSCALL_ERRNO (ret, err) == EFAULT, 0) + INTERNAL_SYSCALL_TIMES_DECL (err); + clock_t ret = INTERNAL_SYSCALL_TIMES (err, buf); + if (INTERNAL_SYSCALL_TIMES_ERROR_P (ret, err) + && (__builtin_expect (INTERNAL_SYSCALL_TIMES_ERRNO (ret, err) + == EFAULT, 0)) && buf) { /* This might be an error or not. For architectures which have diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/times.c b/sysdeps/unix/sysv/linux/x86_64/x32/times.c new file mode 100644 index 0000000000..3acbaba5fd --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/times.c @@ -0,0 +1,35 @@ +/* Linux times. X32 version. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* Inline Linux times system call. */ +#define INTERNAL_SYSCALL_TIMES(err, buf) \ + ({ \ + unsigned long long int resultvar; \ + LOAD_ARGS_1 (buf) \ + LOAD_REGS_1 \ + asm volatile ( \ + "syscall\n\t" \ + : "=a" (resultvar) \ + : "0" (__NR_times) ASM_ARGS_1 \ + : "memory", REGISTERS_CLOBBERED_BY_SYSCALL); \ + (long long int) resultvar; }) + +#define INTERNAL_SYSCALL_TIMES_ERROR_P(val, err) \ + ((unsigned long long int) (val) >= -4095LL) + +#include <sysdeps/unix/sysv/linux/times.c> |