r1161 - in glibc-package/trunk/debian: . patches
Author: schizo
Date: 2006-02-08 03:39:03 +0000 (Wed, 08 Feb 2006)
New Revision: 1161
Removed:
glibc-package/trunk/debian/patches/amd64-semtrywait-weakalias.diff
glibc-package/trunk/debian/patches/glibc235-alpha-divqu.diff
glibc-package/trunk/debian/patches/glibc235-binutils216-ia64.diff
glibc-package/trunk/debian/patches/glibc235-execvp-fix.diff
glibc-package/trunk/debian/patches/glibc235-gcc4-ia64-profile.diff
glibc-package/trunk/debian/patches/glibc235-gcc4-jis0208.diff
glibc-package/trunk/debian/patches/glibc235-gcc4-ppc-procfs.diff
glibc-package/trunk/debian/patches/glibc235-gcc4-s390-inline.diff
glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff
glibc-package/trunk/debian/patches/glibc235-leapsecond.diff
glibc-package/trunk/debian/patches/ia64-binutils-libm.diff
glibc-package/trunk/debian/patches/strfry-segv.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/glibc235-gcc4-arm-inline.diff
glibc-package/trunk/debian/patches/series
Log:
- Delete several hunks from glibc235-gcc4-arm-inline.diff
- Remove glibc235-gcc4-s390-inline.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/changelog 2006-02-08 03:39:03 UTC (rev 1161)
@@ -80,6 +80,8 @@
- Delete several hunks from glibc235-gcc4-sparc-inline.diff
- Remove hurd-libpthread-indirect-loading.diff
- Remove glibc235-gcc4-hurd.diff
+ - Delete several hunks from glibc235-gcc4-arm-inline.diff
+ - Remove glibc235-gcc4-s390-inline.diff
-- Clint Adams <schizo@debian.org> Wed, 1 Feb 2006 20:52:13 -0500
Deleted: glibc-package/trunk/debian/patches/amd64-semtrywait-weakalias.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64-semtrywait-weakalias.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/amd64-semtrywait-weakalias.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix sem_trywait on amd64
-# DP: Related bugs:
-# DP: Dpatch author: Clint Adams
-# DP: Patch author: Upstream CVS
-# DP: Upstream status: Committed
-# DP: Status Details:
-# DP: Date: 2005-12-16
-
-PATCHLEVEL=0
-
-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.
-
---- nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S~ 2003-05-10 16:37:38.000000000 -0400
-+++ nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S 2005-10-24 16:50:36.000000000 -0400
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-@@ -56,4 +56,3 @@
- orl $-1, %eax
- retq
- .size sem_trywait,.-sem_trywait
-- versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1)
Deleted: glibc-package/trunk/debian/patches/glibc235-alpha-divqu.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-alpha-divqu.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-alpha-divqu.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix alpha divqu/remqu that does not return the correct
-# result when their dividend and divisor are same and 63bit
-# is 1.
-# DP: Related bugs: #324455
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Will be Submitted
-# DP: Status Details:
-# DP: Date: 2005-08-25
-
-PATCHLEVEL=0
-
-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-08-23 GOTO Masanori <gotom@debian.or.jp>
-
- * sysdeps/alpha/remqu.S: Return the correct result when the same
- dividend and divisor are provided, and they're negative numbers.
- * sysdeps/alpha/divqu.S: Likewise.
-
-Index: sysdeps/alpha/remqu.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/alpha/remqu.S,v
-retrieving revision 1.11
-diff -u -p -r1.11 remqu.S
---- sysdeps/alpha/remqu.S 28 May 2005 23:40:09 -0000 1.11
-+++ sysdeps/alpha/remqu.S 23 Aug 2005 09:57:13 -0000
-@@ -246,7 +246,7 @@ $y_is_neg:
- from the divide will be completely wrong. Fortunately, the
- quotient must be either 0 or 1, so the remainder must be X
- or X-Y, so just compute it directly. */
-- cmpult Y, X, AT
-+ cmpule Y, X, AT
- subq X, Y, RV
- ldt $f0, 0(sp)
- cmoveq AT, X, RV
-Index: sysdeps/alpha/divqu.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/alpha/divqu.S,v
-retrieving revision 1.9
-diff -u -p -r1.9 divqu.S
---- sysdeps/alpha/divqu.S 28 May 2005 23:40:09 -0000 1.9
-+++ sysdeps/alpha/divqu.S 23 Aug 2005 09:57:13 -0000
-@@ -240,7 +240,7 @@ $y_is_neg:
- /* If we get here, Y is so big that bit 63 is set. The results
- from the divide will be completely wrong. Fortunately, the
- quotient must be either 0 or 1, so just compute it directly. */
-- cmpult Y, X, RV
-+ cmpule Y, X, RV
- excb
- mt_fpcr $f3
- ldt $f0, 0(sp)
Deleted: glibc-package/trunk/debian/patches/glibc235-binutils216-ia64.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-binutils216-ia64.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-binutils216-ia64.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,91 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Allow glibc to build with binutils 2.16 on ia64
-# DP: Related bugs:
-# DP: Dpatch author: Jeff Bailey, GOTO Masanori <gotom@debian.org>
-# DP: Patch author: H.J. Lu <hongjiu.lu@intel.com>
-# DP: Upstream status: In CVS
-# DP: Status Details: CVS HEAD
-# DP: Date: 2005-05-22 pulled from Ubuntu
-# Updated 2005-07-15 for linuxthreads by gotom
-
-PATCHLEVEL=0
-
-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.
-Index: initfini.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/ia64/elf/initfini.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -p -r1.7 -r1.8
---- sysdeps/ia64/elf/initfini.c 16 Aug 2004 04:51:00 -0000 1.7
-+++ sysdeps/ia64/elf/initfini.c 20 Mar 2005 04:21:08 -0000 1.8
-@@ -116,13 +116,14 @@ __asm__ (".section .init\n"
- "/*@_init_PROLOG_ENDS*/\n"
- "\n"
- "/*@_init_EPILOG_BEGINS*/\n"
-+" .section .init\n"
- " .proc _init#\n"
-+"_init:\n"
- " .prologue\n"
- " .save ar.pfs, r34\n"
- " .vframe r32\n"
- " .save rp, r33\n"
- " .body\n"
--" .section .init\n"
- " .regstk 0,2,0,0\n"
- " mov r12 = r32\n"
- " mov ar.pfs = r34\n"
-@@ -155,6 +156,7 @@ __asm__ (".section .init\n"
- "/*@_fini_EPILOG_BEGINS*/\n"
- " .section .fini\n"
- " .proc _fini#\n"
-+"_fini:\n"
- " .prologue\n"
- " .save ar.pfs, r34\n"
- " .vframe r32\n"
-
-
-2005-02-21 H.J. Lu <hongjiu.lu@intel.com>
-
- * sysdeps/unix/sysv/linux/ia64/pt-initfini.c: Add local _init
- and _fini labels.
-
-Index: sysdeps/unix/sysv/linux/ia64/pt-initfini.c
-===================================================================
-RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/unix/sysv/linux/ia64/Attic/pt-initfini.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -p -r1.6 -r1.7
---- linuxthreads/sysdeps/unix/sysv/linux/ia64/pt-initfini.c 11 Dec 2003 20:43:51 -0000 1.6
-+++ linuxthreads/sysdeps/unix/sysv/linux/ia64/pt-initfini.c 20 Mar 2005 04:19:45 -0000 1.7
-@@ -87,6 +87,7 @@ _init:\n\
- /*@_init_EPILOG_BEGINS*/\n\
- .section .init\n\
- .proc _init#\n\
-+_init:\n\
- .prologue\n\
- .save ar.pfs, r34\n\
- .vframe r32\n\
-@@ -122,6 +123,7 @@ _fini:\n\
- /*@_fini_EPILOG_BEGINS*/\n\
- .section .fini\n\
- .proc _fini#\n\
-+_fini:\n\
- .prologue\n\
- .save ar.pfs, r34\n\
- .vframe r32\n\
Deleted: glibc-package/trunk/debian/patches/glibc235-execvp-fix.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-execvp-fix.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-execvp-fix.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,131 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: fix BZ #1125
-# DP: Related bugs: Serge Belyshev <belyshev@depni.sinp.msu.ru>
-# DP: Dpatch author: Serge Belyshev <belyshev@depni.sinp.msu.ru>
-# DP: Patch author: Ulrich Drepper and Jakub Jelinek
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-07-29
-
-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-07-24 Ulrich Drepper <drepper@redhat.com>
-
- [BZ #1125]
- * posix/Makefile (tests): Add tst-execvp4.
- * posix/tst-execvp4.c: New file.
-
-2005-07-24 Jakub Jelinek <jakub@redhat.com>
-
- [BZ #1125]
- * posix/execvp.c (execvp): Change path_malloc to
- char *, free that pointer on failure.
-
-diff -purN a/posix/execvp.c b/posix/execvp.c
---- a/posix/execvp.c 2005-07-26 01:15:32.000000000 +0400
-+++ b/posix/execvp.c 2005-07-26 01:16:21.000000000 +0400
-@@ -88,7 +88,7 @@ execvp (file, argv)
- else
- {
- char *path = getenv ("PATH");
-- bool path_malloc = false;
-+ char *path_malloc = NULL;
- if (path == NULL)
- {
- /* There is no `PATH' in the environment.
-@@ -100,7 +100,7 @@ execvp (file, argv)
- return -1;
- path[0] = ':';
- (void) confstr (_CS_PATH, path + 1, len);
-- path_malloc = true;
-+ path_malloc = path;
- }
-
- size_t len = strlen (file) + 1;
-@@ -108,8 +108,7 @@ execvp (file, argv)
- char *name = malloc (pathlen + len + 1);
- if (name == NULL)
- {
-- if (path_malloc)
-- free (path);
-+ free (path_malloc);
- return -1;
- }
- /* Copy the file name at the top. */
-@@ -190,8 +189,7 @@ execvp (file, argv)
-
- free (script_argv);
- free (name - pathlen);
-- if (path_malloc)
-- free (path);
-+ free (path_malloc);
- }
-
- /* Return the error from the last attempt (probably ENOENT). */
-diff -purN a/posix/Makefile b/posix/Makefile
---- a/posix/Makefile 2005-07-26 01:15:32.000000000 +0400
-+++ b/posix/Makefile 2005-07-26 01:16:21.000000000 +0400
-@@ -84,7 +84,7 @@ tests := tstgetopt testfnm runtests run
- transbug tst-rxspencer tst-pcre tst-boost \
- bug-ga1 tst-vfork1 tst-vfork2 tst-waitid \
- tst-getaddrinfo2 bug-glob1 bug-glob2 tst-sysconf \
-- tst-execvp1 tst-execvp2 tst-execlp1 tst-execlp2 \
-+ tst-execvp1 tst-execvp2 tst-execvp4 tst-execlp1 tst-execlp2 \
- tst-execv1 tst-execv2 tst-execl1 tst-execl2 \
- tst-execve1 tst-execve2 tst-execle1 tst-execle2
- xtests := bug-ga2
-diff -purN a/posix/tst-execvp4.c b/posix/tst-execvp4.c
---- a/posix/tst-execvp4.c 2005-07-26 01:15:32.000000000 +0400
-+++ b/posix/tst-execvp4.c 2005-07-26 01:16:21.000000000 +0400
-@@ -0,0 +1,35 @@
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+
-+static int
-+do_test (void)
-+{
-+ char buf[40] = "/usr/bin/does-not-exist";
-+ size_t stemlen = strlen (buf);
-+ struct stat64 st;
-+ int cnt = 0;
-+ while (stat64 (buf, &st) != -1 || errno != ENOENT
-+ || stat64 (buf + 4, &st) != -1 || errno != ENOENT)
-+ {
-+ if (cnt++ == 100)
-+ {
-+ puts ("cannot find a unique file name");
-+ return 0;
-+ }
-+
-+ strcpy (buf + stemlen, ".XXXXXX");
-+ mktemp (buf);
-+ }
-+
-+ unsetenv ("PATH");
-+ char *argv[] = { buf + 9, NULL };
-+ execvp (argv[0], argv);
-+ return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
Modified: glibc-package/trunk/debian/patches/glibc235-gcc4-arm-inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-arm-inline.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-arm-inline.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -46,83 +46,3 @@
fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
{
static void *fix_page;
-@@ -392,7 +399,14 @@
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
- MAP is the object containing the reloc. */
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
- const Elf32_Sym *sym, const struct r_found_version *version,
- void *const reloc_addr_arg)
-@@ -517,7 +531,14 @@
- }
-
- # ifndef RTLD_BOOTSTRAP
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- const Elf32_Sym *sym, const struct r_found_version *version,
- void *const reloc_addr_arg)
-@@ -597,7 +618,14 @@
- }
- # endif
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
- void *const reloc_addr_arg)
- {
-@@ -606,7 +634,14 @@
- }
-
- # ifndef RTLD_BOOTSTRAP
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
- void *const reloc_addr_arg)
- {
-@@ -615,7 +650,14 @@
- }
- # endif
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_lazy_rel (struct link_map *map,
- Elf32_Addr l_addr, const Elf32_Rel *reloc)
- {
Deleted: glibc-package/trunk/debian/patches/glibc235-gcc4-ia64-profile.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-ia64-profile.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-ia64-profile.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on ia64 fixed by
-# removing strong_alias.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-07-16
-
-PATCHLEVEL=0
-
-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-07-16 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/ia64/dl-machine.h: Remove strong_alias.
-
---- sysdeps/ia64/dl-machine.h 2005-07-14 22:21:08.040360346 +0000
-+++ sysdeps/ia64/dl-machine.h.new 2005-07-14 22:26:06.513950877 +0000
-@@ -263,8 +263,7 @@ elf_machine_runtime_setup (struct link_m
- TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup);
- #else
- #define ELF_MACHINE_RUNTIME_TRAMPOLINE \
-- TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup); \
-- strong_alias (_dl_runtime_resolve, _dl_runtime_profile);
-+ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup);
- #endif
-
- /* Undo the adds out0 = 16, sp below to get at the value we want in
Deleted: glibc-package/trunk/debian/patches/glibc235-gcc4-jis0208.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-jis0208.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-jis0208.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,64 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Alexandre Oliva <aoliva@redhat.com>
-# DP: Upstream status: Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-12
-
-PATCHLEVEL=0
-
-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.
-http://sources.redhat.com/ml/libc-hacker/2005-02/msg00000.html
-
-2005-02-02 Alexandre Oliva <aoliva@redhat.com>
-
- * iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move declaration
- before use. Fix typo in comment.
-
-Index: iconvdata/jis0208.h
---- iconvdata/jis0208.h 2003-06-11 18:40:42.000000000 -0300
-+++ iconvdata/jis0208.h 2005-02-02 05:57:39.000000000 -0200
-@@ -27,13 +27,7 @@
- /* Conversion table. */
- extern const uint16_t __jis0208_to_ucs[];
-
--extern const char __jisx0208_from_ucs4_lat1[256][2];
--extern const char __jisx0208_from_ucs4_greek[0xc1][2];
--extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
--extern const char __jisx0208_from_ucs_tab[][2];
--
--
--/* Struct for table with indeces in UCS mapping table. */
-+/* Struct for table with indexes in UCS mapping table. */
- struct jisx0208_ucs_idx
- {
- uint16_t start;
-@@ -41,6 +35,11 @@
- uint16_t idx;
- };
-
-+extern const char __jisx0208_from_ucs4_lat1[256][2];
-+extern const char __jisx0208_from_ucs4_greek[0xc1][2];
-+extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
-+extern const char __jisx0208_from_ucs_tab[][2];
-+
-
- static inline uint32_t
- __attribute ((always_inline))
Deleted: glibc-package/trunk/debian/patches/glibc235-gcc4-ppc-procfs.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-ppc-procfs.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-ppc-procfs.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,59 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc compile with gcc-4.0 on ppc32.
-# DP: Related bugs: #304963
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Alan Modra <amodra@bigpond.net.au>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-07-14
-
-PATCHLEVEL=0
-
-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-02-21 Alan Modra <amodra@bigpond.net.au>
-
- * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (elf_vrreg_t): Don't
- use __uint128_t.
-
-Index: sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -p -r1.11 -r1.12
---- sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 17 Dec 2003 23:09:34 -0000 1.11
-+++ sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2 Mar 2005 20:11:38 -0000 1.12
-@@ -46,15 +46,10 @@ typedef elf_greg_t elf_gregset_t[ELF_NGR
- typedef double elf_fpreg_t;
- typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-
--/* gcc 3.1 and newer support __uint128_t. */
--#if !__GNUC_PREREQ(3,1)
--typedef struct {
-- unsigned long u[4];
--} __attribute((aligned(16))) __uint128_t;
--#endif
--
- /* Altivec registers */
--typedef __uint128_t elf_vrreg_t;
-+typedef struct {
-+ unsigned int u[4];
-+} __attribute__ ((aligned (16))) elf_vrreg_t;
- typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
- #endif
-
Deleted: glibc-package/trunk/debian/patches/glibc235-gcc4-s390-inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-s390-inline.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-s390-inline.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,133 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on s390 for inline
-# functions of dl-machine.h.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS / Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-21
-
-PATCHLEVEL=0
-
-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-07-21 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/s390/s390-32/dl-machine.h: Use auto inline.
- * sysdeps/s390/s390-64/dl-machine.h: Likewise.
-
---- sysdeps/s390/s390-32/dl-machine.h.org 2005-07-14 11:26:21.000000000 -0400
-+++ sysdeps/s390/s390-32/dl-machine.h 2005-07-14 11:29:24.000000000 -0400
-@@ -383,7 +383,14 @@ elf_machine_plt_value (struct link_map *
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
- MAP is the object containing the reloc. */
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- const Elf32_Sym *sym, const struct r_found_version *version,
- void *const reloc_addr_arg)
-@@ -539,7 +546,14 @@ elf_machine_rela (struct link_map *map,
- }
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
- void *const reloc_addr_arg)
- {
-@@ -547,7 +561,14 @@ elf_machine_rela_relative (Elf32_Addr l_
- *reloc_addr = l_addr + reloc->r_addend;
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_lazy_rel (struct link_map *map,
- Elf32_Addr l_addr, const Elf32_Rela *reloc)
- {
---- sysdeps/s390/s390-64/dl-machine.h.org 2005-07-21 10:57:50.502759109 -0400
-+++ sysdeps/s390/s390-64/dl-machine.h 2005-07-21 10:59:17.372759109 -0400
-@@ -350,7 +350,14 @@
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
- MAP is the object containing the reloc. */
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
- const Elf64_Sym *sym, const struct r_found_version *version,
- void *const reloc_addr_arg)
-@@ -518,7 +525,14 @@
- }
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
- void *const reloc_addr_arg)
- {
-@@ -526,7 +540,14 @@
- *reloc_addr = l_addr + reloc->r_addend;
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_lazy_rel (struct link_map *map,
- Elf64_Addr l_addr, const Elf64_Rela *reloc)
- {
Deleted: glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-hppa-fpu.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -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));
-
-
Deleted: glibc-package/trunk/debian/patches/glibc235-leapsecond.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-leapsecond.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/glibc235-leapsecond.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,88 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Add leap second for 2005
-
-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
-
---- timezone/leapseconds~ 2005-04-05 21:20:40.000000000 -0400
-+++ timezone/leapseconds 2005-08-06 02:03:20.000000000 -0400
-@@ -1,4 +1,4 @@
--# @(#)leapseconds 7.19
-+# @(#)leapseconds 7.20
-
- # Allowance for leapseconds added to each timezone file.
-
-@@ -43,8 +43,10 @@
- Leap 1995 Dec 31 23:59:60 + S
- Leap 1997 Jun 30 23:59:60 + S
- Leap 1998 Dec 31 23:59:60 + S
-+Leap 2005 Dec 31 23:59:60 + S
-
- # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-+#
- # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
- #
- # SERVICE DE LA ROTATION TERRESTRE
-@@ -52,29 +54,39 @@
- # 61, Av. de l'Observatoire 75014 PARIS (France)
- # Tel. : 33 (0) 1 40 51 22 26
- # FAX : 33 (0) 1 40 51 22 91
--# Internet : services.iers@obspm.fr
--#
--# Paris, 21 July 2004
--#
-+# ...
-+# http://hpiers.obspm.fr/eop-pc
- #
--# Bulletin C 28
-+# Paris, 4 July 2005
-+#
-+# Bulletin C 30
- #
- # To authorities responsible
- # for the measurement and
- # distribution of time
- #
--# INFORMATION ON UTC - TAI
- #
--# NO positive leap second will be introduced at the end of December 2004.
-+# UTC TIME STEP
-+# on the 1st of January 2006
-+#
-+# A positive leap second will be introduced at the end of December 2005.
-+# The sequence of dates of the UTC second markers will be:
-+#
-+# 2005 December 31, 23h 59m 59s
-+# 2005 December 31, 23h 59m 60s
-+# 2006 January 1, 0h 0m 0s
-+#
- # The difference between UTC and the International Atomic Time TAI is:
- #
--# from 1999 January 1, 0h UTC, until further notice : UTC-TAI = -32 s
-+# from 1999 January 1, 0h UTC, to 2006 January 1 0h UTC : UTC-TAI = - 32s
-+# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = - 33s
- #
--# Leap seconds can be introduced in UTC at the end of the months of December
-+# Leap seconds can be introduced in UtC at the end of the months of December
- # or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
--# six months, either to announce a time step in UTC, or to confirm that there
-+# six months, either to announce a time step in UTC or to confirm that there
- # will be no time step at the next possible date.
- #
- # Daniel GAMBIS
--# Director
-+# Head
- # Earth Orientation Center of IERS
-+# Observatoire de Paris, France
Deleted: glibc-package/trunk/debian/patches/ia64-binutils-libm.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64-binutils-libm.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/ia64-binutils-libm.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix compilation against new binutils.
-# DP: Related bugs:
-# DP: Dpatch author: Jeff Bailey
-# DP: Patch author: HJ Lu
-# DP: Upstream status: Pending
-# DP: Status Details:
-# DP: Date: 2005-16-11
-
-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.
-
---- libc/sysdeps/ia64/fpu/libm-symbols.h.old 2005-11-23 13:05:39.995400701 +0000
-+++ libc/sysdeps/ia64/fpu/libm-symbols.h 2005-11-23 13:35:31.474921420 +0000
-@@ -39,13 +39,13 @@
-
- #define WEAK_LIBM_ENTRY(name) \
- .align 32; \
-- LOCAL_LIBM_ENTRY(name); \
-+ LOCAL_LIBM_ENTRY(__##name); \
- .global __##name; \
- __##name:
- #define WEAK_LIBM_END(name) \
- weak_alias (__##name, name); \
- .hidden __##name; \
-- LOCAL_LIBM_END(name); \
-+ LOCAL_LIBM_END(__##name); \
- ASM_SIZE_DIRECTIVE(__##name); \
- ASM_TYPE_DIRECTIVE(__##name, @function)
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/series 2006-02-08 03:39:03 UTC (rev 1161)
@@ -65,7 +65,6 @@
glibc235-hppa-lt.diff -p1
glibc235-hppa-sysdeps.diff -p1
glibc235-gcc4-sparc-inline.diff -p0
-glibc235-gcc4-s390-inline.diff -p0
glibc235-gcc4-alpha-profile.diff -p0
glibc235-gcc34-m68k-seccomment.diff -p0
locale-iso4217.diff -p0
Deleted: glibc-package/trunk/debian/patches/strfry-segv.diff
===================================================================
--- glibc-package/trunk/debian/patches/strfry-segv.diff 2006-02-06 23:59:42 UTC (rev 1160)
+++ glibc-package/trunk/debian/patches/strfry-segv.diff 2006-02-08 03:39:03 UTC (rev 1161)
@@ -1,124 +0,0 @@
-#! /bin/sh -e
-
-# DP: Fix segfault in strfry()
-
-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-04-12 Ulrich Drepper <drepper@redhat.com>
-
- [BZ #1090]
- * stdlib/random_r.c (__initstate_r): Don't use non-existing state.
- * string/tst-strfry.c: New file.
- * string/Makefile (tests): Add tst-strfry.
-
-Index: stdlib/random_r.c
-===================================================================
-RCS file: /cvs/glibc/libc/stdlib/random_r.c,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -r1.19 -r1.20
---- stdlib/random_r.c 10 Feb 2005 09:40:11 -0000 1.19
-+++ stdlib/random_r.c 12 Apr 2005 15:21:29 -0000 1.20
-@@ -236,23 +236,20 @@
- size_t n;
- struct random_data *buf;
- {
-- int type;
-- int degree;
-- int separation;
-- int32_t *state;
-- int old_type;
-- int32_t *old_state;
--
- if (buf == NULL)
- goto fail;
-
-- old_type = buf->rand_type;
-- old_state = buf->state;
-- if (old_type == TYPE_0)
-- old_state[-1] = TYPE_0;
-- else
-- old_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;
-+ int32_t *old_state = buf->state;
-+ if (old_state != NULL)
-+ {
-+ int old_type = buf->rand_type;
-+ if (old_type == TYPE_0)
-+ old_state[-1] = TYPE_0;
-+ else
-+ old_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;
-+ }
-
-+ int type;
- if (n >= BREAK_3)
- type = n < BREAK_4 ? TYPE_3 : TYPE_4;
- else if (n < BREAK_1)
-@@ -267,13 +264,13 @@
- else
- type = n < BREAK_2 ? TYPE_1 : TYPE_2;
-
-- degree = random_poly_info.degrees[type];
-- separation = random_poly_info.seps[type];
-+ int degree = random_poly_info.degrees[type];
-+ int separation = random_poly_info.seps[type];
-
- buf->rand_type = type;
- buf->rand_sep = separation;
- buf->rand_deg = degree;
-- state = &((int32_t *) arg_state)[1]; /* First location. */
-+ int32_t *state = &((int32_t *) arg_state)[1]; /* First location. */
- /* Must set END_PTR before srandom. */
- buf->end_ptr = &state[degree];
-
---- /dev/null 2005-04-18 14:50:08.963492000 +0100
-+++ string/tst-strfry.c 2005-04-12 16:27:40.000000000 +0100
-@@ -0,0 +1,15 @@
-+#include <stdio.h>
-+#include <string.h>
-+
-+static int
-+do_test (void)
-+{
-+ char str[] = "this is a test";
-+
-+ strfry (str);
-+
-+ return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-Index: string/Makefile
-===================================================================
-RCS file: /cvs/glibc/libc/string/Makefile,v
-retrieving revision 1.65
-retrieving revision 1.66
-diff -u -r1.65 -r1.66
---- string/Makefile 18 Oct 2004 04:17:12 -0000 1.65
-+++ string/Makefile 12 Apr 2005 15:27:59 -0000 1.66
-@@ -1,4 +1,4 @@
--# Copyright (C) 1991-1999,2000,2001,2002 Free Software Foundation, Inc.
-+# Copyright (C) 1991-1999,2000,2001,2002, 2005 Free Software Foundation, Inc.
- # This file is part of the GNU C Library.
-
- # The GNU C Library is free software; you can redistribute it and/or
-@@ -52,7 +52,7 @@
- tests := tester inl-tester noinl-tester testcopy test-ffs \
- tst-strlen stratcliff tst-svc tst-inlcall \
- bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \
-- tst-strtok tst-strxfrm bug-strcoll1 \
-+ tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \
- $(addprefix test-,$(strop-tests))
- distribute := memcopy.h pagecopy.h tst-svc.expect test-string.h
-
Reply to: