yann@1365: Original patch from: gentoo/src/patchsets/glibc/2.9/6001_all_alpha-glibc-2.4-xstat.patch
yann@1365: 
yann@1365: -= BEGIN original header =-
yann@1365: http://sources.redhat.com/bugzilla/show_bug.cgi?id=1026
yann@1365: http://sourceware.org/ml/libc-alpha/2005-02/msg00122.html
yann@1365: 
yann@1365: 2005-02-26  GOTO Masanori  <gotom@debian.or.jp>
yann@1365: 
yann@1365: 	* sysdeps/unix/sysv/linux/kernel-features.h: Define
yann@1365: 	__ASSUME_STAT64_SYSCALL.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/fxstat.c: Check
yann@1365: 	__ASSUME_STAT64_SYSCALL.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/fxstatat.c: Likewise.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/lxstat.c: Likewise.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/xstat.c: Likewise.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Don't define
yann@1365: 	__libc_missing_axp_stat64 when it's not needed.
yann@1365: 	* sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise.
yann@1365: 
yann@1365: -= END original header =-
yann@1365: 
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstat.c
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstat.c	2004-03-11 03:58:44.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstat.c	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -35,27 +35,39 @@
yann@1365:  __fxstat (int vers, int fd, struct stat *buf)
yann@1365:  {
yann@1365:    INTERNAL_SYSCALL_DECL (err);
yann@1365: -  int result, errno_out;
yann@1365: +  int result;
yann@1365:    struct kernel_stat kbuf;
yann@1365:  
yann@1365: +#if __ASSUME_STAT64_SYSCALL > 0
yann@1365: +  if (vers == _STAT_VER_KERNEL64)
yann@1365: +    {
yann@1365: +      result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
yann@1365: +      if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365: +	return result;
yann@1365: +      __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365: +      return -1;
yann@1365: +    }
yann@1365: +#elif defined __NR_fstat64
yann@1365:    if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365:      {
yann@1365: +      int errno_out;
yann@1365:        result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
yann@1365:        if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:  	return result;
yann@1365:        errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365:        if (errno_out != ENOSYS)
yann@1365: -	goto fail;
yann@1365: +	{
yann@1365: +	  __set_errno (errno_out);
yann@1365: +	  return -1;
yann@1365: +	}
yann@1365:        __libc_missing_axp_stat64 = 1;
yann@1365:      }
yann@1365: +#endif
yann@1365:  
yann@1365:    result = INTERNAL_SYSCALL (fstat, err, 2, fd, &kbuf);
yann@1365:    if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:      return __xstat_conv (vers, &kbuf, buf);
yann@1365: -  errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365: -  
yann@1365: - fail:
yann@1365: -  __set_errno (errno_out);
yann@1365: +  __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365:    return -1;
yann@1365:  }
yann@1365:  hidden_def (__fxstat)
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstatat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstatat.c
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstatat.c	2006-02-20 23:51:48.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstatat.c	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -65,6 +65,20 @@
yann@1365:    int result, errno_out;
yann@1365:    struct kernel_stat kst;
yann@1365:  
yann@1365: +#if __ASSUME_STAT64_SYSCALL > 0
yann@1365: +  if (vers == _STAT_VER_KERNEL64)
yann@1365: +    {
yann@1365: +      if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365: +	result = INTERNAL_SYSCALL (lstat64, err, 2, file, st);
yann@1365: +      else
yann@1365: +	result = INTERNAL_SYSCALL (stat64, err, 2, file, st);
yann@1365: +
yann@1365: +      if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365: +	return result;
yann@1365: +      errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365: +      goto fail;
yann@1365: +    }
yann@1365: +#elif defined __NR_stat64
yann@1365:    if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365:      {
yann@1365:        if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365: @@ -79,6 +93,7 @@
yann@1365:  	goto fail;
yann@1365:        __libc_missing_axp_stat64 = 1;
yann@1365:      }
yann@1365: +#endif
yann@1365:  
yann@1365:    if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365:      result = INTERNAL_SYSCALL (lstat, err, 2, file, &kst);
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/lxstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/lxstat.c
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/lxstat.c	2004-03-11 03:58:44.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/lxstat.c	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -35,27 +35,39 @@
yann@1365:  __lxstat (int vers, const char *name, struct stat *buf)
yann@1365:  {
yann@1365:    INTERNAL_SYSCALL_DECL (err);
yann@1365: -  int result, errno_out;
yann@1365: +  int result;
yann@1365:    struct kernel_stat kbuf;
yann@1365:  
yann@1365: +#if __ASSUME_STAT64_SYSCALL > 0
yann@1365: +  if (vers == _STAT_VER_KERNEL64)
yann@1365: +    {
yann@1365: +      result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
yann@1365: +      if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365: +	return result;
yann@1365: +      __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365: +      return -1;
yann@1365: +    }
yann@1365: +#elif defined __NR_lstat64
yann@1365:    if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365:      {
yann@1365: +      int errno_out;
yann@1365:        result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
yann@1365:        if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:  	return result;
yann@1365:        errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365:        if (errno_out != ENOSYS)
yann@1365: -	goto fail;
yann@1365: +	{
yann@1365: +	  __set_errno (errno_out);
yann@1365: +	  return -1;
yann@1365: +	}
yann@1365:        __libc_missing_axp_stat64 = 1;
yann@1365:      }
yann@1365: +#endif
yann@1365:  
yann@1365:    result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf);
yann@1365:    if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:      return __xstat_conv (vers, &kbuf, buf);
yann@1365: -  errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365: -  
yann@1365: - fail:
yann@1365: -  __set_errno (errno_out);
yann@1365: +  __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365:    return -1;
yann@1365:  }
yann@1365:  hidden_def (__lxstat)
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstat.c
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstat.c	2004-03-11 03:58:44.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstat.c	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -35,27 +35,39 @@
yann@1365:  __xstat (int vers, const char *name, struct stat *buf)
yann@1365:  {
yann@1365:    INTERNAL_SYSCALL_DECL (err);
yann@1365: -  int result, errno_out;
yann@1365: +  int result;
yann@1365:    struct kernel_stat kbuf;
yann@1365:  
yann@1365: +#if __ASSUME_STAT64_SYSCALL > 0
yann@1365: +  if (vers == _STAT_VER_KERNEL64)
yann@1365: +    {
yann@1365: +      result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
yann@1365: +      if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365: +	return result;
yann@1365: +      __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365: +      return -1;
yann@1365: +    }
yann@1365: +#elif defined __NR_stat64
yann@1365:    if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365:      {
yann@1365: +      int errno_out;
yann@1365:        result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
yann@1365:        if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:  	return result;
yann@1365:        errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365:        if (errno_out != ENOSYS)
yann@1365: -	goto fail;
yann@1365: +	{
yann@1365: +	  __set_errno (errno_out);
yann@1365: +	  return -1;
yann@1365: +	}
yann@1365:        __libc_missing_axp_stat64 = 1;
yann@1365:      }
yann@1365: +#endif
yann@1365:  
yann@1365:    result = INTERNAL_SYSCALL (stat, err, 2, name, &kbuf);
yann@1365:    if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365:      return __xstat_conv (vers, &kbuf, buf);
yann@1365: -  errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365: -  
yann@1365: - fail:
yann@1365: -  __set_errno (errno_out);
yann@1365: +  __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365:    return -1;
yann@1365:  }
yann@1365:  hidden_def (__xstat)
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.c
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.c	2004-03-11 03:58:44.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.c	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -22,9 +22,14 @@
yann@1365:  #include <sys/stat.h>
yann@1365:  #include <kernel_stat.h>
yann@1365:  #include <xstatconv.h>
yann@1365: +#include <sys/syscall.h>
yann@1365:  
yann@1365:  
yann@1365: +#ifdef __NR_stat64
yann@1365: +# if __ASSUME_STAT64_SYSCALL == 0
yann@1365:  int __libc_missing_axp_stat64;
yann@1365: +# endif
yann@1365: +#endif
yann@1365:  
yann@1365:  int
yann@1365:  __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.h glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.h
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.h	2006-01-08 09:21:16.000000000 +0100
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.h	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -18,7 +18,12 @@
yann@1365:     02111-1307 USA.  */
yann@1365:  
yann@1365:  #include <kernel-features.h>
yann@1365: +#include <sys/syscall.h>
yann@1365:  
yann@1365: +#ifdef __NR_stat64
yann@1365: +# if __ASSUME_STAT64_SYSCALL == 0
yann@1365:  extern int __libc_missing_axp_stat64 attribute_hidden;
yann@1365: +# endif
yann@1365: +#endif
yann@1365:  extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
yann@1365:    attribute_hidden;
yann@1365: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2_9/sysdeps/unix/sysv/linux/kernel-features.h
yann@1365: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/kernel-features.h	2008-08-01 23:51:04.000000000 +0200
yann@1365: +++ glibc-2_9/sysdeps/unix/sysv/linux/kernel-features.h	2009-02-02 22:01:30.000000000 +0100
yann@1365: @@ -395,6 +395,11 @@
yann@1365:  # define __ASSUME_GETDENTS32_D_TYPE	1
yann@1365:  #endif
yann@1365:  
yann@1365: +/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
yann@1365: +#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
yann@1365: +# define __ASSUME_STAT64_SYSCALL	1
yann@1365: +#endif
yann@1365: +
yann@1365:  /* Starting with version 2.5.3, the initial location returned by `brk'
yann@1365:     after exec is always rounded up to the next page.  */
yann@1365:  #if __LINUX_KERNEL_VERSION >= 132355