r1337 - in glibc-package/trunk/debian/patches: . any hppa mips
Author: aurel32
Date: 2006-04-06 22:43:11 +0000 (Thu, 06 Apr 2006)
New Revision: 1337
Added:
glibc-package/trunk/debian/patches/any/cvs-argp_h.diff
glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff
glibc-package/trunk/debian/patches/any/cvs-regcomp_c.diff
glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff
glibc-package/trunk/debian/patches/any/cvs-tst-setcontext_c.diff
glibc-package/trunk/debian/patches/any/local-dash.diff
glibc-package/trunk/debian/patches/any/local-ldconfig-multiarch.diff
glibc-package/trunk/debian/patches/hppa/cvs-no-ldbl-128.diff
glibc-package/trunk/debian/patches/hppa/submitted-fpu.diff
glibc-package/trunk/debian/patches/mips/submitted-msq.diff
Removed:
glibc-package/trunk/debian/patches/any/fhs-linux-paths.diff
glibc-package/trunk/debian/patches/any/regcomp_c.diff
glibc-package/trunk/debian/patches/argp_h.diff
glibc-package/trunk/debian/patches/glibc23-mips-msq.diff
glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff
glibc-package/trunk/debian/patches/glibc235-dash.diff
glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff
glibc-package/trunk/debian/patches/hppa-no-ldbl-128.diff
glibc-package/trunk/debian/patches/ldconfig-multiarch.diff
glibc-package/trunk/debian/patches/mipsel/
glibc-package/trunk/debian/patches/tst-setcontext_c.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Move again some more patches to the new naming scheme
Copied: glibc-package/trunk/debian/patches/any/cvs-argp_h.diff (from rev 1334, glibc-package/trunk/debian/patches/argp_h.diff)
Copied: glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff (from rev 1336, glibc-package/trunk/debian/patches/any/fhs-linux-paths.diff)
Copied: glibc-package/trunk/debian/patches/any/cvs-regcomp_c.diff (from rev 1336, glibc-package/trunk/debian/patches/any/regcomp_c.diff)
Copied: glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -0,0 +1,61 @@
+# 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))
+ {
Copied: glibc-package/trunk/debian/patches/any/cvs-tst-setcontext_c.diff (from rev 1334, glibc-package/trunk/debian/patches/tst-setcontext_c.diff)
Deleted: glibc-package/trunk/debian/patches/any/fhs-linux-paths.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/fhs-linux-paths.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/any/fhs-linux-paths.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,17 +0,0 @@
-# DP: Description: Correct linux paths for FHS
-# DP: Author: Unknown
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: GNU doesn't follow the FHS.
-# DP: Date: Unknown
-
---- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~ Thu May 27 13:16:33 1999
-+++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h Thu May 27 13:17:55 1999
-@@ -71,7 +71,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define _PATH_DEV "/dev/"
- #define _PATH_TMP "/tmp/"
--#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARDB "/var/lib/misc/"
- #define _PATH_VARRUN "/var/run/"
- #define _PATH_VARTMP "/var/tmp/"
-
Copied: glibc-package/trunk/debian/patches/any/local-dash.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc235-dash.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-dash.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/any/local-dash.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -0,0 +1,13 @@
+# DP: Make glibc compile with /bin/sh being dash and not bash.
+
+--- csu/Makefile 2005-06-15 20:59:25.000000000 +0300
++++ csu/Makefile 2005-06-15 20:59:36.000000000 +0300
+@@ -241,7 +241,7 @@
+ esac; \
+ files="$(all-Banner-files)"; \
+ if test -n "$$files"; then \
+- echo "\"Available extensions:\\n\""; \
++ printf '"Available extensions:\\n"'; \
+ sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \
+ -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \
+ fi) > $@T
Copied: glibc-package/trunk/debian/patches/any/local-ldconfig-multiarch.diff (from rev 1334, glibc-package/trunk/debian/patches/ldconfig-multiarch.diff)
Deleted: glibc-package/trunk/debian/patches/any/regcomp_c.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/regcomp_c.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/any/regcomp_c.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,35 +0,0 @@
-CVSROOT: /cvs/glibc
-Module name: libc
-Changes by: drepper@sources.redhat.com 2005-07-10 22:01:15
-
-Modified files:
- posix : regcomp.c
-
-Log message:
- (re_compile_internal): Call __libc_lock_init after init_dfa.
-
-===================================================================
-RCS file: /cvs/glibc/libc/posix/regcomp.c,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -r1.95 -r1.96
---- libc/posix/regcomp.c 2005/05/06 23:33:52 1.95
-+++ libc/posix/regcomp.c 2005/07/10 22:01:14 1.96
-@@ -774,8 +774,6 @@
- }
- preg->used = sizeof (re_dfa_t);
-
-- __libc_lock_init (dfa->lock);
--
- err = init_dfa (dfa, length);
- if (BE (err != REG_NOERROR, 0))
- {
-@@ -789,6 +787,8 @@
- strncpy (dfa->re_str, pattern, length + 1);
- #endif
-
-+ __libc_lock_init (dfa->lock);
-+
- err = re_string_construct (®exp, pattern, length, preg->translate,
- syntax & RE_ICASE, dfa);
- if (BE (err != REG_NOERROR, 0))
Deleted: glibc-package/trunk/debian/patches/argp_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/argp_h.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/argp_h.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,21 +0,0 @@
-2005-10-13 Ulrich Drepper <drepper@redhat.com>
-
- [BZ #1373]
- * argp/argp.h: Remove __NTH for __argp_usage inline function.
-
-===================================================================
-RCS file: /cvs/glibc/libc/argp/argp.h,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -r1.30 -r1.31
---- libc/argp/argp.h 2004/09/07 22:23:45 1.30
-+++ libc/argp/argp.h 2005/10/14 05:53:47 1.31
-@@ -561,7 +561,7 @@
- # endif
-
- ARGP_EI void
--__NTH (__argp_usage (__const struct argp_state *__state))
-+__argp_usage (__const struct argp_state *__state)
- {
- __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
Deleted: glibc-package/trunk/debian/patches/glibc23-mips-msq.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc23-mips-msq.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/glibc23-mips-msq.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,64 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: fix msqs on mips
-# DP: Related bugs: 215273
-# DP: Author: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
-# DP: Upstream status: Pending
-
-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/unix/sysv/linux/mips/bits/msq.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/msq.h,v
-retrieving revision 1.1
-diff -a -d -u -p -r1.1 msq.h
---- sysdeps/unix/sysv/linux/mips/bits/msq.h 26 Aug 2002 01:49:55 -0000 1.1
-+++ sysdeps/unix/sysv/linux/mips/bits/msq.h 7 Oct 2003 18:30:30 -0000
-@@ -38,16 +38,34 @@ typedef unsigned long int msglen_t;
- struct msqid_ds
- {
- struct ipc_perm msg_perm; /* structure describing operation permission */
-+#if __WORDSIZE == 32 && defined (__MIPSEB__)
-+ unsigned long int __unused1;
-+#endif
- __time_t msg_stime; /* time of last msgsnd command */
-+#if __WORDSIZE == 32 && defined (__MIPSEL__)
-+ unsigned long int __unused1;
-+#endif
-+#if __WORDSIZE == 32 && defined (__MIPSEB__)
-+ unsigned long int __unused2;
-+#endif
- __time_t msg_rtime; /* time of last msgrcv command */
-+#if __WORDSIZE == 32 && defined (__MIPSEL__)
-+ unsigned long int __unused2;
-+#endif
-+#if __WORDSIZE == 32 && defined (__MIPSEB__)
-+ unsigned long int __unused3;
-+#endif
- __time_t msg_ctime; /* time of last change */
-+#if __WORDSIZE == 32 && defined (__MIPSEL__)
-+ unsigned long int __unused3;
-+#endif
- unsigned long int __msg_cbytes; /* current number of bytes on queue */
- msgqnum_t msg_qnum; /* number of messages currently on queue */
- msglen_t msg_qbytes; /* max number of bytes allowed on queue */
- __pid_t msg_lspid; /* pid of last msgsnd() */
- __pid_t msg_lrpid; /* pid of last msgrcv() */
-- unsigned long int __unused1;
-- unsigned long int __unused2;
-+ unsigned long int __unused4;
-+ unsigned long int __unused5;
- };
-
- #ifdef __USE_MISC
Deleted: glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/glibc232-tls-crashfix.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,80 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# 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
-
-PATCHLEVEL=1
-
-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 -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $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.
-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))
- {
Deleted: glibc-package/trunk/debian/patches/glibc235-dash.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-dash.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/glibc235-dash.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,29 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Make glibc compile with /bin/sh being dash and not bash.
-
-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
-
---- csu/Makefile 2005-06-15 20:59:25.000000000 +0300
-+++ csu/Makefile 2005-06-15 20:59:36.000000000 +0300
-@@ -241,7 +241,7 @@
- esac; \
- files="$(all-Banner-files)"; \
- if test -n "$$files"; then \
-- echo "\"Available extensions:\\n\""; \
-+ printf '"Available extensions:\\n"'; \
- sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \
- -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \
- fi) > $@T
Deleted: glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,94 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: hppa floating point exception handling fix
-# DP: Related bugs: Debian #342545
-# DP: Dpatch author: Randolph Chung <tausq@debian.org>
-# DP: Patch author: Randolph Chung <tausq@debian.org>
-# DP: Upstream status: Pending
-# DP: Status Details: to be merged by Carlos
-# DP: Date: Sun, 15 Jan 2006
-
-PATCHLEVEL=1
-
-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 -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $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 -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c 2006-01-14 10:19:08.000000000 -0800
-@@ -27,10 +27,7 @@
- unsigned long long buf[4], *bufptr = buf;
-
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (buf), "+r" (bufptr));
- memcpy (envp, buf, sizeof (*envp));
- return 0;
-diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c 2006-01-14 10:20:21.000000000 -0800
-@@ -30,10 +30,7 @@
- /* Store the environment. */
- bufptr = clear.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (clear), "+r" (bufptr));
- memcpy (envp, &clear.env, sizeof (fenv_t));
-
-@@ -47,10 +44,7 @@
- /* Load the new environment. */
- bufptr = clear.buf;
- __asm__ (
-- "fldd,ma 8(%0),%%fr0\n"
-- "fldd,ma 8(%0),%%fr1\n"
-- "fldd,ma 8(%0),%%fr2\n"
-- "fldd 0(%0),%%fr3\n"
-+ "fldd 0(%0),%%fr0\n"
- : : "r" (bufptr), "m" (clear));
-
- return 0;
-diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c 2006-01-14 10:20:44.000000000 -0800
-@@ -34,10 +34,7 @@
- we want to use from the environment specified by the parameter. */
- bufptr = temp.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (temp), "+r" (bufptr));
-
- temp.env.__status_word &= ~(FE_ALL_EXCEPT
-@@ -56,9 +53,6 @@
- /* Load the new environment. */
- bufptr = temp.buf;
- __asm__ (
-- "fldd,ma -8(%1),%%fr3\n"
-- "fldd,ma -8(%1),%%fr2\n"
-- "fldd,ma -8(%1),%%fr1\n"
- "fldd 0(%1),%%fr0\n"
- : "=m" (temp), "+r" (bufptr));
-
-
Copied: glibc-package/trunk/debian/patches/hppa/cvs-no-ldbl-128.diff (from rev 1334, glibc-package/trunk/debian/patches/hppa-no-ldbl-128.diff)
Copied: glibc-package/trunk/debian/patches/hppa/submitted-fpu.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/hppa/submitted-fpu.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -0,0 +1,76 @@
+# DP: Description: hppa floating point exception handling fix
+# DP: Related bugs: Debian #342545
+# DP: Dpatch author: Randolph Chung <tausq@debian.org>
+# DP: Patch author: Randolph Chung <tausq@debian.org>
+# DP: Upstream status: Pending
+# DP: Status Details: to be merged by Carlos
+# DP: Date: Sun, 15 Jan 2006
+
+diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c
+--- glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c 2006-01-14 10:17:19.000000000 -0800
++++ glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c 2006-01-14 10:19:08.000000000 -0800
+@@ -27,10 +27,7 @@
+ unsigned long long buf[4], *bufptr = buf;
+
+ __asm__ (
+- "fstd,ma %%fr0,8(%1)\n"
+- "fstd,ma %%fr1,8(%1)\n"
+- "fstd,ma %%fr2,8(%1)\n"
+- "fstd %%fr3,0(%1)\n"
++ "fstd %%fr0,0(%1)\n"
+ : "=m" (buf), "+r" (bufptr));
+ memcpy (envp, buf, sizeof (*envp));
+ return 0;
+diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c
+--- glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c 2006-01-14 10:17:19.000000000 -0800
++++ glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c 2006-01-14 10:20:21.000000000 -0800
+@@ -30,10 +30,7 @@
+ /* Store the environment. */
+ bufptr = clear.buf;
+ __asm__ (
+- "fstd,ma %%fr0,8(%1)\n"
+- "fstd,ma %%fr1,8(%1)\n"
+- "fstd,ma %%fr2,8(%1)\n"
+- "fstd %%fr3,0(%1)\n"
++ "fstd %%fr0,0(%1)\n"
+ : "=m" (clear), "+r" (bufptr));
+ memcpy (envp, &clear.env, sizeof (fenv_t));
+
+@@ -47,10 +44,7 @@
+ /* Load the new environment. */
+ bufptr = clear.buf;
+ __asm__ (
+- "fldd,ma 8(%0),%%fr0\n"
+- "fldd,ma 8(%0),%%fr1\n"
+- "fldd,ma 8(%0),%%fr2\n"
+- "fldd 0(%0),%%fr3\n"
++ "fldd 0(%0),%%fr0\n"
+ : : "r" (bufptr), "m" (clear));
+
+ return 0;
+diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c
+--- glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c 2006-01-14 10:17:19.000000000 -0800
++++ glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c 2006-01-14 10:20:44.000000000 -0800
+@@ -34,10 +34,7 @@
+ we want to use from the environment specified by the parameter. */
+ bufptr = temp.buf;
+ __asm__ (
+- "fstd,ma %%fr0,8(%1)\n"
+- "fstd,ma %%fr1,8(%1)\n"
+- "fstd,ma %%fr2,8(%1)\n"
+- "fstd %%fr3,0(%1)\n"
++ "fstd %%fr0,0(%1)\n"
+ : "=m" (temp), "+r" (bufptr));
+
+ temp.env.__status_word &= ~(FE_ALL_EXCEPT
+@@ -56,9 +53,6 @@
+ /* Load the new environment. */
+ bufptr = temp.buf;
+ __asm__ (
+- "fldd,ma -8(%1),%%fr3\n"
+- "fldd,ma -8(%1),%%fr2\n"
+- "fldd,ma -8(%1),%%fr1\n"
+ "fldd 0(%1),%%fr0\n"
+ : "=m" (temp), "+r" (bufptr));
+
+
Deleted: glibc-package/trunk/debian/patches/hppa-no-ldbl-128.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa-no-ldbl-128.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/hppa-no-ldbl-128.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,20 +0,0 @@
-We do not have a 128-bit long double implementation for PA, so do
-not imply that we need the 128-bit long double support in glibc.
-We will likely define long double equivalent to double.
-
-2005-06-18 Carlos O'Donell <carlos@systemhalted.org>
-
- * sysdeps/hppa/hppa1.1/Implies: Remove ldbl-128.
-
-===================================================================
-RCS file: /var/lib/cvs/glibc/sysdeps/hppa/hppa1.1/Implies,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- glibc/sysdeps/hppa/hppa1.1/Implies 2005/06/08 20:32:10 1.2
-+++ glibc/sysdeps/hppa/hppa1.1/Implies 2005/07/18 04:32:31 1.3
-@@ -1,4 +1,3 @@
- wordsize-32
- ieee754/flt-32
- ieee754/dbl-64
--ieee754/ldbl-128
Deleted: glibc-package/trunk/debian/patches/ldconfig-multiarch.diff
===================================================================
--- glibc-package/trunk/debian/patches/ldconfig-multiarch.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/ldconfig-multiarch.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,138 +0,0 @@
---- glibc-2.3.6/elf/ldconfig.c.orig 2005-02-16 11:29:34.000000000 +0100
-+++ glibc-2.3.6/elf/ldconfig.c 2006-03-26 23:37:33.665182082 +0200
-@@ -1027,6 +1027,125 @@
- fclose (file);
- }
-
-+static void
-+add_multiarch_dirs (const char *path)
-+{
-+ DIR *dir;
-+ struct dirent64 *direntry;
-+ char *file_name, *dir_name, *real_file_name, *link_path;
-+ int file_name_len, real_file_name_len, link_path_len, len;
-+ struct stat64 lstat_buf, stat_buf;
-+ int is_link, is_dir;
-+
-+ file_name_len = PATH_MAX;
-+ file_name = alloca (file_name_len);
-+
-+ link_path_len = PATH_MAX;
-+ link_path = alloca (link_path_len);
-+
-+ if (opt_chroot)
-+ {
-+ dir_name = chroot_canon (opt_chroot, path);
-+ real_file_name_len = PATH_MAX;
-+ real_file_name = alloca (real_file_name_len);
-+ }
-+ else
-+ {
-+ dir_name = xstrdup(path);
-+ real_file_name_len = 0;
-+ real_file_name = file_name;
-+ }
-+
-+ if (dir_name == NULL || (dir = opendir (dir_name)) == NULL)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Can't open directory %s"), path);
-+ if (opt_chroot && dir_name)
-+ free (dir_name);
-+ return;
-+ }
-+
-+ while ((direntry = readdir64 (dir)) != NULL)
-+ {
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ /* We only look at links. */
-+ if (direntry->d_type != DT_UNKNOWN && direntry->d_type != DT_LNK)
-+ continue;
-+#endif /* _DIRENT_HAVE_D_TYPE */
-+
-+ len = strlen (path) + strlen (direntry->d_name);
-+ if (len > file_name_len)
-+ {
-+ file_name_len = len + 1;
-+ file_name = alloca (file_name_len);
-+ if (!opt_chroot)
-+ real_file_name = file_name;
-+ }
-+ sprintf (file_name, "%s/%s", path, direntry->d_name);
-+ if (opt_chroot)
-+ {
-+ len = strlen (dir_name) + strlen (direntry->d_name);
-+ if (len > real_file_name_len)
-+ {
-+ real_file_name_len = len + 1;
-+ real_file_name = alloca (real_file_name_len);
-+ }
-+ sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name);
-+ }
-+
-+ if (__builtin_expect (lstat64 (real_file_name, &lstat_buf), 0))
-+ {
-+ error (0, errno, _("Cannot lstat %s"), file_name);
-+ continue;
-+ }
-+
-+ /* We only look at links. */
-+ is_link = S_ISLNK (lstat_buf.st_mode);
-+ if (!is_link)
-+ continue;
-+
-+ /* Check the symlink refers to a directory. */
-+ if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0))
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Cannot stat %s"), file_name);
-+ continue;
-+ }
-+
-+ is_dir = S_ISDIR (stat_buf.st_mode);
-+ if (!is_dir)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("%s is not a directory"), file_name);
-+ continue;
-+ }
-+
-+ /* Read the link. */
-+ if (realpath(real_file_name, link_path) == NULL)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Cannot read link %s"), file_name);
-+ continue;
-+ }
-+
-+ if (opt_chroot)
-+ {
-+ len = strlen(opt_chroot);
-+ if (strncmp(opt_chroot, link_path, len) == 0)
-+ add_dir(link_path + len);
-+ else
-+ error (0, errno, _("Link %s refers to outside of the chroot"), file_name);
-+ }
-+ else
-+ {
-+ add_dir(link_path);
-+ }
-+ }
-+
-+ closedir (dir);
-+ free (dir_name);
-+}
-+
- /* Handle one word in an `include' line, a glob pattern of additional
- config files to read. */
- static void
-@@ -1215,6 +1334,9 @@
- add_system_dir (SLIBDIR);
- if (strcmp (SLIBDIR, LIBDIR))
- add_system_dir (LIBDIR);
-+
-+ /* Add multiarch directories. */
-+ add_multiarch_dirs("/lib/ldconfig");
- }
-
- search_dirs ();
Copied: glibc-package/trunk/debian/patches/mips/submitted-msq.diff (from rev 1334, glibc-package/trunk/debian/patches/glibc23-mips-msq.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc23-mips-msq.diff 2006-04-06 22:11:23 UTC (rev 1334)
+++ glibc-package/trunk/debian/patches/mips/submitted-msq.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -0,0 +1,49 @@
+# DP: Description: fix msqs on mips
+# DP: Related bugs: 215273
+# DP: Author: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
+# DP: Upstream status: Pending
+
+Index: sysdeps/unix/sysv/linux/mips/bits/msq.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/msq.h,v
+retrieving revision 1.1
+diff -a -d -u -p -r1.1 msq.h
+--- sysdeps/unix/sysv/linux/mips/bits/msq.h 26 Aug 2002 01:49:55 -0000 1.1
++++ sysdeps/unix/sysv/linux/mips/bits/msq.h 7 Oct 2003 18:30:30 -0000
+@@ -38,16 +38,34 @@ typedef unsigned long int msglen_t;
+ struct msqid_ds
+ {
+ struct ipc_perm msg_perm; /* structure describing operation permission */
++#if __WORDSIZE == 32 && defined (__MIPSEB__)
++ unsigned long int __unused1;
++#endif
+ __time_t msg_stime; /* time of last msgsnd command */
++#if __WORDSIZE == 32 && defined (__MIPSEL__)
++ unsigned long int __unused1;
++#endif
++#if __WORDSIZE == 32 && defined (__MIPSEB__)
++ unsigned long int __unused2;
++#endif
+ __time_t msg_rtime; /* time of last msgrcv command */
++#if __WORDSIZE == 32 && defined (__MIPSEL__)
++ unsigned long int __unused2;
++#endif
++#if __WORDSIZE == 32 && defined (__MIPSEB__)
++ unsigned long int __unused3;
++#endif
+ __time_t msg_ctime; /* time of last change */
++#if __WORDSIZE == 32 && defined (__MIPSEL__)
++ unsigned long int __unused3;
++#endif
+ unsigned long int __msg_cbytes; /* current number of bytes on queue */
+ msgqnum_t msg_qnum; /* number of messages currently on queue */
+ msglen_t msg_qbytes; /* max number of bytes allowed on queue */
+ __pid_t msg_lspid; /* pid of last msgsnd() */
+ __pid_t msg_lrpid; /* pid of last msgrcv() */
+- unsigned long int __unused1;
+- unsigned long int __unused2;
++ unsigned long int __unused4;
++ unsigned long int __unused5;
+ };
+
+ #ifdef __USE_MISC
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/series 2006-04-06 22:43:11 UTC (rev 1337)
@@ -48,15 +48,26 @@
#alpha/submitted-pic.diff -p0 # g: suspended
-any/fhs-linux-paths.diff -p1
-any/getcwd_c.diff -p1
-any/regcomp_c.diff -p1
+any/cvs-argp_h.diff -p1
+any/cvs-getcwd_c.diff -p1
+any/cvs-regcomp_c.diff -p1
+any/cvs-tls-crashfix.diff -p1
+any/cvs-tst-setcontext_c.diff -p1
+any/local-dash.diff -p0
+any/local-fhs-linux-paths.diff -p1
+any/local-ld-multiarch.diff -p1
+any/local-ldconfig-multiarch.diff -p1
amd64/local-biarch.diff -p1
+hppa/cvs-no-ldbl-128.diff -p1
+hppa/cvs-pie-relocs.diff -p1
+hppa/submitted-fpu.diff -p1
+
i386/local-biarch.diff -p1
mips/local-mips.diff -p0
+mips/submitted-msq.diff -p0
sparc/cvs-datastart.diff -p0
sparc/cvs-gcc4-inline.diff -p0
@@ -93,7 +104,6 @@
arm-float-byteorder.diff -p0
#glibc-make-check-perms.diff -p1 # g: suspended
glibc-2.3.2-ldconfig-tls.diff -p1
-glibc23-mips-msq.diff -p0
ldso-disable-hwcap.diff -p0
glibc23-version-sanity.diff -p1
glibc23-sse-oldkernel.diff -p0
@@ -107,7 +117,6 @@
glibc234-hppa-linesep.diff -p0
#glibc234-hppa-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
linuxthreads-sizefix.diff -p1
-glibc232-tls-crashfix.diff -p1
glibc23-mips-lazy-eval.diff -p2
glibc235-gcc4-elf.diff -p0
glibc235-gcc4-wcstol_l.diff -p1
@@ -124,30 +133,22 @@
glibc235-dl-execstack.diff -p0
hppa-iitlbp.diff -p1
hppa-fenv-align.diff -p1
-glibc235-hppa-fpu.diff -p1
eh-frame-terminator.diff -p1
powerpc-socket-weakalias.diff -p0
arm-socket-weakalias.diff -p0
divdi3-moddi3.diff -p0
powerpc-executable-got.diff -p0
ctan.diff -p0
-glibc235-dash.diff -p0
glibc235-nis-netgrp.diff
forward-backward-collation.diff
-hppa-pie-relocs.diff -p1
hurd-getresuid-dyslexia.diff -p0
-hppa-no-ldbl-128.diff -p1
glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
glibc-manual-string.diff -p1
-ld-multiarch.diff -p1
-ldconfig-multiarch.diff -p1
rtld.diff -p1
resource_h.diff -p1
hppa-inlining.diff -p1
-tst-setcontext_c.diff -p1
strfmon.diff
-argp_h.diff -p1
siginfo_h.diff -p1
hurd-machrules-make.diff -p1
Deleted: glibc-package/trunk/debian/patches/tst-setcontext_c.diff
===================================================================
--- glibc-package/trunk/debian/patches/tst-setcontext_c.diff 2006-04-06 22:27:51 UTC (rev 1336)
+++ glibc-package/trunk/debian/patches/tst-setcontext_c.diff 2006-04-06 22:43:11 UTC (rev 1337)
@@ -1,30 +0,0 @@
- 2006-03-03 Roland McGrath <roland@redhat.com>
-
- [BZ #2414]
- * stdlib/tst-setcontext.c (f1): Take arguments of type i
-
-===================================================================
-RCS file: /cvs/glibc/libc/stdlib/tst-setcontext.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- libc/stdlib/tst-setcontext.c 2004/12/17 04:05:22 1.7
-+++ libc/stdlib/tst-setcontext.c 2006/03/03 11:51:31 1.8
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2001,02, 2004 Free Software Foundation, Inc.
-+/* Copyright (C) 2001,2002,2004,2006 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
-@@ -30,9 +30,9 @@
- static char st2[32768];
-
- static void
--f1 (long a0, long a1, long a2, long a3)
-+f1 (int a0, int a1, int a2, int a3)
- {
-- printf ("start f1(a0=%lx,a1=%lx,a2=%lx,a3=%lx)\n", a0, a1, a2, a3);
-+ printf ("start f1(a0=%x,a1=%x,a2=%x,a3=%x)\n", a0, a1, a2, a3);
-
- if (a0 != 1 || a1 != 2 || a2 != 3 || a3 != -4)
- {
Reply to: