r3051 - in glibc-package/branches/glibc-2.8/debian: . patches patches/alpha
Author: aurel32
Date: 2008-08-08 19:22:13 +0000 (Fri, 08 Aug 2008)
New Revision: 3051
Removed:
glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-xstat.diff
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
- Remove alpha/submitted-xstat.diff (outdated).
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-08 18:59:45 UTC (rev 3050)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-08 19:22:13 UTC (rev 3051)
@@ -15,6 +15,7 @@
- Update localedata/fr_CA-first_weekday.diff.
- Update localedata/fr_CH-first_weekday.diff.
- Update localedata/fr_LU-first_weekday.diff.
+ - Remove alpha/submitted-xstat.diff (outdated).
- Remove amd64/cvs-vdso_clock_gettime.diff (merged).
- Remove arm/cvs-ioperm.diff (merged).
- Remove arm/cvs-gcc4-inline.diff (merged).
Deleted: glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-xstat.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-xstat.diff 2008-08-08 18:59:45 UTC (rev 3050)
+++ glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-xstat.diff 2008-08-08 19:22:13 UTC (rev 3051)
@@ -1,243 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix alpha compile failure when kernel header < 2.6.4 is used.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Submitting
-# DP: Status Details: Submitting
-# DP: Date: 2005-03-03
-
-Subject: [PATCH] alpha compilation fix with the kernel header < 2.6.4.
-
-This patch fixes alpha compilation fix when kernel header (< 2.6.4) is
-used. Note that I unfold the original "fail:" part because enclosing
-only "fail:" with #ifdef __ASSUME_STAT64_SYSCALL and __NR_*stat64 looks
-unseemly.
-
-Regards,
--- gotom
-
-2005-02-18 GOTO Masanori <gotom@debian.or.jp>
-
- * sysdeps/unix/sysv/linux/alpha/fxstat.c: Check
- __ASSUME_STAT64_SYSCALL.
- * 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.
-
-Index: b/sysdeps/unix/sysv/linux/alpha/fxstat.c
-===================================================================
---- a/sysdeps/unix/sysv/linux/alpha/fxstat.c 2008-08-08 19:08:27.000000000 +0200
-+++ b/sysdeps/unix/sysv/linux/alpha/fxstat.c 2008-08-08 19:08:45.000000000 +0200
-@@ -1,5 +1,5 @@
- /* fxstat using old-style Unix stat system call.
-- Copyright (C) 2004 Free Software Foundation, Inc.
-+ Copyright (C) 2004, 2005 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
-@@ -35,27 +35,39 @@
- __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)
-Index: b/sysdeps/unix/sysv/linux/alpha/lxstat.c
-===================================================================
---- a/sysdeps/unix/sysv/linux/alpha/lxstat.c 2008-08-08 19:08:27.000000000 +0200
-+++ b/sysdeps/unix/sysv/linux/alpha/lxstat.c 2008-08-08 19:08:45.000000000 +0200
-@@ -1,5 +1,5 @@
- /* lxstat using old-style Unix stat system call.
-- Copyright (C) 2004 Free Software Foundation, Inc.
-+ Copyright (C) 2004, 2005 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
-@@ -35,27 +35,39 @@
- __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)
-Index: b/sysdeps/unix/sysv/linux/alpha/xstat.c
-===================================================================
---- a/sysdeps/unix/sysv/linux/alpha/xstat.c 2008-08-08 19:08:27.000000000 +0200
-+++ b/sysdeps/unix/sysv/linux/alpha/xstat.c 2008-08-08 19:08:45.000000000 +0200
-@@ -1,5 +1,5 @@
- /* xstat using old-style Unix stat system call.
-- Copyright (C) 2004 Free Software Foundation, Inc.
-+ Copyright (C) 2004, 2005 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
-@@ -35,27 +35,39 @@
- __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)
-Index: b/sysdeps/unix/sysv/linux/alpha/xstatconv.c
-===================================================================
---- a/sysdeps/unix/sysv/linux/alpha/xstatconv.c 2008-08-08 19:08:27.000000000 +0200
-+++ b/sysdeps/unix/sysv/linux/alpha/xstatconv.c 2008-08-08 19:08:45.000000000 +0200
-@@ -1,5 +1,5 @@
- /* Convert between the kernel's `struct stat' format, and libc's.
-- Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2003, 2004, 2005 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
-@@ -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)
-Index: b/sysdeps/unix/sysv/linux/alpha/xstatconv.h
-===================================================================
---- a/sysdeps/unix/sysv/linux/alpha/xstatconv.h 2008-08-08 19:08:27.000000000 +0200
-+++ b/sysdeps/unix/sysv/linux/alpha/xstatconv.h 2008-08-08 19:08:45.000000000 +0200
-@@ -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;
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-08 18:59:45 UTC (rev 3050)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-08 19:22:13 UTC (rev 3051)
@@ -40,7 +40,6 @@
alpha/local-dl-procinfo.diff
alpha/submitted-fdatasync.diff
alpha/submitted-fpu-round.diff
-alpha/submitted-xstat.diff
alpha/submitted-PTR_MANGLE.diff
alpha/submitted-procfs_h.diff
Reply to: