From 57682973d4095813dfcf5100ae99200d2fa27820 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 21 Mar 2014 20:45:22 +0100 Subject: [PATCH] uclibc: fix ARC compile Add patch [1,2] to fix ARC uclibc snapshot compile (as suggested by Baruch Siach [3]). Fixes ARC uclibc compile failure ([4]) posix_fadvise/off64_t related. [1] http://thread.gmane.org/gmane.comp.lib.uclibc.general/23714 [2] http://patchwork.ozlabs.org/patch/308533/mbox/ [3] http://lists.busybox.net/pipermail/buildroot/2014-March/092512.html [4] http://lists.busybox.net/pipermail/buildroot/2014-March/092506.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...x_fadvise-Fix-build-breakage-for-LFS.patch | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 package/uclibc/f37101d94284c692ee9b23bc72ef38b9473cd316/uclibc-0001-libc-posix_fadvise-Fix-build-breakage-for-LFS.patch diff --git a/package/uclibc/f37101d94284c692ee9b23bc72ef38b9473cd316/uclibc-0001-libc-posix_fadvise-Fix-build-breakage-for-LFS.patch b/package/uclibc/f37101d94284c692ee9b23bc72ef38b9473cd316/uclibc-0001-libc-posix_fadvise-Fix-build-breakage-for-LFS.patch new file mode 100644 index 0000000000..41fec44909 --- /dev/null +++ b/package/uclibc/f37101d94284c692ee9b23bc72ef38b9473cd316/uclibc-0001-libc-posix_fadvise-Fix-build-breakage-for-LFS.patch @@ -0,0 +1,95 @@ +From patchwork Thu Jan 9 09:35:45 2014 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: libc: posix_fadvise: Fix build breakage for !LFS +From: Vineet Gupta +X-Patchwork-Id: 308533 +Message-Id: <1389260145-8810-1-git-send-email-vgupta@synopsys.com> +To: +Cc: Francois.Bedard@synopsys.com, Vineet Gupta , + markos Chandras +Date: Thu, 9 Jan 2014 15:05:45 +0530 + +commit 00571b43df2e "libc: posix_fadvise: restore implementation for xtensa" +enabled posix_fadvise() for all arches (it was just not generated +before). + +However this also unearthed an issue introduced by ee84b8b400 +"linux: posix_fadvise: use new SYSCALL_ALIGN_64BIT" which is to +referencing LFS'ish code (off64_t) w/o proper checks which causes build +to break for !LFS. + +Fix this by calling posix_fadvise64() only for LFS case and open-code +it's equivalent for !LFS. + +Signed-off-by: Vineet Gupta +Cc: Mike Frysinger +Cc: Baruch Siach +Cc: Khem Raj +Cc: markos Chandras +Cc: Bernhard Reutner-Fischer + +--- +libc/sysdeps/linux/common/posix_fadvise.c | 30 ++++++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 6 deletions(-) + +diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c +index 25c294178e5e..14bbeeea13bc 100644 +--- a/libc/sysdeps/linux/common/posix_fadvise.c ++++ b/libc/sysdeps/linux/common/posix_fadvise.c +@@ -22,17 +22,34 @@ + # include + # include + +-# ifdef __NR_fadvise64_64 +-int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice); +-# endif ++# if defined(__NR_fadvise64_64) && defined(__UCLIBC_HAS_LFS__) ++#include <_lfs_64.h> + ++int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice); + int posix_fadvise(int fd, off_t offset, off_t len, int advice) + { +-# ifdef __NR_fadvise64_64 + return posix_fadvise64(fd, offset, len, advice); +-# else ++} ++#else ++ ++int posix_fadvise(int fd, off_t offset, off_t len, int advice) ++{ + int ret; + INTERNAL_SYSCALL_DECL(err); ++ ++# ifdef __NR_fadvise64_64 ++# if __WORDSIZE == 64 ++ ret = INTERNAL_SYSCALL(fadvise64_64, err, 4, fd, offset, len, advice); ++# else ++# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) || defined(__arm__) ++ ret = INTERNAL_SYSCALL(fadvise64_64, err, 6, fd, advice, ++ OFF_HI_LO (offset), OFF_HI_LO (len)); ++# else ++ ret = INTERNAL_SYSCALL(fadvise64_64, err, 6, fd, ++ OFF_HI_LO (offset), OFF_HI_LO (len), advice); ++# endif ++# endif ++# else /* __NR_fadvise64 */ + # if __WORDSIZE == 64 + ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice); + # else +@@ -43,12 +60,13 @@ int posix_fadvise(int fd, off_t offset, off_t len, int advice) + # endif + OFF_HI_LO (offset), len, advice); + # endif ++# endif + if (INTERNAL_SYSCALL_ERROR_P (ret, err)) + return INTERNAL_SYSCALL_ERRNO (ret, err); + return 0; +-# endif + } + # if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64) + strong_alias(posix_fadvise,posix_fadvise64) + # endif + #endif ++#endif