lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-11-03 20:53:13 +03:00
Code Activity

alpha: Purge __ASSUME_STAT64_SYSCALL

Browse Source
This commit is contained in:
Richard Henderson
2012-08-07 09:11:31 -07:00
parent 3381e4ff2d
commit 6360984bc3
8 changed files with 22 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ports/ChangeLog.alpha
View File

@@ -1,3 +1,15 @@
2012-08-08 Richard Henderson <rth@redhat.com>
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_STAT64_SYSCALL): Remove.
* sysdeps/unix/sysv/linux/alpha/fxstat.c: Remove test
for __ASSUME_STAT64_SYSCALL.
* sysdeps/unsx/sysv/linux/alpha/fxstatat.c: Likewise.
* sysdeps/unsx/sysv/linux/alpha/lxstat.c: Likewise.
* sysdeps/unsx/sysv/linux/alpha/xstat.c: Likewise.
* sysdeps/unsx/sysv/linux/alpha/xstatconv.c: Likewise.
* sysdeps/unsx/sysv/linux/alpha/xstatconv.h: Likewise.
2012-08-07 Joseph Myers <joseph@codesourcery.com> 2012-08-07 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/alpha/kernel-features.h * sysdeps/unix/sysv/linux/alpha/kernel-features.h

19
ports/sysdeps/unix/sysv/linux/alpha/fxstat.c
View File

@@ -1,5 +1,5 @@
/* fxstat using old-style Unix stat system call. /* fxstat using old-style Unix stat system call.
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,6 @@ __fxstat (int vers, int fd, struct stat *buf)
int result; int result;
struct kernel_stat kbuf; struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64) if (vers == _STAT_VER_KERNEL64)
{ {
result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf); result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
@@ -46,22 +45,6 @@ __fxstat (int vers, int fd, struct stat *buf)
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err)); __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1; return -1;
} }
#elif defined __NR_fstat64
if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
{
int errno_out;
result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
if (errno_out != ENOSYS)
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (fstat, err, 2, fd, &kbuf); result = INTERNAL_SYSCALL (fstat, err, 2, fd, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))

31
ports/sysdeps/unix/sysv/linux/alpha/fxstatat.c
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. /* Copyright (C) 2005-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -32,9 +32,6 @@
#ifdef __ASSUME_ATFCTS #ifdef __ASSUME_ATFCTS
# define __have_atfcts 1 # define __have_atfcts 1
#endif #endif
#ifdef __ASSUME_STAT64_SYSCALL
# define __libc_missing_axp_stat64 0
#endif
/* Get information about the file NAME in BUF. */ /* Get information about the file NAME in BUF. */
int int
@@ -99,38 +96,14 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
file = buf; file = buf;
} }
#ifdef __NR_stat64
if (!__libc_missing_axp_stat64)
{
if (flag & AT_SYMLINK_NOFOLLOW) if (flag & AT_SYMLINK_NOFOLLOW)
result = INTERNAL_SYSCALL (lstat64, err, 2, file, st); result = INTERNAL_SYSCALL (lstat64, err, 2, file, st);
else else
result = INTERNAL_SYSCALL (stat64, err, 2, file, st); result = INTERNAL_SYSCALL (stat64, err, 2, file, st);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result; return result;
errno_out = INTERNAL_SYSCALL_ERRNO (result, err); errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
# if __ASSUME_STAT64_SYSCALL == 0
if (errno_out == ENOSYS)
__libc_missing_axp_stat64 = 1;
else
# endif
goto fail;
}
#endif /* __NR_stat64 */
struct kernel_stat kst;
if (flag & AT_SYMLINK_NOFOLLOW)
result = INTERNAL_SYSCALL (lstat, err, 2, file, &kst);
else
result = INTERNAL_SYSCALL (stat, err, 2, file, &kst);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return __xstat_conv (vers, &kst, st);
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
fail:
__atfct_seterrno (errno_out, fd, buf); __atfct_seterrno (errno_out, fd, buf);
return -1; return -1;

3
ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
View File

@@ -23,9 +23,6 @@
/* The tgkill syscall was introduced for alpha 2.6.0-test1. */ /* The tgkill syscall was introduced for alpha 2.6.0-test1. */
#define __ASSUME_TGKILL 1 #define __ASSUME_TGKILL 1
/* Starting with version 2.6.4, the stat64 syscalls are available. */
#define __ASSUME_STAT64_SYSCALL 1
#define __ASSUME_UTIMES 1 #define __ASSUME_UTIMES 1
/* Starting with version 2.6.9, SSI_IEEE_RAISE_EXCEPTION exists. */ /* Starting with version 2.6.9, SSI_IEEE_RAISE_EXCEPTION exists. */

19
ports/sysdeps/unix/sysv/linux/alpha/lxstat.c
View File

@@ -1,5 +1,5 @@
/* lxstat using old-style Unix stat system call. /* lxstat using old-style Unix stat system call.
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,6 @@ __lxstat (int vers, const char *name, struct stat *buf)
int result; int result;
struct kernel_stat kbuf; struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64) if (vers == _STAT_VER_KERNEL64)
{ {
result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf); result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
@@ -46,22 +45,6 @@ __lxstat (int vers, const char *name, struct stat *buf)
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err)); __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1; return -1;
} }
#elif defined __NR_lstat64
if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
{
int errno_out;
result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
if (errno_out != ENOSYS)
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf); result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))

19
ports/sysdeps/unix/sysv/linux/alpha/xstat.c
View File

@@ -1,5 +1,5 @@
/* xstat using old-style Unix stat system call. /* xstat using old-style Unix stat system call.
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,6 @@ __xstat (int vers, const char *name, struct stat *buf)
int result; int result;
struct kernel_stat kbuf; struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64) if (vers == _STAT_VER_KERNEL64)
{ {
result = INTERNAL_SYSCALL (stat64, err, 2, name, buf); result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
@@ -46,22 +45,6 @@ __xstat (int vers, const char *name, struct stat *buf)
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err)); __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1; return -1;
} }
#elif defined __NR_stat64
if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
{
int errno_out;
result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
if (errno_out != ENOSYS)
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (stat, err, 2, name, &kbuf); result = INTERNAL_SYSCALL (stat, err, 2, name, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))

9
ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
View File

@@ -1,5 +1,5 @@
/* Convert between the kernel's `struct stat' format, and libc's. /* Convert between the kernel's `struct stat' format, and libc's.
Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 1997-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -23,13 +23,6 @@
#include <xstatconv.h> #include <xstatconv.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#ifdef __NR_stat64
# if __ASSUME_STAT64_SYSCALL == 0
int __libc_missing_axp_stat64;
# endif
#endif
int int
__xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
{ {

7
ports/sysdeps/unix/sysv/linux/alpha/xstatconv.h
View File

@@ -1,5 +1,5 @@
/* Convert between the kernel's `struct stat' format, and libc's. /* Convert between the kernel's `struct stat' format, and libc's.
Copyright (C) 2004, 2006 Free Software Foundation, Inc. Copyright (C) 2004-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,5 @@
#include <kernel-features.h> #include <kernel-features.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#ifdef __NR_stat64
# if __ASSUME_STAT64_SYSCALL == 0
extern int __libc_missing_axp_stat64 attribute_hidden;
# endif
#endif
extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
attribute_hidden; attribute_hidden;