diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/Makefile | 14 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/osf/sys/mman.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/mmap.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/sys/mman.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/ultrix4/sys/mman.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/irix4/sys/mman.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/madvise.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/mman.h | 43 |
8 files changed, 77 insertions, 78 deletions
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile index 0e837ca2e7..f8cdb0277a 100644 --- a/sysdeps/unix/Makefile +++ b/sysdeps/unix/Makefile @@ -19,7 +19,7 @@ # The unix-specific configure fragment writes `unix-generated' in config.make. config-generated := $(config-generated) $(unix-generated) -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\ $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/local_lim.h)))))) ifneq (,$(wildcard $(sysincludedir)/sys/param.h)) @@ -43,7 +43,7 @@ common-generated := $(common-generated) local_lim.h mk-local_lim endif -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\ $(patsubst %/sys/param.h,%/,\ $(firstword $(wildcard $(+sysdep_dirs:%=%/sys/param.h)))))) @@ -126,11 +126,11 @@ endif # misc endif # No sysdep sys/param.h. -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\ $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/errno.h)))))) # These need to exist before any compiling is done, -# so cpp doesn't instead find the stub versions. +# so cpp doesn't instead find the generic versions. before-compile := $(before-compile) $(common-objpfx)bits/errno.h $(common-objpfx)bits/errno.h: $(common-objpfx)make-errnos @@ -155,7 +155,7 @@ common-generated := $(common-generated) \ errnos.h errnos make-errnos make-errnos.c endif -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\ $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/ioctls.h)))))) before-compile := $(before-compile) $(common-objpfx)bits/ioctls.h @@ -211,7 +211,7 @@ common-generated := $(common-generated) \ endif ifeq ($(subdir),stdio-common) -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(objpfx),\ $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/errlist.c)))))) before-compile: $(objpfx)errlist.c @@ -228,7 +228,7 @@ generated := $(generated) make_errlist errlist.c endif endif # stdio-common -ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\ +ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\ $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/sys/syscall.h)))))) # The syscall code assumes a file <sys/syscall.h> that defines macros diff --git a/sysdeps/unix/bsd/osf/sys/mman.h b/sysdeps/unix/bsd/osf/sys/mman.h index 816f271e30..cf0bf45673 100644 --- a/sysdeps/unix/bsd/osf/sys/mman.h +++ b/sysdeps/unix/bsd/osf/sys/mman.h @@ -77,7 +77,7 @@ #define MS_INVALIDATE 4 /* Invalidate cached pages. */ /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS @@ -90,31 +90,31 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, off_t __offset)); -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, off_t __offset)); /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. */ -extern int msync __P ((__caddr_t __addr, size_t __len, int __flags)); +extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif __END_DECLS diff --git a/sysdeps/unix/bsd/sun/sunos4/mmap.c b/sysdeps/unix/bsd/sun/sunos4/mmap.c index 7c373c41af..8400aaa1db 100644 --- a/sysdeps/unix/bsd/sun/sunos4/mmap.c +++ b/sysdeps/unix/bsd/sun/sunos4/mmap.c @@ -25,16 +25,16 @@ is nonzero, it is the desired mapping address. If the MAP_FIXED bit is set in FLAGS, the mapping will be at ADDR exactly (which must be page-aligned); otherwise the system chooses a convenient nearby address. - The return value is the actual mapping address chosen or (caddr_t) -1 + The return value is the actual mapping address chosen or MAP_FAILED for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern caddr_t __mmap_syscall (caddr_t addr, size_t len, +extern __ptr_t __mmap_syscall (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset); -caddr_t -__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) +__ptr_t +__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) { return __mmap_syscall (addr, len, prot, flags | _MAP_NEW, fd, offset); } diff --git a/sysdeps/unix/bsd/sun/sunos4/sys/mman.h b/sysdeps/unix/bsd/sun/sunos4/sys/mman.h index d2a8998d9a..420aed9296 100644 --- a/sysdeps/unix/bsd/sun/sunos4/sys/mman.h +++ b/sysdeps/unix/bsd/sun/sunos4/sys/mman.h @@ -74,7 +74,7 @@ #define MS_INVALIDATE 0x2 /* Invalidate caches. */ /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS @@ -87,31 +87,31 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. */ -extern int msync __P ((__caddr_t __addr, size_t __len, int __flags)); +extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif __END_DECLS diff --git a/sysdeps/unix/bsd/ultrix4/sys/mman.h b/sysdeps/unix/bsd/ultrix4/sys/mman.h index 4262fce438..b884ba51ac 100644 --- a/sysdeps/unix/bsd/ultrix4/sys/mman.h +++ b/sysdeps/unix/bsd/ultrix4/sys/mman.h @@ -58,7 +58,7 @@ #endif /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS @@ -71,33 +71,33 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, off_t __offset)); -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, off_t __offset)); /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Ultrix 4 does not implement `msync' or `madvise'. */ /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. */ -extern int msync __P ((caddr_t __addr, size_t __len)); +extern int msync __P ((__ptr_t __addr, size_t __len)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif __END_DECLS diff --git a/sysdeps/unix/sysv/irix4/sys/mman.h b/sysdeps/unix/sysv/irix4/sys/mman.h index c3a923832a..ff1918ec88 100644 --- a/sysdeps/unix/sysv/irix4/sys/mman.h +++ b/sysdeps/unix/sysv/irix4/sys/mman.h @@ -68,7 +68,7 @@ #define MS_INVALIDATE 0x2 /* Invalidate caches. */ /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS @@ -81,31 +81,31 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. */ -extern int msync __P ((caddr_t __addr, size_t __len, int __flags)); +extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif __END_DECLS diff --git a/sysdeps/unix/sysv/linux/madvise.c b/sysdeps/unix/sysv/linux/madvise.c index 72b7d76543..c223184aac 100644 --- a/sysdeps/unix/sysv/linux/madvise.c +++ b/sysdeps/unix/sysv/linux/madvise.c @@ -1 +1 @@ -#include <sysdeps/stub/madvise.c> +#include <sysdeps/generic/madvise.c> diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h index 129702e33c..ea326e2cd9 100644 --- a/sysdeps/unix/sysv/linux/sys/mman.h +++ b/sysdeps/unix/sysv/linux/sys/mman.h @@ -30,7 +30,7 @@ #include <bits/mman.h> /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS /* Map addresses starting near ADDR and extending for LEN bytes. from @@ -42,41 +42,41 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); #ifndef __USE_FILE_OFFSET64 -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); #else -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)) +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)) __asm__ ("mmap64"); #endif #ifdef __USE_LARGEFILE64 -extern __caddr_t mmap64 __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off64_t __offset)); +extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off64_t __offset)); #endif /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. Flags are from the MS_* set. */ -extern int msync __P ((__caddr_t __addr, size_t __len, int __flags)); +extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif /* Cause all currently mapped pages of the process to be memory resident @@ -90,22 +90,21 @@ extern int munlockall __P ((void)); /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ -extern int mlock __P ((__caddr_t __addr, size_t __len)); +extern int mlock __P ((__ptr_t __addr, size_t __len)); /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN). */ -extern int munlock __P ((__caddr_t __addr, size_t __len)); +extern int munlock __P ((__ptr_t __addr, size_t __len)); #ifdef __USE_MISC /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length NEW_LEN. If MAY_MOVE is MREMAP_MAYMOVE the returned address may differ from ADDR. */ -extern __caddr_t __mremap __P ((__caddr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); -extern __caddr_t mremap __P ((__caddr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); +extern __ptr_t __mremap __P ((__ptr_t __addr, size_t __old_len, + size_t __new_len, int __may_move)); +extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len, + size_t __new_len, int __may_move)); #endif __END_DECLS - #endif /* _SYS_MMAN_H */ |