Merge from trunk.

1 files changed, 33 insertions, 54 deletions

diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
index f0380b1ad..2cf200dc9 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -1,87 +1,66 @@
-/* Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Daniel Jacobowitz <dan@debian.org>, 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.  */
-
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
 /* Massivly hacked up for uClibc by Erik Andersen */
 
-#define mmap __mmap
+#include <_lfs_64.h>
+
+#ifdef __UCLIBC_HAS_LFS__
 
-#include <features.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <sys/syscall.h>
+#include <bits/uClibc_page.h>
 
+libc_hidden_proto(mmap)
 
-#if defined __UCLIBC_HAS_LFS__
+# if !defined __NR_mmap2 || !defined _syscall6
 
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS   64
-#endif
-#ifndef __USE_LARGEFILE64
-# define __USE_LARGEFILE64      1
-#endif
-/* We absolutely do _NOT_ want interfaces silently
- *  * renamed under us or very bad things will happen... */
-#ifdef __USE_FILE_OFFSET64
-# undef __USE_FILE_OFFSET64
-#endif
-
-
-#if ! defined __NR_mmap2 || ! defined _syscall6
-
-/* 
+/*
  * This version is a stub that just chops off everything at the mmap 32 bit
  * mmap() address space...  You will probably need to add in an arch specific
  * implementation to override this as there is not a generic way for me to
  * implement this particular syscall if your arch lacks _syscall6...
  *
-*/
+ */
 
 __ptr_t mmap64(__ptr_t addr, size_t len, int prot, int flags, int fd, __off64_t offset)
 {
-	if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) {
-		__set_errno (EINVAL);
+	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);
+	return mmap(addr, len, prot, flags, fd, (off_t) offset);
 }
 
-#else
+# else
 
-#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);
+#  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
+/* Some architectures always use 12 as page shift for mmap2() eventhough the
+ * real PAGE_SHIFT != 12.  Other architectures use the same value as
+ * PAGE_SHIFT...
+ */
+#  ifndef MMAP2_PAGE_SHIFT
+#   define MMAP2_PAGE_SHIFT 12
+#  endif
 
 __ptr_t mmap64(__ptr_t addr, size_t len, int prot, int flags, int fd, __off64_t offset)
 {
 	if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) {
-		__set_errno (EINVAL);
+		__set_errno(EINVAL);
 		return MAP_FAILED;
 	}
-	return(__syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT)));
+
+	return __syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
 }
 
-#endif
+# endif
 #endif /* __UCLIBC_HAS_LFS__ */