r1551 - in glibc-package/branches/glibc-2.4/debian: . patches patches/any
Author: aurel32
Date: 2006-05-28 10:16:42 +0000 (Sun, 28 May 2006)
New Revision: 1551
Removed:
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-ctan.diff
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-tls-crashfix.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Remove any/cvs-ctan.diff (merged upstream).
* Remove any/cvs-resource_h.diff (merged upstream).
* Remove any/cvs-tls-crashfix.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 09:59:25 UTC (rev 1550)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 10:16:42 UTC (rev 1551)
@@ -54,9 +54,12 @@
[ Aurelien Jarno ]
* Remove any/cvs-argp_h.diff (merged upstream).
+ * Remove any/cvs-ctan.diff (merged upstream).
* Remove any/cvs-futimes.diff (merged upstream).
* Remove any/cvs-nfs_h.diff (merged upstream).
* Remove any/cvs-path_log.diff (merged upstream).
+ * Remove any/cvs-resource_h.diff (merged upstream).
+ * Remove any/cvs-tls-crashfix.diff (merged upstream).
* Remove any/local-kernel-features.diff (merged upstream).
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
Deleted: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-ctan.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-ctan.diff 2006-05-28 09:59:25 UTC (rev 1550)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-ctan.diff 2006-05-28 10:16:42 UTC (rev 1551)
@@ -1,230 +0,0 @@
-# DP: Improve accuracy of ctan functions
-# DP: Upstream status: In CVS
-
-2005-07-07 Ulrich Drepper <drepper@redhat.com>
-
- * sysdeps/generic/s_ctanh.c (__ctanh): Handle case of zero den better.
- * sysdeps/generic/s_ctanhf.c (__ctanhf): Likewise.
- * sysdeps/generic/s_ctanhl.c (__ctanhl): Likewise.
- * sysdeps/generic/s_ctan.c (__ctan): Likewise.
- * sysdeps/generic/s_ctanf.c (__ctanf): Likewise.
- * sysdeps/generic/s_ctanl.c (__ctanl): Likewise.
-
-Index: s_ctanh.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctanh.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- sysdeps/generic/s_ctanh.c 6 Jul 2001 04:55:49 -0000 1.2
-+++ sysdeps/generic/s_ctanh.c 7 Jul 2005 23:30:47 -0000 1.3
-@@ -1,5 +1,5 @@
- /* Complex hyperbole tangent for double.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,18 @@
-
- den = (__ieee754_cosh (2.0 * __real__ x) + cos2ix);
-
-- __real__ res = __ieee754_sinh (2.0 * __real__ x) / den;
-- __imag__ res = sin2ix / den;
-+ if (den == 0.0)
-+ {
-+ __complex__ double ez = __cexp (x);
-+ __complex__ double emz = __cexp (-x);
-+
-+ res = (ez - emz) / (ez + emz);
-+ }
-+ else
-+ {
-+ __real__ res = __ieee754_sinh (2.0 * __real__ x) / den;
-+ __imag__ res = sin2ix / den;
-+ }
- }
-
- return res;
-Index: s_ctanhf.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctanhf.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- sysdeps/generic/s_ctanhf.c 13 Jan 2004 09:08:04 -0000 1.3
-+++ sysdeps/generic/s_ctanhf.c 7 Jul 2005 23:30:05 -0000 1.4
-@@ -1,5 +1,5 @@
- /* Complex hyperbole tangent for float.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,18 @@
-
- den = (__ieee754_coshf (2.0 * __real__ x) + cos2ix);
-
-- __real__ res = __ieee754_sinhf (2.0 * __real__ x) / den;
-- __imag__ res = sin2ix / den;
-+ if (den == 0.0f)
-+ {
-+ __complex__ float ez = __cexpf (x);
-+ __complex__ float emz = __cexpf (-x);
-+
-+ res = (ez - emz) / (ez + emz);
-+ }
-+ else
-+ {
-+ __real__ res = __ieee754_sinhf (2.0 * __real__ x) / den;
-+ __imag__ res = sin2ix / den;
-+ }
- }
-
- return res;
-Index: s_ctanhl.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctanhl.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- sysdeps/generic/s_ctanhl.c 6 Jul 2001 04:55:49 -0000 1.2
-+++ sysdeps/generic/s_ctanhl.c 7 Jul 2005 23:29:00 -0000 1.3
-@@ -1,5 +1,5 @@
- /* Complex hyperbole tangent for long double.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,18 @@
-
- den = (__ieee754_coshl (2.0 * __real__ x) + cos2ix);
-
-- __real__ res = __ieee754_sinhl (2.0 * __real__ x) / den;
-- __imag__ res = sin2ix / den;
-+ if (den == 0.0L)
-+ {
-+ __complex__ long double ez = __cexpl (x);
-+ __complex__ long double emz = __cexpl (-x);
-+
-+ res = (ez - emz) / (ez + emz);
-+ }
-+ else
-+ {
-+ __real__ res = __ieee754_sinhl (2.0 * __real__ x) / den;
-+ __imag__ res = sin2ix / den;
-+ }
- }
-
- return res;
-Index: s_ctan.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctan.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- sysdeps/generic/s_ctan.c 6 Jul 2001 04:55:49 -0000 1.2
-+++ sysdeps/generic/s_ctan.c 7 Jul 2005 23:45:45 -0000 1.3
-@@ -1,5 +1,5 @@
- /* Complex tangent function for double.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,18 @@
-
- den = cos2rx + __ieee754_cosh (2.0 * __imag__ x);
-
-- __real__ res = sin2rx / den;
-- __imag__ res = __ieee754_sinh (2.0 * __imag__ x) / den;
-+ if (den == 0.0)
-+ {
-+ __complex__ double ez = __cexp (1.0i * x);
-+ __complex__ double emz = __cexp (-1.0i * x);
-+
-+ res = (ez - emz) / (ez + emz) * -1.0i;
-+ }
-+ else
-+ {
-+ __real__ res = sin2rx / den;
-+ __imag__ res = __ieee754_sinh (2.0 * __imag__ x) / den;
-+ }
- }
-
- return res;
-Index: s_ctanf.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctanf.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- sysdeps/generic/s_ctanf.c 13 Jan 2004 09:08:04 -0000 1.3
-+++ sysdeps/generic/s_ctanf.c 7 Jul 2005 23:45:15 -0000 1.4
-@@ -1,5 +1,5 @@
- /* Complex tangent function for float.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,19 @@
-
- den = cos2rx + __ieee754_coshf (2.0 * __imag__ x);
-
-- __real__ res = sin2rx / den;
-- __imag__ res = __ieee754_sinhf (2.0 * __imag__ x) / den;
-+
-+ if (den == 0.0)
-+ {
-+ __complex__ float ez = __cexpf (1.0i * x);
-+ __complex__ float emz = __cexpf (-1.0i * x);
-+
-+ res = (ez - emz) / (ez + emz) * -1.0i;
-+ }
-+ else
-+ {
-+ __real__ res = sin2rx / den;
-+ __imag__ res = __ieee754_sinhf (2.0 * __imag__ x) / den;
-+ }
- }
-
- return res;
-Index: s_ctanl.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/Attic/s_ctanl.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- sysdeps/generic/s_ctanl.c 6 Jul 2001 04:55:49 -0000 1.2
-+++ sysdeps/generic/s_ctanl.c 7 Jul 2005 23:44:29 -0000 1.3
-@@ -1,5 +1,5 @@
- /* Complex tangent function for long double.
-- Copyright (C) 1997 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -61,8 +61,19 @@
-
- den = cos2rx + __ieee754_coshl (2.0 * __imag__ x);
-
-- __real__ res = sin2rx / den;
-- __imag__ res = __ieee754_sinhl (2.0 * __imag__ x) / den;
-+
-+ if (den == 0.0)
-+ {
-+ __complex__ long double ez = __cexpl (1.0i * x);
-+ __complex__ long double emz = __cexpl (-1.0i * x);
-+
-+ res = (ez - emz) / (ez + emz) * -1.0i;
-+ }
-+ else
-+ {
-+ __real__ res = sin2rx / den;
-+ __imag__ res = __ieee754_sinhl (2.0 * __imag__ x) / den;
-+ }
- }
-
- return res;
Deleted: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff 2006-05-28 09:59:25 UTC (rev 1550)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff 2006-05-28 10:16:42 UTC (rev 1551)
@@ -1,151 +0,0 @@
-Modified files:
- sysdeps/unix/sysv/linux/bits: resource.h
- sysdeps/unix/sysv/linux/alpha/bits: resource.h
- sysdeps/unix/sysv/linux/sparc/bits: resource.h
- sysdeps/unix/sysv/linux/mips/bits: resource.h
-
-Log message:
- (RLIMIT_NICE, RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
-
-2006-03-18: Denis Barbier
- There is a typo in CVS in the last chunk of sysdeps/unix/sysv/linux/mips/bits/resource.h
- s/_RLIMIT_RTPRIO/__RLIMIT_RTPRIO/
-
-libc/sysdeps/unix/sysv/linux/mips/bits/resource.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/resource.h,v
-retrieving revision 1.17
-retrieving revision 1.19
-diff -u -r1.17 -r1.19
---- libc/sysdeps/unix/sysv/linux/bits/resource.h 2004/08/16 08:51:45 1.17
-+++ libc/sysdeps/unix/sysv/linux/bits/resource.h 2005/06/21 18:38:46 1.19
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -r1.6 -r1.8
---- libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h 2004/08/16 08:51:46 1.6
-+++ libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h 2005/06/21 18:38:49 1.8
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Alpha/Linux version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -u -r1.7 -r1.9
---- libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h 2004/08/16 08:51:46 1.7
-+++ libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h 2005/06/21 18:38:50 1.9
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux/SPARC version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/resource.h,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2004/08/16 08:51:46 1.7
-+++ libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2005/06/20 15:07:34 1.8
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux/MIPS version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
Deleted: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-tls-crashfix.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-tls-crashfix.diff 2006-05-28 09:59:25 UTC (rev 1550)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-tls-crashfix.diff 2006-05-28 10:16:42 UTC (rev 1551)
@@ -1,61 +0,0 @@
-# DP: Description: TLS fixes for xmms/nvidia crash
-# DP: Related bugs: #219352
-# DP: Dpatch author: Jeff Bailey
-# DP: Patch author:
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-03-22, 2005-04-16 updated by gotom
-
-2005-03-15 Jakub Jelinek <jakub@redhat.com>
-
- [BZ#786]
- * sysdeps/generic/dl-tls.c (_dl_next_tls_modid): Handle
- GL(dl_tls_static_nelem) == GL(dl_tls_max_dtv_idx).
-
---- libc/sysdeps/generic/dl-tls.c.jj 2005-02-25 14:45:06.000000000 +0100
-+++ libc/sysdeps/generic/dl-tls.c 2005-03-15 15:36:55.593127093 +0100
-@@ -71,26 +71,24 @@ _dl_next_tls_modid (void)
- NB: the offset +1 is due to the fact that DTV[0] is used
- for something else. */
- result = GL(dl_tls_static_nelem) + 1;
-- /* If the following would not be true we mustn't have assumed
-- there is a gap. */
-- assert (result <= GL(dl_tls_max_dtv_idx));
-- do
-- {
-- while (result - disp < runp->len)
-- {
-- if (runp->slotinfo[result - disp].map == NULL)
-- break;
--
-- ++result;
-- assert (result <= GL(dl_tls_max_dtv_idx) + 1);
-- }
--
-- if (result - disp < runp->len)
-- break;
--
-- disp += runp->len;
-- }
-- while ((runp = runp->next) != NULL);
-+ if (result <= GL(dl_tls_max_dtv_idx))
-+ do
-+ {
-+ while (result - disp < runp->len)
-+ {
-+ if (runp->slotinfo[result - disp].map == NULL)
-+ break;
-+
-+ ++result;
-+ assert (result <= GL(dl_tls_max_dtv_idx) + 1);
-+ }
-+
-+ if (result - disp < runp->len)
-+ break;
-+
-+ disp += runp->len;
-+ }
-+ while ((runp = runp->next) != NULL);
-
- if (result > GL(dl_tls_max_dtv_idx))
- {
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 09:59:25 UTC (rev 1550)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 10:16:42 UTC (rev 1551)
@@ -100,9 +100,7 @@
all/local-pt_BR.diff -p1
all/submitted-new-brf-encoding.diff -p0
-#any/cvs-ctan.diff -p0
any/cvs-getcwd_c.diff -p1
-#any/cvs-resource_h.diff -p1
#any/cvs-tls-crashfix.diff -p1
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
@@ -132,4 +130,3 @@
#any/submitted-eh-frame-terminator.diff -p1
#any/submitted-nis-netgrp.diff
any/submitted-strfmon.diff
-
Reply to: