Author: aurel32 Date: 2007-08-01 06:08:59 +0000 (Wed, 01 Aug 2007) New Revision: 2493
Removed: glibc-package/trunk/debian/patches/any/cvs-printf_fp.c.diff glibc-package/trunk/debian/patches/sparc/submitted-gscope_flag.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * Remove any/cvs-printf_fp.c.diff (merged upstream). * Remove sparc/submitted-gscope_flag.diff (merged upstream). Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2007-08-01 06:04:08 UTC (rev 2492) +++ glibc-package/trunk/debian/changelog 2007-08-01 06:08:59 UTC (rev 2493) @@ -5,8 +5,10 @@ [ Aurelien Jarno ] * debian/copyright: update. * Remove any/cvs-glibc-2_6-branch.diff (merged upstream). + * Remove any/cvs-printf_fp.c.diff (merged upstream). + * Remove sparc/submitted-gscope_flag.diff (merged upstream). - -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 01 Aug 2007 08:03:16 +0200 + -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 01 Aug 2007 08:08:06 +0200 glibc (2.6-5) unstable; urgency=low Deleted: glibc-package/trunk/debian/patches/any/cvs-printf_fp.c.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-printf_fp.c.diff 2007-08-01 06:04:08 UTC (rev 2492) +++ glibc-package/trunk/debian/patches/any/cvs-printf_fp.c.diff 2007-08-01 06:08:59 UTC (rev 2493) @@ -1,24 +0,0 @@ -2007-07-28 Ulrich Drepper <[EMAIL PROTECTED]> - - [BZ 4858] - * stdio-common/printf_fp.c (___printf_fp): Fix special case of - #.0g and value rounded to 1.0. - -=================================================================== -RCS file: /cvs/glibc/libc/stdio-common/printf_fp.c,v -retrieving revision 1.63 -retrieving revision 1.64 -diff -u -r1.63 -r1.64 ---- libc/stdio-common/printf_fp.c 2007/04/30 22:31:21 1.63 -+++ libc/stdio-common/printf_fp.c 2007/07/29 00:25:19 1.64 -@@ -986,7 +986,9 @@ - if (*wtp != decimalwc) - /* Round up. */ - (*wtp)++; -- else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt, -+ else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt -+ && wtp == wstartp + 1 -+ && wstartp[0] == L'0', - 0)) - /* This is a special case: the rounded number is 1.0, - the format is 'g' or 'G', and the alternative format Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2007-08-01 06:04:08 UTC (rev 2492) +++ glibc-package/trunk/debian/patches/series 2007-08-01 06:08:59 UTC (rev 2493) @@ -98,7 +98,6 @@ sparc/local-sparcv9-target.diff -p0 sparc/local-undefined-registers.diff -p0 #sparc/submitted-timing.diff -sparc/submitted-gscope_flag.diff -p0 all/local-pthread-manpages.diff all/local-remove-manual.diff @@ -107,7 +106,6 @@ any/cvs-ld_library_path.diff any/cvs-initfini.diff -p1 -any/cvs-printf_fp.c.diff -p1 any/local-notls.diff -p0 any/local-asserth-decls.diff -p0 # any/local-base.diff -p0 # g: suspended Deleted: glibc-package/trunk/debian/patches/sparc/submitted-gscope_flag.diff =================================================================== --- glibc-package/trunk/debian/patches/sparc/submitted-gscope_flag.diff 2007-08-01 06:04:08 UTC (rev 2492) +++ glibc-package/trunk/debian/patches/sparc/submitted-gscope_flag.diff 2007-08-01 06:08:59 UTC (rev 2493) @@ -1,19 +0,0 @@ ---- nptl/sysdeps/sparc/tls.h.orig 2007-07-26 00:36:08.000000000 +0200 -+++ nptl/sysdeps/sparc/tls.h 2007-07-26 00:36:25.000000000 +0200 -@@ -46,9 +46,15 @@ - dtv_t *dtv; - void *self; - int multiple_threads; -+#if __WORDSIZE == 64 -+ int gscope_flag; -+#endif - uintptr_t sysinfo; - uintptr_t stack_guard; - uintptr_t pointer_guard; -+#if __WORDSIZE != 64 -+ int gscope_flag; -+#endif - } tcbhead_t; - - #else /* __ASSEMBLER__ */ - -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
