r1573 - in glibc-package/branches/glibc-2.4/debian: . patches patches/alpha
Author: aurel32
Date: 2006-05-29 06:05:44 +0000 (Mon, 29 May 2006)
New Revision: 1573
Removed:
glibc-package/branches/glibc-2.4/debian/patches/alpha/cvs-gcc4-profile.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/alpha/submitted-xstat.diff
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Remove alpha/cvs-gcc4-profile.diff (not needed anymore).
* Update alpha/submitted-xstat.diff.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-29 03:01:32 UTC (rev 1572)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-29 06:05:44 UTC (rev 1573)
@@ -56,6 +56,8 @@
[ Aurelien Jarno ]
* Update all/submitted-new-brf-encoding.diff.
+ * Remove alpha/cvs-gcc4-profile.diff (not needed anymore).
+ * Update alpha/submitted-xstat.diff.
* Remove any/cvs-argp_h.diff (merged upstream).
* Remove any/cvs-ctan.diff (merged upstream).
* Remove any/cvs-futimes.diff (merged upstream).
Deleted: glibc-package/branches/glibc-2.4/debian/patches/alpha/cvs-gcc4-profile.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/alpha/cvs-gcc4-profile.diff 2006-05-29 03:01:32 UTC (rev 1572)
+++ glibc-package/branches/glibc-2.4/debian/patches/alpha/cvs-gcc4-profile.diff 2006-05-29 06:05:44 UTC (rev 1573)
@@ -1,27 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on ia64 fixed by
-# removing strong_alias.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-07-27
-
-
-2005-07-16 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/alpha/dl-machine.h: Remove strong_alias.
-
---- sysdeps/alpha/dl-machine.h.gotom 2005-07-28 14:14:51.803668403 +0900
-+++ sysdeps/alpha/dl-machine.h 2005-07-28 14:15:11.440036959 +0900
-@@ -289,8 +289,7 @@ elf_machine_runtime_setup (struct link_m
- TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup, /* nop */);
- #else
- #define ELF_MACHINE_RUNTIME_TRAMPOLINE \
-- TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup, imb); \
-- strong_alias (_dl_runtime_resolve, _dl_runtime_profile);
-+ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup, imb);
- #endif
-
- /* Initial entry point code for the dynamic linker.
Modified: glibc-package/branches/glibc-2.4/debian/patches/alpha/submitted-xstat.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/alpha/submitted-xstat.diff 2006-05-29 03:01:32 UTC (rev 1572)
+++ glibc-package/branches/glibc-2.4/debian/patches/alpha/submitted-xstat.diff 2006-05-29 06:05:44 UTC (rev 1573)
@@ -19,8 +19,6 @@
2005-02-18 GOTO Masanori <gotom@debian.or.jp>
- * sysdeps/unix/sysv/linux/kernel-features.h: Define
- __ASSUME_STAT64_SYSCALL.
* sysdeps/unix/sysv/linux/alpha/fxstat.c: Check
__ASSUME_STAT64_SYSCALL.
* sysdeps/unix/sysv/linux/alpha/lxstat.c: Likewise.
@@ -29,25 +27,6 @@
__libc_missing_axp_stat64 when it's not needed.
* sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise.
-Index: sysdeps/unix/sysv/linux/kernel-features.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/kernel-features.h,v
-retrieving revision 1.83
-diff -u -p -r1.83 kernel-features.h
---- sysdeps/unix/sysv/linux/kernel-features.h 26 Jan 2005 20:01:10 -0000 1.83
-+++ sysdeps/unix/sysv/linux/kernel-features.h 18 Feb 2005 06:21:10 -0000
-@@ -413,6 +413,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE 1
- #endif
-
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available. */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL 1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
- after exec is always rounded up to the next page. */
- #if __LINUX_KERNEL_VERSION >= 132355
Index: sysdeps/unix/sysv/linux/alpha/fxstat.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/alpha/fxstat.c,v
@@ -264,17 +243,10 @@
diff -u -p -r1.1 xstatconv.h
--- sysdeps/unix/sysv/linux/alpha/xstatconv.h 11 Mar 2004 02:58:44 -0000 1.1
+++ sysdeps/unix/sysv/linux/alpha/xstatconv.h 26 Feb 2005 13:58:07 -0000
-@@ -1,5 +1,5 @@
- /* Convert between the kernel's `struct stat' format, and libc's.
-- 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
@@ -18,7 +18,12 @@
02111-1307 USA. */
- #include "kernel-features.h"
+ #include <kernel-features.h>
+#include <sys/syscall.h>
+#ifdef __NR_stat64
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-29 03:01:32 UTC (rev 1572)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-29 06:05:44 UTC (rev 1573)
@@ -42,9 +42,8 @@
localedata/sort-UTF8-first.diff -p0
localedata/local-all-no-archive.diff
-#alpha/cvs-gcc4-profile.diff -p0
#alpha/submitted-pic.diff -p0 # g: suspended
-#alpha/submitted-xstat.diff -p0
+alpha/submitted-xstat.diff -p0
amd64/local-biarch.diff -p1
Reply to: