mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

alpha: fix *xstat.c build failure for Linux headers < 2.6.4

Browse Source 
Fixes glibc bug 1026.
http://sourceware.org/ml/libc-alpha/2005-02/msg00122.html

Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
GOTO Masanori 2010-05-03 23:25:04 -04:00 committed by Richard Henderson
parent b1ab8c5fd9
commit 6a84c77c71
8 changed files with 97 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog.alpha
View File

@ -1,3 +1,16 @@
2010-05-03 GOTO Masanori <gotom@debian.or.jp>
* sysdeps/unix/sysv/linux/alpha/kernel-features.h: Define
__ASSUME_STAT64_SYSCALL.
* sysdeps/unix/sysv/linux/alpha/fxstat.c: Check
__ASSUME_STAT64_SYSCALL.
* sysdeps/unix/sysv/linux/alpha/fxstatat.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Don't define
__libc_missing_axp_stat64 when it's not needed.
* sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise.
2010-03-30 Richard Henderson <rth@redhat.com>
* sysdeps/unix/sysv/linux/alpha/bits/socket.h (MSG_WAITFORONE): New.

24
sysdeps/unix/sysv/linux/alpha/fxstat.c
View File

@ -35,27 +35,39 @@ int
__fxstat (int vers, int fd, struct stat *buf)
{
INTERNAL_SYSCALL_DECL (err);
int result, errno_out;
int result;
struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64)
{
result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
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)
goto fail;
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (fstat, err, 2, fd, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return __xstat_conv (vers, &kbuf, buf);
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
fail:
__set_errno (errno_out);
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1;
}
hidden_def (__fxstat)

15
sysdeps/unix/sysv/linux/alpha/fxstatat.c
View File

@ -71,6 +71,20 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
int result, errno_out;
struct kernel_stat kst;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64)
{
if (flag & AT_SYMLINK_NOFOLLOW)
result = INTERNAL_SYSCALL (lstat64, err, 2, file, st);
else
result = INTERNAL_SYSCALL (stat64, err, 2, file, st);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
goto fail;
}
#elif defined __NR_stat64
if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
{
if (flag & AT_SYMLINK_NOFOLLOW)
@ -85,6 +99,7 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
goto fail;
__libc_missing_axp_stat64 = 1;
}
#endif
if (flag & AT_SYMLINK_NOFOLLOW)
result = INTERNAL_SYSCALL (lstat, err, 2, file, &kst);

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

@ -29,6 +29,11 @@
# define __ASSUME_TGKILL 1
#endif
/* Starting with version 2.6.4, the stat64 syscalls are available. */
#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
# define __ASSUME_STAT64_SYSCALL 1
#endif
#define __ASSUME_UTIMES 1
/* Starting with version 2.6.9, SSI_IEEE_RAISE_EXCEPTION exists. */

24
sysdeps/unix/sysv/linux/alpha/lxstat.c
View File

@ -35,27 +35,39 @@ int
__lxstat (int vers, const char *name, struct stat *buf)
{
INTERNAL_SYSCALL_DECL (err);
int result, errno_out;
int result;
struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64)
{
result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
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)
goto fail;
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return __xstat_conv (vers, &kbuf, buf);
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
fail:
__set_errno (errno_out);
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1;
}
hidden_def (__lxstat)

24
sysdeps/unix/sysv/linux/alpha/xstat.c
View File

@ -35,27 +35,39 @@ int
__xstat (int vers, const char *name, struct stat *buf)
{
INTERNAL_SYSCALL_DECL (err);
int result, errno_out;
int result;
struct kernel_stat kbuf;
#if __ASSUME_STAT64_SYSCALL > 0
if (vers == _STAT_VER_KERNEL64)
{
result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return result;
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
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)
goto fail;
{
__set_errno (errno_out);
return -1;
}
__libc_missing_axp_stat64 = 1;
}
#endif
result = INTERNAL_SYSCALL (stat, err, 2, name, &kbuf);
if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return __xstat_conv (vers, &kbuf, buf);
errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
fail:
__set_errno (errno_out);
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
return -1;
}
hidden_def (__xstat)

5
sysdeps/unix/sysv/linux/alpha/xstatconv.c
View File

@ -22,9 +22,14 @@
#include <sys/stat.h>
#include <kernel_stat.h>
#include <xstatconv.h>
#include <sys/syscall.h>
#ifdef __NR_stat64
# if __ASSUME_STAT64_SYSCALL == 0
int __libc_missing_axp_stat64;
# endif
#endif
int
__xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)

5
sysdeps/unix/sysv/linux/alpha/xstatconv.h
View File

@ -18,7 +18,12 @@
02111-1307 USA. */
#include <kernel-features.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)
attribute_hidden;