[PATCH] alpha: drop __ASSUME_FDATASYNC

[Mike Frysinger]

ping ...
-mike

On 18 Aug 2015 09:25, Mike Frysinger wrote:
> Since we require a new enough kernel all the time, the __ASSUME_FDATASYNC
> define has been hardcoded to 1.  That means we can delete the alpha file
> for fdatasync now and rely on the syscalls list like other ports.
> 
> 2015-08-18  Mike Frysinger  <vapier@gentoo.org>
> 
> 	* sysdeps/unix/sysv/linux/alpha/Makefile (CFLAGS-fdatasync.c): Delete.
> 	* sysdeps/unix/sysv/linux/alpha/fdatasync.c: Delete.
> 	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
> 	(__ASSUME_FDATASYNC): Delete.
> ---
>  sysdeps/unix/sysv/linux/alpha/Makefile          |  1 -
>  sysdeps/unix/sysv/linux/alpha/fdatasync.c       | 48 -------------------------
>  sysdeps/unix/sysv/linux/alpha/kernel-features.h |  3 --
>  3 files changed, 52 deletions(-)
>  delete mode 100644 sysdeps/unix/sysv/linux/alpha/fdatasync.c
> 
> diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
> index 3769bef..c089545 100644
> --- a/sysdeps/unix/sysv/linux/alpha/Makefile
> +++ b/sysdeps/unix/sysv/linux/alpha/Makefile
> @@ -20,7 +20,6 @@ sysdep_routines += osf_select osf_gettimeofday osf_settimeofday \
>  # Support old ipc control
>  sysdep_routines += oldmsgctl oldsemctl oldshmctl
>  
> -CFLAGS-fdatasync.c = -fexceptions
>  CFLAGS-ioperm.c = -Wa,-mev6
>  endif
>  
> diff --git a/sysdeps/unix/sysv/linux/alpha/fdatasync.c b/sysdeps/unix/sysv/linux/alpha/fdatasync.c
> deleted file mode 100644
> index c8b711e..0000000
> --- a/sysdeps/unix/sysv/linux/alpha/fdatasync.c
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -/* fdatasync -- synchronize at least the data part of a file with
> -   the underlying media. Linux version.
> -
> -   Copyright (C) 2007-2015 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library.  If not, see
> -   <http://www.gnu.org/licenses/>.  */
> -
> -#include <errno.h>
> -#include <unistd.h>
> -
> -#include <sysdep-cancel.h>
> -#include <sys/syscall.h>
> -
> -#include <kernel-features.h>
> -
> -int
> -__fdatasync (int fd)
> -{
> -#ifdef __ASSUME_FDATASYNC
> -  return SYSCALL_CANCEL (fdatasync, fd);
> -#elif defined __NR_fdatasync
> -  static int __have_no_fdatasync;
> -
> -  if (!__builtin_expect (__have_no_fdatasync, 0))
> -    {
> -      int result = SYSCALL_CANCEL (fdatasync, fd);
> -      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
> -	return result;
> -
> -      __have_no_fdatasync = 1;
> -    }
> -#endif
> -  return SYSCALL_CANCEL (fsync, fd);
> -}
> -weak_alias (__fdatasync, fdatasync)
> diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> index 13e1b51..7ae9924 100644
> --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> @@ -44,9 +44,6 @@
>  #undef __ASSUME_STATFS64
>  #define __ASSUME_STATFS64 0
>  
> -/* Support for fsyncdata was added for alpha after 2.6.21.  */
> -#define __ASSUME_FDATASYNC	1
> -
>  /* Support for various syscalls was added for alpha in 2.6.33.  */
>  #if __LINUX_KERNEL_VERSION < 0x020621
>  # undef __ASSUME_PREADV
> -- 
> 2.4.4
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20150916/cb285d34/attachment.sig>