This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
This patch removes the duplication of mmap64.c. You also need http://sources.redhat.com/ml/libc-hacker/2001-05/msg00070.html for the MIPS support. H.J. --- 2001-05-26 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Moved to ... * sysdeps/unix/sysv/linux/mmap64.c: Here. * sysdeps/unix/sysv/linux/mmap64.c (PAGE_SHIFT): Define if not defined. Check PAGE_SHIFT only if __NR_mmap2 is defined. * sysdeps/unix/sysv/linux/hppa/mmap64.c : Removed. * sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c: Likewise. Index: sysdeps/unix/sysv/linux/powerpc/mmap64.c =================================================================== RCS file: /work/cvs/gnu/glibc/sysdeps/unix/sysv/linux/powerpc/mmap64.c,v retrieving revision 1.1.1.5 diff -u -p -r1.1.1.5 mmap64.c --- sysdeps/unix/sysv/linux/powerpc/mmap64.c 2001/05/05 04:06:28 1.1.1.5 +++ sysdeps/unix/sysv/linux/powerpc/mmap64.c 2001/05/27 07:47:55 @@ -1,88 +0,0 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek <jakub@redhat.com>, 1999. - - 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 <errno.h> -#include <unistd.h> -#include <sys/mman.h> - -#include <sysdep.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include "kernel-features.h" - -/* This is always the constant 12 for this routine, even if the actual - page size is larger. */ -#define PAGE_SHIFT 12 - -#ifdef __NR_mmap2 -extern void *__unbounded __syscall_mmap2(void *__unbounded, size_t, - int, int, int, off_t); -#ifndef __ASSUME_MMAP2_SYSCALL -static int have_no_mmap2; -#endif -#endif - -void * -__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) -{ - if (offset & ((1 << PAGE_SHIFT)-1)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } -#ifdef __NR_mmap2 -# ifndef __ASSUME_MMAP2_SYSCALL - if (! have_no_mmap2) -# endif - { -# ifndef __ASSUME_MMAP2_SYSCALL - int saved_errno = errno; -# endif - void *result; - __ptrvalue (result) = INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), len, - prot, flags, fd, - (off_t) (offset >> PAGE_SHIFT)); -# if __BOUNDED_POINTERS__ - __ptrlow (result) = __ptrvalue (result); - __ptrhigh (result) = __ptrvalue (result) + len; -# endif -# ifndef __ASSUME_MMAP2_SYSCALL - if (result != MAP_FAILED || errno != ENOSYS) -# endif - return result; - -# ifndef __ASSUME_MMAP2_SYSCALL - __set_errno (saved_errno); - have_no_mmap2 = 1; -# endif - } -#endif -#ifndef __ASSUME_MMAP2_SYSCALL - if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } - - return __mmap (addr, len, prot, flags, fd, (off_t) offset); -#endif -} - -weak_alias (__mmap64, mmap64) Index: sysdeps/unix/sysv/linux/mmap64.c =================================================================== RCS file: /work/cvs/gnu/glibc/sysdeps/unix/sysv/linux/mmap64.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 mmap64.c --- sysdeps/unix/sysv/linux/mmap64.c 2000/05/21 21:11:52 1.1.1.1 +++ sysdeps/unix/sysv/linux/mmap64.c 2001/05/27 07:46:42 @@ -1,6 +1,6 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Daniel Jacobowitz <dan@debian.org>, 1999. + Contributed by Jakub Jelinek <jakub@redhat.com>, 1999. 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 @@ -19,21 +19,63 @@ #include <errno.h> #include <unistd.h> +#include <sys/mman.h> #include <sysdep.h> #include <sys/syscall.h> +#include <bp-checks.h> -#include <sys/mman.h> +#include "kernel-features.h" + +#ifdef __NR_mmap2 +#ifndef PAGE_SHIFT +#define PAGE_SHIFT 12 +#endif + +extern void *__unbounded __syscall_mmap2(void *__unbounded, size_t, + int, int, int, off_t); +#ifndef __ASSUME_MMAP2_SYSCALL +static int have_no_mmap2; +#endif +#endif -__ptr_t -__mmap64 (addr, len, prot, flags, fd, offset) - __ptr_t addr; - size_t len; - int prot; - int flags; - int fd; - off64_t offset; +void * +__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) { +#ifdef __NR_mmap2 + if (offset & ((1 << PAGE_SHIFT)-1)) + { + __set_errno (EINVAL); + return MAP_FAILED; + } +# ifndef __ASSUME_MMAP2_SYSCALL + if (! have_no_mmap2) +# endif + { +# ifndef __ASSUME_MMAP2_SYSCALL + int saved_errno = errno; +# endif + void *result; + __ptrvalue (result) = + (void *__unbounded) INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), + len, prot, flags, fd, + (off_t) (offset >> PAGE_SHIFT)); +# if __BOUNDED_POINTERS__ + __ptrlow (result) = __ptrvalue (result); + __ptrhigh (result) = __ptrvalue (result) + len; +# endif +# ifndef __ASSUME_MMAP2_SYSCALL + if (result != MAP_FAILED || errno != ENOSYS) +# endif + return result; + +# ifndef __ASSUME_MMAP2_SYSCALL + __set_errno (saved_errno); + have_no_mmap2 = 1; +# endif + } +#endif +#ifndef __ASSUME_MMAP2_SYSCALL if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) { __set_errno (EINVAL); @@ -41,6 +83,7 @@ __mmap64 (addr, len, prot, flags, fd, of } return __mmap (addr, len, prot, flags, fd, (off_t) offset); +#endif } weak_alias (__mmap64, mmap64) Index: sysdeps/unix/sysv/linux/hppa/mmap64.c =================================================================== RCS file: /work/cvs/gnu/glibc/sysdeps/unix/sysv/linux/hppa/mmap64.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 mmap64.c --- sysdeps/unix/sysv/linux/hppa/mmap64.c 2001/05/05 04:06:09 1.1.1.1 +++ sysdeps/unix/sysv/linux/hppa/mmap64.c 2001/05/27 07:46:42 @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/powerpc/mmap64.c> Index: sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c =================================================================== RCS file: /work/cvs/gnu/glibc/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c,v retrieving revision 1.1.1.2 diff -u -p -r1.1.1.2 mmap64.c --- sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c 2000/07/12 18:52:19 1.1.1.2 +++ sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c 2001/05/27 07:46:57 @@ -1,80 +0,0 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek <jakub@redhat.com>, 1999. - - 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 <errno.h> -#include <unistd.h> -#include <sys/mman.h> - -#include <sysdep.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include "kernel-features.h" - -#ifdef __NR_mmap2 -extern void *__unbounded __syscall_mmap2 (void *__unbounded, size_t, - int, int, int, off_t); -# ifndef __ASSUME_MMAP2_SYSCALL -static int have_no_mmap2; -# endif -#endif - -__ptr_t -__mmap64 (__ptr_t addr, size_t len, int prot, int flags, int fd, off64_t offset) -{ -#ifdef __NR_mmap2 - if ( -# ifndef __ASSUME_MMAP2_SYSCALL - ! have_no_mmap2 && -# endif - ! (offset & 4095)) - { -# ifndef __ASSUME_MMAP2_SYSCALL - int saved_errno = errno; -# endif - /* This will be always 12, no matter what page size is. */ - __ptr_t result; - __ptrvalue (result) = - (void *__unbounded) INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags, - fd, (off_t) (offset >> 12)); -# if __BOUNDED_POINTERS__ - __ptrlow (result) = __ptrvalue (result); - __ptrhigh (result) = __ptrvalue (result) + len; -# endif -# ifndef __ASSUME_MMAP2_SYSCALL - if (result != (__ptr_t) -1 || errno != ENOSYS) -# endif - return result; - -# ifndef __ASSUME_MMAP2_SYSCALL - __set_errno (saved_errno); - have_no_mmap2 = 1; -# endif - } -#endif - if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } - - return __mmap (addr, len, prot, flags, fd, (off_t) offset); -} - -weak_alias (__mmap64, mmap64)
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |