r1339 - in glibc-package/trunk/debian/patches: . all any
Author: aurel32
Date: 2006-04-06 22:55:41 +0000 (Thu, 06 Apr 2006)
New Revision: 1339
Added:
glibc-package/trunk/debian/patches/all/cvs-manual-memory.diff
glibc-package/trunk/debian/patches/all/cvs-manual-string.diff
glibc-package/trunk/debian/patches/all/locale-ru_RU.diff
glibc-package/trunk/debian/patches/any/cvs-ctan.diff
glibc-package/trunk/debian/patches/any/local-ldconfig-tls.diff
glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff
glibc-package/trunk/debian/patches/any/local-rtld.diff
Removed:
glibc-package/trunk/debian/patches/ctan.diff
glibc-package/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff
glibc-package/trunk/debian/patches/glibc-manual-memory.diff
glibc-package/trunk/debian/patches/glibc-manual-string.diff
glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff
glibc-package/trunk/debian/patches/locale-ru_RU.diff
glibc-package/trunk/debian/patches/rtld.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Move more patches to the new naming scheme (again)
Copied: glibc-package/trunk/debian/patches/all/cvs-manual-memory.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc-manual-memory.diff)
Copied: glibc-package/trunk/debian/patches/all/cvs-manual-string.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc-manual-string.diff)
Copied: glibc-package/trunk/debian/patches/all/locale-ru_RU.diff (from rev 1334, glibc-package/trunk/debian/patches/locale-ru_RU.diff)
Copied: glibc-package/trunk/debian/patches/any/cvs-ctan.diff (from rev 1334, glibc-package/trunk/debian/patches/ctan.diff)
===================================================================
--- glibc-package/trunk/debian/patches/ctan.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/any/cvs-ctan.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -0,0 +1,230 @@
+# 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;
Copied: glibc-package/trunk/debian/patches/any/local-ldconfig-tls.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/any/local-ldconfig-tls.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -0,0 +1,27 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Make ldconfig prefer TLS-capable directories.
+# DP: Author: Daniel Jacobowitz <dan@debian.org>
+# DP: Upstream status: Not submitted
+# DP: Status Details: This is too much a hack to submit, but it's an
+# improvement.
+# DP: Date: 2003-10-24
+
+--- glibc-2.3.2/elf/cache.c.orig 2003-10-24 19:57:55.000000000 -0400
++++ glibc-2.3.2/elf/cache.c 2003-10-24 20:06:06.000000000 -0400
+@@ -246,6 +246,16 @@ int compare (const struct cache_entry *e
+ return 1;
+ else if (e1->flags > e2->flags)
+ return -1;
++#ifdef USE_TLS
++ /* ld.so doesn't sort by "most specific hwcap". It searches based on
++ the numbering of the bits, and TLS takes precedence. This still
++ doesn't bring us in line with ld.so, but it does bring us closer -
++ close enough for Debian's current needs. */
++ else if ((e2->hwcap & (1ULL << 63)) && ! (e1->hwcap & (1ULL << 63)))
++ return 1;
++ else if ((e1->hwcap & (1ULL << 63)) && ! (e2->hwcap & (1ULL << 63)))
++ return -1;
++#endif
+ /* Sort by most specific hwcap. */
+ else if (e2->bits_hwcap > e1->bits_hwcap)
+ return 1;
Copied: glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff (from rev 1334, glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff)
===================================================================
--- glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -0,0 +1,81 @@
+# DP: Allow hwcap's to be disabled with the existence of a file. This
+# DP: makes it easier to do upgrades with optimized (hwcap) library
+# DP: packages.
+# DP: Author: Rewritten by Daniel Jacobowitz <dan@debian.org>
+# DP: Upstream status: Debian-Specific
+# DP: Status Details: This isn't going to be acceptable upstream, we
+# DP: only need it because we support in-place upgrades.
+# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom)
+
+Index: sysdeps/generic/dl-sysdep.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/generic/dl-sysdep.c,v
+retrieving revision 1.113
+diff -u -r1.113 dl-sysdep.c
+--- sysdeps/generic/dl-sysdep.c 6 Nov 2004 00:24:47 -0000 1.113
++++ sysdeps/generic/dl-sysdep.c 2 Jan 2005 10:24:13 -0000
+@@ -360,7 +360,11 @@
+ #ifdef USE_TLS
+ /* For TLS enabled builds always add 'tls'. */
+ ++cnt;
+-#else
++#endif
++
++ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
++ cnt = 0;
++
+ if (cnt == 0)
+ {
+ /* If we have platform name and no important capability we only have
+@@ -375,7 +379,6 @@
+ *sz = 1;
+ return result;
+ }
+-#endif
+
+ /* Create temporary data structure to generate result table. */
+ temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
+@@ -417,9 +420,7 @@
+ result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
+ if (result == NULL)
+ {
+-#ifndef USE_TLS
+ no_memory:
+-#endif
+ _dl_signal_error (ENOMEM, NULL, NULL,
+ N_("cannot create capability list"));
+ }
+Index: sysdeps/generic/dl-cache.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/generic/dl-cache.c,v
+retrieving revision 1.46
+diff -u -r1.46 dl-cache.c
+--- sysdeps/generic/dl-cache.c 19 Mar 2004 00:36:32 -0000 1.46
++++ sysdeps/generic/dl-cache.c 2 Jan 2005 10:23:42 -0000
+@@ -244,6 +244,7 @@
+ if (cache_new != (void *) -1)
+ {
+ uint64_t platform;
++ int disable_hwcap = 0;
+
+ /* This is where the strings start. */
+ cache_data = (const char *) cache_new;
+@@ -255,6 +256,9 @@
+ if (platform != (uint64_t) -1)
+ platform = 1ULL << platform;
+
++ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
++ disable_hwcap = 1;
++
+ /* Only accept hwcap if it's for the right platform. */
+ #ifdef USE_TLS
+ # define _DL_HWCAP_TLS_MASK (1LL << 63)
+@@ -264,6 +268,8 @@
+ #define HWCAP_CHECK \
+ if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
+ continue; \
++ if (disable_hwcap && lib->hwcap != 0) \
++ continue; \
+ if (_DL_PLATFORMS_COUNT && platform != -1 \
+ && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
+ && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
Copied: glibc-package/trunk/debian/patches/any/local-rtld.diff (from rev 1334, glibc-package/trunk/debian/patches/rtld.diff)
Deleted: glibc-package/trunk/debian/patches/ctan.diff
===================================================================
--- glibc-package/trunk/debian/patches/ctan.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/ctan.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,245 +0,0 @@
-#! /bin/sh -e
-
-# DP: Improve accuracy of ctan functions
-# DP: Upstream status: In CVS
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-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/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/glibc-2.3.2-ldconfig-tls.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make ldconfig prefer TLS-capable directories.
-# DP: Author: Daniel Jacobowitz <dan@debian.org>
-# DP: Upstream status: Not submitted
-# DP: Status Details: This is too much a hack to submit, but it's an
-# improvement.
-# DP: Date: 2003-10-24
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- glibc-2.3.2/elf/cache.c.orig 2003-10-24 19:57:55.000000000 -0400
-+++ glibc-2.3.2/elf/cache.c 2003-10-24 20:06:06.000000000 -0400
-@@ -246,6 +246,16 @@ int compare (const struct cache_entry *e
- return 1;
- else if (e1->flags > e2->flags)
- return -1;
-+#ifdef USE_TLS
-+ /* ld.so doesn't sort by "most specific hwcap". It searches based on
-+ the numbering of the bits, and TLS takes precedence. This still
-+ doesn't bring us in line with ld.so, but it does bring us closer -
-+ close enough for Debian's current needs. */
-+ else if ((e2->hwcap & (1ULL << 63)) && ! (e1->hwcap & (1ULL << 63)))
-+ return 1;
-+ else if ((e1->hwcap & (1ULL << 63)) && ! (e2->hwcap & (1ULL << 63)))
-+ return -1;
-+#endif
- /* Sort by most specific hwcap. */
- else if (e2->bits_hwcap > e1->bits_hwcap)
- return 1;
Deleted: glibc-package/trunk/debian/patches/glibc-manual-memory.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc-manual-memory.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/glibc-manual-memory.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,52 +0,0 @@
-2005-01-14 GOTO Masanori <gotom@debian.or.jp>
-
- * manual/memory.texi (sbrk): Fix definition.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/memory.texi,v
-retrieving revision 1.78
-retrieving revision 1.79
-diff -u -r1.78 -r1.79
---- libc/manual/memory.texi 2004/10/18 00:53:12 1.78
-+++ libc/manual/memory.texi 2005/01/26 02:39:11 1.79
-@@ -2384,7 +2384,7 @@
-
- @comment unistd.h
- @comment BSD
--@deftypefun int sbrk (ptrdiff_t @var{delta})
-+@deftypefun void *sbrk (ptrdiff_t @var{delta})
- This function is the same as @code{brk} except that you specify the new
- end of the data segment as an offset @var{delta} from the current end
- and on success the return value is the address of the resulting end of
-
-2005-08-29 Thomas Schwinge <schwinge@nic-nac-project.de>
-
- [BZ #1261]
- * manual/memory.texi (Hooks for Malloc): Correct prototype of
- my_init_hook() and definition of my_free_hook.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/memory.texi,v
-retrieving revision 1.79
-retrieving revision 1.80
-diff -u -r1.79 -r1.80
---- libc/manual/memory.texi 2005/01/26 02:39:11 1.79
-+++ libc/manual/memory.texi 2005/09/13 17:46:01 1.80
-@@ -948,7 +948,7 @@
- #include <malloc.h>
-
- /* Prototypes for our hooks. */
--static void *my_init_hook (void);
-+static void my_init_hook (void);
- static void *my_malloc_hook (size_t, const void *);
- static void my_free_hook (void*, const void *);
-
-@@ -984,7 +984,7 @@
- return result;
- @}
-
--static void *
-+static void
- my_free_hook (void *ptr, const void *caller)
- @{
- /* Restore all old hooks */
Deleted: glibc-package/trunk/debian/patches/glibc-manual-string.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc-manual-string.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/glibc-manual-string.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,23 +0,0 @@
-2005-01-14 GOTO Masanori <gotom@debian.or.jp>
-
- * manual/string.texi (strcasestr): Fix example typo.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/string.texi,v
-retrieving revision 1.69
-retrieving revision 1.70
-diff -u -r1.69 -r1.70
---- libc/manual/string.texi 2004/07/14 17:10:28 1.69
-+++ libc/manual/string.texi 2005/01/26 02:39:11 1.70
-@@ -1781,9 +1781,9 @@
-
- For example,
- @smallexample
--strstr ("hello, world", "L")
-+strcasestr ("hello, world", "L")
- @result{} "llo, world"
--strstr ("hello, World", "wo")
-+strcasestr ("hello, World", "wo")
- @result{} "World"
- @end smallexample
- @end deftypefun
Deleted: glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff
===================================================================
--- glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/ldso-disable-hwcap.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,96 +0,0 @@
-#! /bin/sh -e
-
-# DP: Allow hwcap's to be disabled with the existence of a file. This
-# DP: makes it easier to do upgrades with optimized (hwcap) library
-# DP: packages.
-# DP: Author: Rewritten by Daniel Jacobowitz <dan@debian.org>
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: This isn't going to be acceptable upstream, we
-# DP: only need it because we support in-place upgrades.
-# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom)
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-Index: sysdeps/generic/dl-sysdep.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/dl-sysdep.c,v
-retrieving revision 1.113
-diff -u -r1.113 dl-sysdep.c
---- sysdeps/generic/dl-sysdep.c 6 Nov 2004 00:24:47 -0000 1.113
-+++ sysdeps/generic/dl-sysdep.c 2 Jan 2005 10:24:13 -0000
-@@ -360,7 +360,11 @@
- #ifdef USE_TLS
- /* For TLS enabled builds always add 'tls'. */
- ++cnt;
--#else
-+#endif
-+
-+ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
-+ cnt = 0;
-+
- if (cnt == 0)
- {
- /* If we have platform name and no important capability we only have
-@@ -375,7 +379,6 @@
- *sz = 1;
- return result;
- }
--#endif
-
- /* Create temporary data structure to generate result table. */
- temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
-@@ -417,9 +420,7 @@
- result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
- if (result == NULL)
- {
--#ifndef USE_TLS
- no_memory:
--#endif
- _dl_signal_error (ENOMEM, NULL, NULL,
- N_("cannot create capability list"));
- }
-Index: sysdeps/generic/dl-cache.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/dl-cache.c,v
-retrieving revision 1.46
-diff -u -r1.46 dl-cache.c
---- sysdeps/generic/dl-cache.c 19 Mar 2004 00:36:32 -0000 1.46
-+++ sysdeps/generic/dl-cache.c 2 Jan 2005 10:23:42 -0000
-@@ -244,6 +244,7 @@
- if (cache_new != (void *) -1)
- {
- uint64_t platform;
-+ int disable_hwcap = 0;
-
- /* This is where the strings start. */
- cache_data = (const char *) cache_new;
-@@ -255,6 +256,9 @@
- if (platform != (uint64_t) -1)
- platform = 1ULL << platform;
-
-+ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
-+ disable_hwcap = 1;
-+
- /* Only accept hwcap if it's for the right platform. */
- #ifdef USE_TLS
- # define _DL_HWCAP_TLS_MASK (1LL << 63)
-@@ -264,6 +268,8 @@
- #define HWCAP_CHECK \
- if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
- continue; \
-+ if (disable_hwcap && lib->hwcap != 0) \
-+ continue; \
- if (_DL_PLATFORMS_COUNT && platform != -1 \
- && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
- && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
Deleted: glibc-package/trunk/debian/patches/locale-ru_RU.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale-ru_RU.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/locale-ru_RU.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Change default charset for 'russian' locale alias
-# DP: Related bugs: #62586
-# DP: Dpatch author: Ben Collins
-# DP: Patch author: Alistair McKinstry
-# DP: Upstream status: Submitted
-# DP: Status Details: http://sources.redhat.com/bugzilla/show_bug.cgi?id=120
-# DP: Date: 2002-03-10
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-diff -urN glibc-2.2.5.orig/intl/locale.alias glibc-2.2.5/intl/locale.alias
---- glibc-2.2.5.orig/intl/locale.alias Sun Jul 22 16:24:50 2001
-+++ glibc-2.2.5/intl/locale.alias Sun Mar 10 23:00:09 2002
-@@ -65,7 +65,7 @@
- polish pl_PL.ISO-8859-2
- portuguese pt_PT.ISO-8859-1
- romanian ro_RO.ISO-8859-2
--russian ru_RU.ISO-8859-5
-+russian ru_RU.KOI8-R
- slovak sk_SK.ISO-8859-2
- slovene sl_SI.ISO-8859-2
- slovenian sl_SI.ISO-8859-2
Deleted: glibc-package/trunk/debian/patches/rtld.diff
===================================================================
--- glibc-package/trunk/debian/patches/rtld.diff 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/rtld.diff 2006-04-06 22:55:41 UTC (rev 1339)
@@ -1,55 +0,0 @@
-2006-01-21 Aurelien Jarno <aurel32@debian.org>
-
- * Makeconfig: new configuration variable rtlddir to change the
- dynamic linker in the ELF binaries, which defaults to slibdir
-
-2005-08-30 Andreas Jochen <Andreas Jochens>
- * Makeconfig: use rtlddir instead of slibdir
- * dlfcn/Makefile: likewise
- * elf/Makefile: likewise
-
---- glibc-2.3.6/Makeconfig 2005-08-30 17:48:26.000000000 +0000
-+++ glibc-2.3.6/Makeconfig 2005-08-30 18:38:37.000000000 +0000
-@@ -187,6 +187,11 @@
- endif
- inst_slibdir = $(install_root)$(slibdir)
-
-+# Directory of the dynamic linker in the ELF binaries
-+ifndef rtlddir
-+rtlddir := $(slibdir)
-+endif
-+
- # Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
- # the prefix is spliced between `lib' and the name, so the linker switch
- # `-l$(libprefix)NAME' finds the library; for other files the prefix is
-@@ -438,7 +443,7 @@
- endif
- ifndef config-LDFLAGS
- ifeq (yesyes,$(build-shared)$(elf))
--config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
-+config-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name)
- endif
- endif
- ifndef link-libc
---- glibc-2.3.6/dlfcn/Makefile 2004-10-18 23:08:31.000000000 +0000
-+++ glibc-2.3.6/dlfcn/Makefile 2005-08-30 18:38:37.000000000 +0000
-@@ -65,7 +65,7 @@
-
- include ../Rules
-
--LDFLAGS-dl.so = -Wl,-dynamic-linker,$(slibdir)/$(rtld-installed-name)
-+LDFLAGS-dl.so = -Wl,-dynamic-linker,$(rtlddir)/$(rtld-installed-name)
-
- test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
- $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
---- glibc-2.3.6/elf/Makefile 2005-08-30 17:48:26.000000000 +0000
-+++ glibc-2.3.6/elf/Makefile 2005-08-30 18:38:37.000000000 +0000
-@@ -296,7 +296,7 @@
- rm -f $@.lds
-
- # interp.c exists just to get this string into the libraries.
--CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
-+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
- -DNOT_IN_libc=1
- $(objpfx)interp.os: $(common-objpfx)config.make
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-06 22:44:15 UTC (rev 1338)
+++ glibc-package/trunk/debian/patches/series 2006-04-06 22:55:41 UTC (rev 1339)
@@ -44,11 +44,15 @@
localedata/tl_PH-yesexpr.diff
localedata/update-ZA.diff
+all/cvs-manual-memory.diff -p1
+all/cvs-manual-string.diff -p1
all/cvs-tzdata.diff -p0
+all/locale-ru_RU.diff -p1
#alpha/submitted-pic.diff -p0 # g: suspended
any/cvs-argp_h.diff -p1
+any/cvs-ctan.diff -p0
any/cvs-getcwd_c.diff -p1
any/cvs-regcomp_c.diff -p1
any/cvs-tls-crashfix.diff -p1
@@ -56,7 +60,10 @@
any/local-dash.diff -p0
any/local-fhs-linux-paths.diff -p1
any/local-ld-multiarch.diff -p1
+any/local-ldso-disable-hwcap.diff -p0
any/local-ldconfig-multiarch.diff -p1
+any/local-ldconfig-tls.diff -p1
+any/local-rtld.diff -p1
amd64/local-biarch.diff -p1
@@ -74,7 +81,6 @@
sparc/local-sparcv8-target.diff -p0
sparc/submitted-socket-weakalias.diff -p0
-locale-ru_RU.diff -p1
glibc-i686-timing.diff -p1
glibc-sparc-timing.diff -p1
makeconfig.diff -p0
@@ -103,8 +109,6 @@
arm-ioperm.diff -p0
arm-float-byteorder.diff -p0
#glibc-make-check-perms.diff -p1 # g: suspended
-glibc-2.3.2-ldconfig-tls.diff -p1
-ldso-disable-hwcap.diff -p0
glibc23-version-sanity.diff -p1
glibc23-sse-oldkernel.diff -p0
#glibc23-errno-hack.diff -p1 # g: untilsarge
@@ -138,14 +142,10 @@
arm-socket-weakalias.diff -p0
divdi3-moddi3.diff -p0
powerpc-executable-got.diff -p0
-ctan.diff -p0
glibc235-nis-netgrp.diff
forward-backward-collation.diff
hurd-getresuid-dyslexia.diff -p0
-glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
-glibc-manual-string.diff -p1
-rtld.diff -p1
resource_h.diff -p1
hppa-inlining.diff -p1
strfmon.diff
Reply to: