From 2b836fc1d536a44282010643e438257cb599d1d0 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 19 Mar 2011 13:39:32 +0100 Subject: mmap.c: provide a common mmap.c that is good for most of archs Remove all others, only avr32 needs to be kept. Define __UCLIBC_ARCH_HAS_6_ARGS__ where needed. Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/arm/Makefile.arch | 2 +- libc/sysdeps/linux/arm/mmap.c | 74 ------------------------------------ 2 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 libc/sysdeps/linux/arm/mmap.c (limited to 'libc/sysdeps/linux/arm') diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch index 093eb2dbd..0cc2626f3 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -5,7 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC := brk.c ioperm.c iopl.c mmap.c __syscall_error.c sigaction.c +CSRC := brk.c ioperm.c iopl.c __syscall_error.c sigaction.c SSRC := \ __longjmp.S setjmp.S bsd-setjmp.S \ diff --git a/libc/sysdeps/linux/arm/mmap.c b/libc/sysdeps/linux/arm/mmap.c deleted file mode 100644 index df550fedf..000000000 --- a/libc/sysdeps/linux/arm/mmap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * _mmap() for uClibc - * - * Copyright (C) 2000-2004 by Erik Andersen - * - * GNU Library General Public License (LGPL) version 2 or later. - */ -#include -#include -#include -#include - -#if defined (__NR_mmap) || defined (__NR_mmap2) - -libc_hidden_proto(mmap) -#if defined (__UCLIBC_MMAP_HAS_6_ARGS__) && defined (__NR_mmap) -#define __NR__mmap __NR_mmap -static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_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 (__ptr_t) _mmap (addr, len, prot, flags, - fd, offset); -} - -#elif defined (__NR_mmap2) -#define __NR__mmap __NR_mmap2 - -#ifndef MMAP2_PAGE_SHIFT -# define MMAP2_PAGE_SHIFT 12 -#endif - -static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_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) -{ - /* check if offset is page aligned */ - if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) - { - __set_errno(EINVAL); - return MAP_FAILED; - } -#ifdef __USE_FILE_OFFSET64 - return (__ptr_t) _mmap (addr, len, prot, flags, - fd, ((__u_quad_t) offset >> MMAP2_PAGE_SHIFT)); -#else - return (__ptr_t) _mmap (addr, len, prot, flags, - fd, ((__u_long) offset >> MMAP2_PAGE_SHIFT)); -#endif -} -#elif defined (__NR_mmap) -# define __NR__mmap __NR_mmap -static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer) -__ptr_t mmap(__ptr_t addr, size_t len, int prot, - int flags, int fd, __off_t offset) -{ - unsigned long buffer[6]; - - buffer[0] = (unsigned long) addr; - buffer[1] = (unsigned long) len; - buffer[2] = (unsigned long) prot; - buffer[3] = (unsigned long) flags; - buffer[4] = (unsigned long) fd; - buffer[5] = (unsigned long) offset; - return (__ptr_t) _mmap(buffer); -} -#endif -libc_hidden_def (mmap) -#else -# error "Your architecture doesn't seem to provide mmap() !?" -#endif -- cgit v1.2.3