From b244adb91931d2ab0ae54d7b5b0fd175382f153d Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 18 Feb 2004 08:18:34 +0000 Subject: Fixup naming of '_mmap' to 'mmap' so it will properly override the symbol in common. --- libc/sysdeps/linux/frv/Makefile | 2 +- libc/sysdeps/linux/frv/_mmap.c | 48 ----------------------------------------- libc/sysdeps/linux/frv/mmap.c | 48 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 libc/sysdeps/linux/frv/_mmap.c create mode 100644 libc/sysdeps/linux/frv/mmap.c diff --git a/libc/sysdeps/linux/frv/Makefile b/libc/sysdeps/linux/frv/Makefile index 77d1326d5..6a9b8e777 100644 --- a/libc/sysdeps/linux/frv/Makefile +++ b/libc/sysdeps/linux/frv/Makefile @@ -33,7 +33,7 @@ SSRC+=mcount.S endif SOBJS=$(patsubst %.S,%.o, $(SSRC)) -CSRC=_mmap.c sysdep.c brk.c sbrk.c __init_brk.c dl-iterate-phdr.c +CSRC=mmap.c sysdep.c brk.c sbrk.c __init_brk.c dl-iterate-phdr.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) diff --git a/libc/sysdeps/linux/frv/_mmap.c b/libc/sysdeps/linux/frv/_mmap.c deleted file mode 100644 index b3fd7c3d8..000000000 --- a/libc/sysdeps/linux/frv/_mmap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Daniel Jacobowitz , 1999. - - 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, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Massivly hacked up for uClibc by Erik Andersen */ - -/* Extracted from ../common/mmap64.c by Alexandre Oliva - - We don't want to use the old mmap interface. */ - -#include -#include -#include -#include -#include - -#define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, - size_t, len, int, prot, int, flags, int, fd, off_t, offset); - -/* This is always 12, even on architectures where PAGE_SHIFT != 12. */ -# ifndef MMAP2_PAGE_SHIFT -# define MMAP2_PAGE_SHIFT 12 -# endif - -__ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) -{ - if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) { - __set_errno (EINVAL); - return MAP_FAILED; - } - return(__syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT))); -} diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c new file mode 100644 index 000000000..b3fd7c3d8 --- /dev/null +++ b/libc/sysdeps/linux/frv/mmap.c @@ -0,0 +1,48 @@ +/* Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Daniel Jacobowitz , 1999. + + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Massivly hacked up for uClibc by Erik Andersen */ + +/* Extracted from ../common/mmap64.c by Alexandre Oliva + + We don't want to use the old mmap interface. */ + +#include +#include +#include +#include +#include + +#define __NR___syscall_mmap2 __NR_mmap2 +static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, + size_t, len, int, prot, int, flags, int, fd, off_t, offset); + +/* This is always 12, even on architectures where PAGE_SHIFT != 12. */ +# ifndef MMAP2_PAGE_SHIFT +# define MMAP2_PAGE_SHIFT 12 +# endif + +__ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) +{ + if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) { + __set_errno (EINVAL); + return MAP_FAILED; + } + return(__syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT))); +} -- cgit v1.2.3