posix_fadvise: make posix_fadvise[64] similar on all archs

Remove all versions, that can be covered by the common one.
Drop incorrectly implemented fallback support, if __NR_fadvise64_64 is not available.
To support 64 bit ppc, move ppc support into common.
Cleanup including headers.

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

2 files changed, 39 insertions, 53 deletions

diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c
index 84b7c40d0..22df56982 100644
--- a/libc/sysdeps/linux/common/posix_fadvise.c
+++ b/libc/sysdeps/linux/common/posix_fadvise.c
@@ -9,23 +9,31 @@
  */
 
 #include <sys/syscall.h>
-#include <fcntl.h>
 
 #ifdef __NR_fadvise64
-#define __NR_posix_fadvise __NR_fadvise64
+# include <fcntl.h>
+# include <endian.h>
+# include <bits/wordsize.h>
+
 int posix_fadvise(int fd, off_t offset, off_t len, int advice)
 {
 	int ret;
 	INTERNAL_SYSCALL_DECL(err);
-	ret = (int) (INTERNAL_SYSCALL(posix_fadvise, err, 5, fd,
-	 __LONG_LONG_PAIR (offset >> 31, offset), len, advice));
-    if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-      return INTERNAL_SYSCALL_ERRNO (ret, err);
-    return 0;
+# if __WORDSIZE == 64
+	ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice);
+# else
+#  ifdef __powerpc__
+	ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
+#  else
+	ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd,
+#  endif
+				   __LONG_LONG_PAIR (offset >> 31, offset), len, advice);
+# endif
+	if (INTERNAL_SYSCALL_ERROR_P (ret, err))
+		return INTERNAL_SYSCALL_ERRNO (ret, err);
+	return 0;
 }
-
-# if defined __UCLIBC_HAS_LFS__ && !defined __NR_fadvise64_64
+# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64)
 strong_alias(posix_fadvise,posix_fadvise64)
 # endif
-
 #endif
diff --git a/libc/sysdeps/linux/common/posix_fadvise64.c b/libc/sysdeps/linux/common/posix_fadvise64.c
index fa9ff219f..de813ba15 100644
--- a/libc/sysdeps/linux/common/posix_fadvise64.c
+++ b/libc/sysdeps/linux/common/posix_fadvise64.c
@@ -8,55 +8,33 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include <features.h>
-#include <unistd.h>
-#include <errno.h>
-#include <endian.h>
-#include <stdint.h>
-#include <sys/types.h>
+#include <_lfs_64.h>
 #include <sys/syscall.h>
-#include <fcntl.h>
+#include <bits/wordsize.h>
 
-#ifdef __UCLIBC_HAS_LFS__
-#ifdef __NR_fadvise64_64
-
-/* 64 bit implementation is cake ... or more like pie ... */
-#if __WORDSIZE == 64
-
-#define __NR_posix_fadvise64 __NR_fadvise64_64
-
-int posix_fadvise64(int fd, __off64_t offset, __off64_t len, int advice)
-{
-  if (len != (off_t) len)
-    return EOVERFLOW;
-  INTERNAL_SYSCALL_DECL (err);
-    int ret = INTERNAL_SYSCALL (posix_fadvise64, err, 5, fd,
-                               __LONG_LONG_PAIR ((long) (offset >> 32),
-                                                 (long) offset),
-                               (off_t) len, advice);
-  if (!INTERNAL_SYSCALL_ERROR_P (ret, err))
-    return 0;
-  return INTERNAL_SYSCALL_ERRNO (ret, err);
-}
+#ifdef __NR_arm_fadvise64_64
+# define __NR_fadvise64_64 __NR_arm_fadvise64_64
+#endif
 
-/* 32 bit implementation is kind of a pita */
-#elif __WORDSIZE == 32
+#if defined __NR_fadvise64_64 && defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
+# include <fcntl.h>
+# include <endian.h>
 
-int posix_fadvise64(int fd, __off64_t offset, __off64_t len, int advice)
+int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice)
 {
 	INTERNAL_SYSCALL_DECL (err);
+# if defined __powerpc__ || defined __arm__ || defined __xtensa__
+	int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advice,
+				    __LONG_LONG_PAIR((long)(offset >> 32), (long)offset),
+				    __LONG_LONG_PAIR((long)(len >> 32), (long)len));
+# else
 	int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-								__LONG_LONG_PAIR(offset >> 32, offset &  0xffffffff),
-								__LONG_LONG_PAIR(len >> 32, len & 0xffffffff),
-								advice);
-	if (!INTERNAL_SYSCALL_ERROR_P (ret, err))
-		return 0;
-	return INTERNAL_SYSCALL_ERRNO (ret, err);
+				    __LONG_LONG_PAIR((long)(offset >> 32), (long)offset),
+				    __LONG_LONG_PAIR((long)(len >> 32), (long)len),
+				    advice);
+# endif
+	if (INTERNAL_SYSCALL_ERROR_P (ret, err))
+		return INTERNAL_SYSCALL_ERRNO (ret, err);
+	return 0;
 }
-
-#else
-#error your machine is neither 32 bit or 64 bit ... it must be magical
 #endif
-
-#endif /* __NR_fadvise64_64 */
-#endif /* __UCLIBC_HAS_LFS__ */