diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/select.h | 4 | ||||
| -rw-r--r-- | sysdeps/i386/bits/select.h | 4 | ||||
| -rw-r--r-- | sysdeps/stub/atomicity.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ptrace.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/bits/statfs.h | 42 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/ptrace.h | 2 |
8 files changed, 52 insertions, 13 deletions
diff --git a/sysdeps/generic/bits/select.h b/sysdeps/generic/bits/select.h index 8487e21bb3..0da0acbee8 100644 --- a/sysdeps/generic/bits/select.h +++ b/sysdeps/generic/bits/select.h @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_SELECT_H -#error "Never use <bits/select.h> directly; include <sys/select.h> instead." +# error "Never use <bits/select.h> directly; include <sys/select.h> instead." #endif @@ -26,7 +26,7 @@ #define __FD_ZERO(set) \ do { \ unsigned int __i; \ - __fd_mask *__arr = (set); \ + __fd_set *__arr = (set); \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ __arr->fds_bits[__i] = '\0'; \ } while (0) diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index 34d2b0b27a..f2107e9ab7 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_SELECT_H -#error "Never use <bits/select.h> directly; include <sys/select.h> instead." +# error "Never use <bits/select.h> directly; include <sys/select.h> instead." #endif @@ -58,7 +58,7 @@ # define __FD_ZERO(set) \ do { \ unsigned int __i; \ - __fd_mask *__arr = (set); \ + __fd_set *__arr = (set); \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ __arr->fds_bits[__i] = 0; \ } while (0) diff --git a/sysdeps/stub/atomicity.h b/sysdeps/stub/atomicity.h index e9edc83a8d..887ce73384 100644 --- a/sysdeps/stub/atomicity.h +++ b/sysdeps/stub/atomicity.h @@ -1,4 +1,4 @@ -/* Low-level functions for atomitc operations. Stub version. +/* Low-level functions for atomic operations. Stub version. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c index b50234d2a1..1c60931926 100644 --- a/sysdeps/unix/sysv/linux/ptrace.c +++ b/sysdeps/unix/sysv/linux/ptrace.c @@ -21,12 +21,12 @@ #include <sys/ptrace.h> #include <stdarg.h> -extern int __syscall_ptrace (int, pid_t, void *, void *); +extern long int __syscall_ptrace (int, pid_t, void *, void *); -int +long int ptrace (enum __ptrace_request request, ...) { - int res, ret; + long int res, ret; va_list ap; pid_t pid; void *addr, *data; diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/statfs.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/statfs.h new file mode 100644 index 0000000000..9027eca2ac --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/statfs.h @@ -0,0 +1,42 @@ +/* Copyright (C) 1997 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. */ + +/* + * Never include this file directly; use <sys/statfs.h> instead. + */ + +#ifndef _BITS_STATFS_H +#define _BITS_STATFS_H + +#include <bits/types.h> /* for __fsid_t */ + +struct statfs + { + long int f_type; + long int f_bsize; + long int f_blocks; + long int f_bfree; + long int f_bavail; + long int f_files; + long int f_ffree; + __fsid_t f_fsid; + long int f_namelen; + long int f_spare[6]; + }; + +#endif /* bits/statfs.h */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S index bcc134e09c..d63762cb15 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S @@ -44,5 +44,5 @@ ENTRY(longjmp) END(longjmp) strong_alias(longjmp, __longjmp) -eak_alias(longjmp, _longjmp) +weak_alias(longjmp, _longjmp) weak_alias(longjmp, siglongjmp) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list index 66ba470994..e5425e9a29 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list @@ -21,6 +21,3 @@ sendto - sendto 6 __sendto sendto setsockopt - setsockopt 5 __setsockopt setsockopt shutdown - shutdown 2 __shutdown shutdown socketpair - socketpair 4 __socketpair socketpair - -# Another broken Linux/i386 idea layed to rest -ptrace - ptrace 4 __ptrace ptrace diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h index eda8b8c00f..7cde2f0a86 100644 --- a/sysdeps/unix/sysv/linux/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h @@ -93,7 +93,7 @@ enum __ptrace_request appear (those that are used for the particular request) as: pid_t PID, void *ADDR, int DATA, void *ADDR2 after REQUEST. */ -extern int ptrace __P ((enum __ptrace_request __request, ...)); +extern long int ptrace __P ((enum __ptrace_request __request, ...)); __END_DECLS |