diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/grantpt.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/adjtime.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/adjtimex.S | 59 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/syscalls.list | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getdents.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getpt.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigaction.c | 1 |
7 files changed, 8 insertions, 67 deletions
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c index 5625c165b4..6ef8d4912b 100644 --- a/sysdeps/unix/grantpt.c +++ b/sysdeps/unix/grantpt.c @@ -36,7 +36,7 @@ /* This "generic Unix" implementation works because we provide the program /usr/libexec/pt_chown, and it only depends on ptsname() working. */ static const char helper[] = LIBEXECDIR "/pt_chown"; -static char *const argv[] = { "pt_chown", NULL }; +static const char *const argv[] = { "pt_chown", NULL }; int grantpt (fd) diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c index f7df5fcc80..b695ece380 100644 --- a/sysdeps/unix/sysv/linux/alpha/adjtime.c +++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c @@ -126,8 +126,7 @@ weak_alias (__adjtime, adjtime); extern int __syscall_adjtimex_tv64 (struct timex *tx); int -__adjtimex_tv64 (tx) - struct timex *tx; +__adjtimex_tv64 (struct timex *tx) { int ret; diff --git a/sysdeps/unix/sysv/linux/alpha/adjtimex.S b/sysdeps/unix/sysv/linux/alpha/adjtimex.S deleted file mode 100644 index 367b7358e6..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/adjtimex.S +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (C) 1998 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <sysdep.h> -#define _ERRNO_H 1 -#include <bits/errno.h> - -/* The problem here is that initially we made struct timeval compatible with - OSF/1, using int32. But we defined time_t with uint64, and later found - that POSIX requires tv_sec to be time_t. - - So now we have to do compatibility stuff. */ - -.text - -LEAF(__syscall_adjtimex_tv64, 0) - ldgp gp, 0(pv) -#ifdef PROF - .set noat - lda AT, _mcount - jsr AT, (AT), _mcount - .set at -#endif - .prologue 1 - -#ifdef __NR_adjtimex - ldi v0, SYS_ify(adjtimex) - callsys - bne a3, $err64 - - /* Everything ok. */ - ret - - /* If we didn't get ENOSYS, it is a real error. */ - .align 3 -$err64: -#else - /* ENOSYS. */ - ldi v0, ENOSYS -#endif - lda pv, __syscall_error - jmp zero, (pv), __syscall_error - -END(__syscall_adjtimex_tv64) diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index 26d4f15258..96fbc0c323 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -71,3 +71,6 @@ osf_utimes - osf_utimes 2 __utimes_tv32 __utimes@GLIBC_2.0 utimes@GLIBC_2.0 osf_getrusage - osf_getrusage 2 __getrusage_tv32 __getrusage@GLIBC_2.0 getrusage@GLIBC_2.0 osf_wait4 - osf_wait4 2 __wait4_tv32 __wait4@GLIBC_2.0 wait4@GLIBC_2.0 old_adjtimex - old_adjtimex 1 __adjtimex_tv32 __adjtimex@GLIBC_2.0 adjtimex@GLIBC_2.0 + +# and one for timeval64 entry points +adjtimex adjtime adjtimex 1 __syscall_adjtimex_tv64 diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c index b1b532a396..f253878e8b 100644 --- a/sysdeps/unix/sysv/linux/getdents.c +++ b/sysdeps/unix/sysv/linux/getdents.c @@ -59,11 +59,7 @@ struct kernel_dirent correct number of bytes to read. If we should be wrong, we can reset the file descriptor. */ ssize_t -__getdirentries (fd, buf, nbytes, basep) - int fd; - char *buf; - size_t nbytes; - off_t *basep; +__getdirentries (int fd, char *buf, size_t nbytes, off_t *basep) { off_t base = __lseek (fd, (off_t) 0, SEEK_CUR); off_t last_offset = base; diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c index 8eea2ffa82..3c0b7a9399 100644 --- a/sysdeps/unix/sysv/linux/getpt.c +++ b/sysdeps/unix/sysv/linux/getpt.c @@ -21,6 +21,7 @@ #include <fcntl.h> #include <errno.h> #include <stdlib.h> +#include <string.h> #include "pty-internal.h" diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c index 5f9a7feac3..49cb3b6a89 100644 --- a/sysdeps/unix/sysv/linux/sigaction.c +++ b/sysdeps/unix/sysv/linux/sigaction.c @@ -18,6 +18,7 @@ #include <errno.h> #include <signal.h> +#include <string.h> /* The difference here is that the sigaction structure used in the kernel is not the same as we use in the libc. Therefore we must |