From 96163a465962eb770e2bc0b755bbf5fb52a537c2 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 2 Apr 2015 23:21:30 +0000
Subject: [PATCH] uClibc: backport sync_file_range fixes (closes: #19350)
Signed-off-by: Nicolas Thill <nico@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45249 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../025-libc-sync_file_range.patch | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 toolchain/uClibc/patches-0.9.33.2/025-libc-sync_file_range.patch
diff --git 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
new file mode 100644
index 0000000000..e7efb93689
--- /dev/null
+++ 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
--
GitLab