r3985 - in glibc-package/trunk/debian: . patches patches/any patches/powerpc patches/sh4
Author: aurel32
Date: 2009-11-18 14:50:14 +0000 (Wed, 18 Nov 2009)
New Revision: 3985
Removed:
glibc-package/trunk/debian/patches/any/cvs-preadv-pwritev.diff
glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff
glibc-package/trunk/debian/patches/powerpc/cvs-readahead.diff
glibc-package/trunk/debian/patches/sh4/cvs-mixed-arithmetic.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/patches/svn-updates.diff
Log:
* New upstream minor release.
- fix build timeout on SH4. Closes: #552407.
- disabled patches/svn-updates.diff.
- remove patches/powerpc/cvs-readahead.diff (merged).
- remove patches/any/submitted-libgcc_s.so.diff (merged).
- remove patches/any/cvs-preadv-pwritev.diff (merged).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/changelog 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,7 +1,11 @@
-eglibc (2.10.1-8) UNRELEASED; urgency=low
+eglibc (2.10.2-1) UNRELEASED; urgency=low
- * patches/sh4/cvs-mixed-arithmetic.diff: new patch from upstream to fix
- build timeout on SH4. Closes: #552407.
+ * New upstream minor release.
+ - fix build timeout on SH4. Closes: #552407.
+ - disabled patches/svn-updates.diff.
+ - remove patches/powerpc/cvs-readahead.diff (merged).
+ - remove patches/any/submitted-libgcc_s.so.diff (merged).
+ - remove patches/any/cvs-preadv-pwritev.diff (merged).
* kfreebsd/local-sysdeps.diff: update to revision 2847 (from glibc-bsd).
* patches/ia64/cvs-memchr.diff: new patch from upstream replacing
patches/ia64/submitted-memchr.diff.
@@ -11,8 +15,9 @@
MADV_UNMERGEABLE. Closes: #556631.
* Replace patches/locale/fix-C-first_weekday.diff by upstream version
patches/locale/cvs-C-first_weekday.diff. Closes: #556884.
+ *
- -- Aurelien Jarno <aurel32@debian.org> Wed, 18 Nov 2009 10:54:07 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 18 Nov 2009 15:50:02 +0100
eglibc (2.10.1-7) unstable; urgency=low
Deleted: glibc-package/trunk/debian/patches/any/cvs-preadv-pwritev.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-preadv-pwritev.diff 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/any/cvs-preadv-pwritev.diff 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,153 +0,0 @@
-2009-11-06 Joseph Myers <joseph@codesourcery.com>
-
- * sysdeps/unix/sysv/linux/arm/bits/fcntl.h (fallocate): Fix types
- of last two arguments when -D_FILE_OFFSET_BITS=64.
- * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (fallocate): Fix types
- of last two arguments when -D_FILE_OFFSET_BITS=64.
-
-2009-11-04 Jakub Jelinek <jakub@redhat.com>
-
- * misc/sys/uio.h (preadv, pwritev): Fix type of last argument
- when -D_FILE_OFFSET_BITS=64.
-
- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (fallocate): Fix types
- of last two arguments when -D_FILE_OFFSET_BITS=64.
- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (fallocate): Likewise.
- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (fallocate): Likewise.
- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (fallocate): Likewise.
- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (fallocate): Likewise.
- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (fallocate): Likewise.
- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h (fallocate): Likewise.
-
---- a/misc/sys/uio.h
-+++ b/misc/sys/uio.h
-@@ -80,10 +80,10 @@ extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count,
- # else
- # ifdef __REDIRECT
- extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec,
-- int __count, __off_t __offset),
-+ int __count, __off64_t __offset),
- preadv64) __wur;
- extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec,
-- int __count, __off_t __offset),
-+ int __count, __off64_t __offset),
- pwritev64) __wur;
- # else
- # define preadv preadv64
---- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-@@ -253,8 +253,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-@@ -279,8 +279,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-@@ -278,8 +278,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-@@ -273,8 +273,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
-@@ -259,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
---- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
-@@ -272,8 +272,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
- # else
- # ifdef __REDIRECT
--extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
-- __off_t __len),
-+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-+ __off64_t __len),
- fallocate64);
- # else
- # define fallocate fallocate64
Deleted: glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,26 +0,0 @@
----
- sysdeps/generic/framestate.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/sysdeps/generic/framestate.c
-+++ b/sysdeps/generic/framestate.c
-@@ -25,6 +25,10 @@
- #include <unwind-dw2.c>
- #undef __frame_state_for
-
-+#ifndef LIBGCC_S_SO
-+#define LIBGCC_S_SO "libgcc_s.so.1"
-+#endif
-+
- typedef struct frame_state * (*framesf)(void *pc, struct frame_state *);
- struct frame_state *__frame_state_for (void *pc,
- struct frame_state *frame_state);
-@@ -36,7 +40,7 @@
-
- if (frame_state_for == NULL)
- {
-- void *handle = __libc_dlopen ("libgcc_s.so.1");
-+ void *handle = __libc_dlopen (LIBGCC_S_SO);
-
- if (handle == NULL
- || (frame_state_for
Deleted: glibc-package/trunk/debian/patches/powerpc/cvs-readahead.diff
===================================================================
--- glibc-package/trunk/debian/patches/powerpc/cvs-readahead.diff 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/powerpc/cvs-readahead.diff 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,16 +0,0 @@
-2009-11-03 Andreas Schwab <schwab@redhat.com>
-
- * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add
- readahead.
-
-diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
-index 82025b4..1233be6 100644
---- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
-+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
-@@ -3,3 +3,6 @@
- # System calls with wrappers.
- oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
- oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-+
-+# Due to 64bit alignment there is a dummy second parameter
-+readahead - readahead i:iiiii __readahead readahead
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/series 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,4 +1,4 @@
-svn-updates.diff
+# svn-updates.diff
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff
@@ -131,13 +131,10 @@
mips/local-lazy-eval.diff
mips/local-r10k.diff
-powerpc/cvs-readahead.diff
-
s390/submitted-nexttowardf.diff
s390/submitted-siginfo.diff
sh4/local-fpscr_values.diff
-sh4/cvs-mixed-arithmetic.diff
sparc/local-fork.diff
sparc/local-sparcv9-target.diff
@@ -188,7 +185,6 @@
any/local-dynamic-resolvconf.diff
any/submitted-nis-netgrp.diff
any/submitted-clock-settime.diff
-any/submitted-libgcc_s.so.diff
any/submitted-longdouble.diff
any/submitted-sched_h.diff
any/local-disable-nscd-host-caching.diff
@@ -212,7 +208,6 @@
any/submitted-localedef-mmap.diff
any/submitted-confname.h.diff
any/cvs-getutmpx-compat.diff
-any/cvs-preadv-pwritev.diff
any/submitted-sched_h.2.diff
all/local-ldd.diff
any/cvs-malloc-check.diff
Deleted: glibc-package/trunk/debian/patches/sh4/cvs-mixed-arithmetic.diff
===================================================================
--- glibc-package/trunk/debian/patches/sh4/cvs-mixed-arithmetic.diff 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/sh4/cvs-mixed-arithmetic.diff 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,36 +0,0 @@
-2009-08-10 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
-
- * stdlib/longlong.h [__sh__] (udiv_qrnnd, sub_ddmmss): Add "t" to
- clobber list.
-
-diff --git a/stdlib/longlong.h b/stdlib/longlong.h
-index a2f38ae..e7d6099 100644
---- a/stdlib/longlong.h
-+++ b/stdlib/longlong.h
-@@ -1,6 +1,6 @@
- /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
- Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+ 2002, 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
-@@ -918,7 +918,7 @@ UDItype __umulsidi3 (USItype, USItype);
- " or r1,%0" \
- : "=r" (q), "=&z" (r) \
- : "1" (n1), "r" (n0), "rm" (d), "r" (&__udiv_qrnnd_16) \
-- : "r1", "r2", "r4", "r5", "r6", "pr"); \
-+ : "r1", "r2", "r4", "r5", "r6", "pr", "t"); \
- } while (0)
-
- #define UDIV_TIME 80
-@@ -926,7 +926,8 @@ UDItype __umulsidi3 (USItype, USItype);
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("clrt;subc %5,%1; subc %4,%0" \
- : "=r" (sh), "=r" (sl) \
-- : "0" (ah), "1" (al), "r" (bh), "r" (bl))
-+ : "0" (ah), "1" (al), "r" (bh), "r" (bl) \
-+ : "t")
-
- #endif /* __sh__ */
-
Modified: glibc-package/trunk/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/trunk/debian/patches/svn-updates.diff 2009-11-18 14:49:50 UTC (rev 3984)
+++ glibc-package/trunk/debian/patches/svn-updates.diff 2009-11-18 14:50:14 UTC (rev 3985)
@@ -1,53 +0,0 @@
-SVN update of svn://svn.eglibc.org/branches/eglibc-2_10 from revision 8733
-
---- a/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_accept4.S (révision 0)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_accept4.S (révision 8758)
-@@ -0,0 +1,2 @@
-+/* MIPS does not have socket.S and the socketcall syscall should
-+ generally be avoided, though it exists. */
---- a/ports/sysdeps/unix/sysv/linux/mips/mips32/accept4.c (révision 0)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/accept4.c (révision 8758)
-@@ -0,0 +1,32 @@
-+/* Copyright (C) 2008, 2009 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
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+/* Avoid accept4.c trying to use a definition based on the socketcall
-+ syscall and internal_accept4.S. */
-+
-+#include <errno.h>
-+#include <signal.h>
-+#include <sys/socket.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <kernel-features.h>
-+
-+#undef __NR_socketcall
-+
-+#include <sysdeps/unix/sysv/linux/accept4.c>
---- a/ports/ChangeLog.mips (révision 8733)
-+++ b/ports/ChangeLog.mips (révision 8758)
-@@ -1,3 +1,8 @@
-+2009-08-03 Joseph Myers <joseph@codesourcery.com>
-+
-+ * sysdeps/unix/sysv/linux/mips/mips32/accept4.c,
-+ sysdeps/unix/sysv/linux/mips/mips32/internal_accept4.S: New.
-+
- 2009-07-20 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/mips/kernel-features.h: Define
Reply to: