From ee84b8b40004c970ab0ac660cb04f12cc2748e84 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Apr 2013 05:29:23 -0400 Subject: linux: posix_fadvise: use new SYSCALL_ALIGN_64BIT Now that we have a new SYSCALL_ALIGN_64BIT define for tracking the 64bit register shift behavior, use it. This allows us to delete duplicated arm/xtensa files, as well as drop a few arch ifdefs from common code. Signed-off-by: Mike Frysinger --- libc/sysdeps/linux/arm/Makefile.arch | 1 - libc/sysdeps/linux/arm/posix_fadvise.c | 33 ----------------------------- libc/sysdeps/linux/common/posix_fadvise.c | 2 +- libc/sysdeps/linux/common/posix_fadvise64.c | 3 ++- libc/sysdeps/linux/xtensa/Makefile.arch | 2 -- libc/sysdeps/linux/xtensa/posix_fadvise.c | 27 ----------------------- 6 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 libc/sysdeps/linux/arm/posix_fadvise.c delete mode 100644 libc/sysdeps/linux/xtensa/posix_fadvise.c diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch index 7d35a2356..3054273df 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -14,7 +14,6 @@ SSRC-y := \ SSRC-$(UCLIBC_HAS_LFS) += mmap64.S SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-aeabi_read_tp.S libc-thumb_atomics.S -CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S diff --git a/libc/sysdeps/linux/arm/posix_fadvise.c b/libc/sysdeps/linux/arm/posix_fadvise.c deleted file mode 100644 index f59cbfb6e..000000000 --- a/libc/sysdeps/linux/arm/posix_fadvise.c +++ /dev/null @@ -1,33 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * posix_fadvise() for ARM uClibc - * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fadvise.html - * - * Copyright (C) 2000-2006 Erik Andersen - * - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ -#include - -#ifdef __NR_arm_fadvise64_64 -# include -# include - -# define HIGH_BITS(x) (sizeof(x) > 4 ? (x) >> 32 : 0) - -/* This is for the ARM version of fadvise64_64 which swaps the params - * about to avoid having ABI compat issues - */ -#define __NR___syscall_arm_fadvise64_64 __NR_arm_fadvise64_64 -int posix_fadvise(int fd, off_t offset, off_t len, int advise) -{ - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (arm_fadvise64_64, err, 6, fd, advise, - __LONG_LONG_PAIR (HIGH_BITS(offset), (long)offset), - __LONG_LONG_PAIR (HIGH_BITS(len), (long)len)); - - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -} -#endif diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c index f5bbaccb9..d3e1bd4e8 100644 --- a/libc/sysdeps/linux/common/posix_fadvise.c +++ b/libc/sysdeps/linux/common/posix_fadvise.c @@ -22,7 +22,7 @@ int posix_fadvise(int fd, off_t offset, off_t len, int advice) # if __WORDSIZE == 64 ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice); # else -# ifdef __powerpc__ +# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0, # else ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd, diff --git a/libc/sysdeps/linux/common/posix_fadvise64.c b/libc/sysdeps/linux/common/posix_fadvise64.c index 5a302d3c9..5d8989121 100644 --- a/libc/sysdeps/linux/common/posix_fadvise64.c +++ b/libc/sysdeps/linux/common/posix_fadvise64.c @@ -23,7 +23,8 @@ int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice) { INTERNAL_SYSCALL_DECL (err); -# if defined __powerpc__ || defined __arm__ || defined __xtensa__ + /* ARM has always been funky. */ +# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) || defined(__arm__) int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advice, OFF64_HI_LO (offset), OFF64_HI_LO (len)); # else diff --git a/libc/sysdeps/linux/xtensa/Makefile.arch b/libc/sysdeps/linux/xtensa/Makefile.arch index 0aaa26bc1..eab82ec93 100644 --- a/libc/sysdeps/linux/xtensa/Makefile.arch +++ b/libc/sysdeps/linux/xtensa/Makefile.arch @@ -9,5 +9,3 @@ CSRC-y := brk.c fork.c pread_write.c sigaction.c __syscall_error.c SSRC-y := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S \ sigrestorer.S syscall.S mmap.S windowspill.S __longjmp.S vfork.S - -CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c diff --git a/libc/sysdeps/linux/xtensa/posix_fadvise.c b/libc/sysdeps/linux/xtensa/posix_fadvise.c deleted file mode 100644 index 94006ec64..000000000 --- a/libc/sysdeps/linux/xtensa/posix_fadvise.c +++ /dev/null @@ -1,27 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * posix_fadvise() for Xtensa uClibc - * - * Copyright (C) 2000-2006 Erik Andersen - * Copyright (C) 2007 Tensilica Inc. - * - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ - -#include - -#ifdef __NR_fadvise64_64 -# include -# include - -int posix_fadvise (int fd, off_t offset, off_t len, int advice) -{ - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advice, - __LONG_LONG_PAIR ((long) (offset >> 31), (long) offset), - __LONG_LONG_PAIR ((long) (len >> 31), (long) len)); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -} -#endif -- cgit v1.2.3