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 --------------------------------- 2 files changed, 34 deletions(-) delete mode 100644 libc/sysdeps/linux/arm/posix_fadvise.c (limited to 'libc/sysdeps/linux/arm') 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 -- cgit v1.2.3