uClibc: backport sync_file_range fixes (closes: #19350)

Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 45249
10 years ago · 6a5a7db085
parent 7d091dca2e
commit 6a5a7db085
1 changed files with 57 additions and 0 deletions
--- a/toolchain/uClibc/patches-0.9.33.2/025-libc-sync_file_range.patch
+++ b/toolchain/uClibc/patches-0.9.33.2/025-libc-sync_file_range.patch
@ -0,0 +1,57 @@
+Index: uClibc-0.9.33.2/libc/sysdeps/linux/common/sync_file_range.c
+===================================================================
+--- uClibc-0.9.33.2.orig/libc/sysdeps/linux/common/sync_file_range.c	2012-05-15 09:20:09.000000000 +0200
+++ uClibc-0.9.33.2/libc/sysdeps/linux/common/sync_file_range.c	2015-04-03 00:27:47.701221722 +0200
+@@ -4,24 +4,39 @@
+  *
+  * Copyright (C) 2008 Bernhard Reutner-Fischer <uclibc@uclibc.org>
+  *
+- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
+  */
+ 
+ #include <sys/syscall.h>
+-#if defined __USE_GNU
+-#include <fcntl.h>
+#if defined __UCLIBC_HAS_LFS__ && defined __USE_GNU
+# include <bits/wordsize.h>
+# include <endian.h>
+# include <fcntl.h>
+ 
+-#if defined __NR_sync_file_range && defined __UCLIBC_HAS_LFS__
+-#define __NR___syscall_sync_file_range __NR_sync_file_range
+-static __inline__ _syscall6(int, __syscall_sync_file_range, int, fd,
+-		off_t, offset_hi, off_t, offset_lo,
+-		off_t, nbytes_hi, off_t, nbytes_lo, unsigned int, flags)
+# ifdef __NR_sync_file_range2
+#  undef __NR_sync_file_range
+#  define __NR_sync_file_range __NR_sync_file_range2
+# endif
+
+# ifdef __NR_sync_file_range
+ int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags)
+ {
+-	return __syscall_sync_file_range(fd,
+-		__LONG_LONG_PAIR((long)(offset >> 32), (long)(offset & 0xffffffff)),
+-		__LONG_LONG_PAIR((long)(nbytes >> 32), (long)(nbytes & 0xffffffff)),
+-		flags);
+#  if defined __powerpc__ && __WORDSIZE == 64
+	return INLINE_SYSCALL(sync_file_range, 4, fd, flags, offset, nbytes);
+#  elif (defined __mips__ && _MIPS_SIM == _ABIO32) || \
+	(defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) && !(defined(__powerpc__) || defined(__xtensa__)))
+	/* arch with 64-bit data in even reg alignment #2: [arcv2/others-in-future]
+	 * stock syscall handler in kernel (reg hole punched)
+	 * see libc/sysdeps/linux/common/posix_fadvise.c for more details */
+	return INLINE_SYSCALL(sync_file_range, 7, fd, 0,
+			OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags);
+#  elif defined __NR_sync_file_range2
+	return INLINE_SYSCALL(sync_file_range, 6, fd, flags,
+			OFF64_HI_LO(offset), OFF64_HI_LO(nbytes));
+#  else
+	return INLINE_SYSCALL(sync_file_range, 6, fd,
+			OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags);
+#  endif
+ }
+-#endif
+# endif
+ #endif