r864 - in glibc-package/branches/glibc-2.3.4/debian: . patches
Author: gotom
Date: 2005-03-21 06:46:10 +0100 (Mon, 21 Mar 2005)
New Revision: 864
Added:
glibc-package/branches/glibc-2.3.4/debian/patches/hurd-malloc.dpatch
Removed:
glibc-package/branches/glibc-2.3.4/debian/patches/00list.hurd-i386
glibc-package/branches/glibc-2.3.4/debian/patches/hurd-string.dpatch
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/patches/00list
Log:
* Hurd update:
- debian/patches/hurd-string.dpatch: Removed, it's already in cvs.
- debian/patches/00list.hurd-i386: Removed.
- debian/patches/hurd-malloc.dpatch: Add to fix Hurd build fix, patch
from Michael Banck <mbanck@debian.org>.
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-03-21 04:44:27 UTC (rev 863)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-03-21 05:46:10 UTC (rev 864)
@@ -132,6 +132,12 @@
- s390-pthread-fpic.dpatch
- syslog-locale.dpatch
+ * Hurd update:
+ - debian/patches/hurd-string.dpatch: Removed, it's already in cvs.
+ - debian/patches/00list.hurd-i386: Removed.
+ - debian/patches/hurd-malloc.dpatch: Add to fix Hurd build fix, patch
+ from Michael Banck <mbanck@debian.org>.
+
-- GOTO Masanori <gotom@debian.org> Fri, 18 Mar 2005 09:41:49 +0900
glibc (2.3.2.ds1-21) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.3.4/debian/patches/00list
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/00list 2005-03-21 04:44:27 UTC (rev 863)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/00list 2005-03-21 05:46:10 UTC (rev 864)
@@ -56,3 +56,4 @@
glibc234-hppa-full-nptl-2004-12-20
#50_glibc232-hppa-full-nptl-2003-10-22 # g: lock initializer part is not applied, cheated by glibc234-hppa-remove-mallocdef.dpatch.
glibc234-hppa-remove-mallocdef
+hurd-malloc
Deleted: glibc-package/branches/glibc-2.3.4/debian/patches/00list.hurd-i386
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/00list.hurd-i386 2005-03-21 04:44:27 UTC (rev 863)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/00list.hurd-i386 2005-03-21 05:46:10 UTC (rev 864)
@@ -1,2 +0,0 @@
-hurd-string
-
Added: glibc-package/branches/glibc-2.3.4/debian/patches/hurd-malloc.dpatch
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/hurd-malloc.dpatch 2005-03-21 04:44:27 UTC (rev 863)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/hurd-malloc.dpatch 2005-03-21 05:46:10 UTC (rev 864)
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Always #include <stdbool.h>
+# DP: Related bugs:
+# DP: Author: Alfred M. Szmidt
+# DP: Upstream status: In CVS
+# DP: Status Details:
+# DP: Date: 2005-03-01
+
+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-03-01 Alfred M. Szmidt <ams@gnu.org>
+
+ * malloc/arena.c: #include <stdbool.h> outside of [SHARED &&
+ USE_TLS && !USE___THREAD].
+
+--- malloc/arena.c 10 Dec 2004 12:42:08 +0100 1.13
++++ malloc/arena.c 25 Feb 2005 05:30:11 +0100
+@@ -1,5 +1,5 @@
+ /* Malloc implementation for multiple threads without lock contention.
+- Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++ Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
+
+@@ -20,6 +20,8 @@
+
+ /* $Id: arena.c,v 1.13 2004/12/10 11:42:08 drepper Exp $ */
+
++#include <stdbool.h>
++
+ /* Compile-time constants. */
+
+ #define HEAP_MIN_SIZE (32*1024)
+@@ -353,8 +355,6 @@ libc_hidden_proto (_dl_open_hook);
+ # endif
+
+ # if defined SHARED && defined USE_TLS && !USE___THREAD
+-# include <stdbool.h>
+-
+ /* This is called by __pthread_initialize_minimal when it needs to use
+ malloc to set up the TLS state. We cannot do the full work of
+ ptmalloc_init (below) until __pthread_initialize_minimal has finished,
Deleted: glibc-package/branches/glibc-2.3.4/debian/patches/hurd-string.dpatch
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/hurd-string.dpatch 2005-03-21 04:44:27 UTC (rev 863)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/hurd-string.dpatch 2005-03-21 05:46:10 UTC (rev 864)
@@ -1,330 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Use GCC built-ins where possible.
-# DP: Related bugs:
-# DP: Dpatch author: Jeff Bailey <jbailey@raspberryginger.com>
-# DP: Patch author: Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2004-07-30
-
-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
-
-2004-05-26 Jakub Jelinek <jakub@redhat.com>
-
- * include/string.h (mempcpy, stpcpy): Add libc_hidden_builtin_proto.
- * string/bits/string2.h (memset): Disable macro for GCC 3.0+.
- (__mempcpy): Use __builtin_mempcpy for GCC 3.4+.
- (strchr): For GCC 3.2+, only use __rawmemchr if second argument is
- constant '\0' and first argument is not constant.
- (__stpcpy): Use __builtin_stpcpy for GCC 3.4+.
- (strncpy): Remove #ifdef _USE_STRING_ARCH_mempcpy variant.
- For GCC 3.2+ use __builtin_strncpy.
- (strncat): For GCC 3.2+ use __builtin_strncat.
- (strcmp): For GCC 3.2+ use __builtin_strcmp if both arguments
-are
- constant.
- (strcspn, strspn, strpbrk): For GCC 3.2+, use builtin function
- if both arguments are constant.
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- include/string.h 2004-07-03 23:01:41.000000000 -0400
-+++ include/string.h 2004-07-28 19:11:40.773933965 -0400
-@@ -78,9 +78,13 @@
- libc_hidden_proto (__strverscmp)
- libc_hidden_proto (basename)
- libc_hidden_proto (strcoll)
-+libc_hidden_proto (__strcoll_l)
-+libc_hidden_proto (__strxfrm_l)
-
- libc_hidden_builtin_proto (memchr)
- libc_hidden_builtin_proto (memcpy)
-+libc_hidden_builtin_proto (mempcpy)
-+libc_hidden_builtin_proto (memcmp)
- libc_hidden_builtin_proto (memmove)
- libc_hidden_builtin_proto (memset)
- libc_hidden_builtin_proto (strcat)
-@@ -92,6 +96,7 @@
- libc_hidden_builtin_proto (strncmp)
- libc_hidden_builtin_proto (strncpy)
- libc_hidden_builtin_proto (strpbrk)
-+libc_hidden_builtin_proto (stpcpy)
- libc_hidden_builtin_proto (strrchr)
- libc_hidden_builtin_proto (strspn)
- libc_hidden_builtin_proto (strstr)
---- string/bits/string2.h 2004-07-03 23:01:44.000000000 -0400
-+++ string/bits/string2.h 2004-07-28 19:11:54.713132627 -0400
-@@ -1,5 +1,5 @@
- /* Machine-independant string function optimizations.
-- Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
-+ Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-@@ -30,7 +30,7 @@
- means the code size increases a lot. Instead the definitions here
- optimize some functions in a way which do not dramatically
- increase the code size and which do not use assembler. The main
-- trick is to use GNU CC's `__builtin_constant_p' function.
-+ trick is to use GCC's `__builtin_constant_p' function.
-
- Every function XXX which has a defined version in
- <bits/string.h> must be accompanied by a symbol _HAVE_STRING_ARCH_XXX
-@@ -94,7 +94,7 @@
- ((size_t)(const void *)((__x) + 1) - (size_t)(const void *)(__x) == 1)
-
- /* Set N bytes of S to C. */
--#ifndef _HAVE_STRING_ARCH_memset
-+#if !defined _HAVE_STRING_ARCH_memset && ! __GNUC_PREREQ (3, 0)
- # if _STRING_ARCH_unaligned
- # define memset(s, c, n) \
- (__extension__ (__builtin_constant_p (n) && (n) <= 16 \
-@@ -178,12 +178,10 @@
- \
- __s; })
- # else
--# if ! __GNUC_PREREQ (3, 0)
--# define memset(s, c, n) \
-+# define memset(s, c, n) \
- (__extension__ (__builtin_constant_p (c) && (c) == '\0' \
- ? ({ void *__s = (s); __bzero (__s, n); __s; }) \
- : memset (s, c, n)))
--# endif
- # endif
-
- /* GCC optimizes memset(s, 0, n) but not bzero(s, n).
-@@ -200,7 +198,9 @@
- #ifdef __USE_GNU
- # if !defined _HAVE_STRING_ARCH_mempcpy || defined _FORCE_INLINES
- # ifndef _HAVE_STRING_ARCH_mempcpy
--# if __GNUC_PREREQ (3, 0)
-+# if __GNUC_PREREQ (3, 4)
-+# define __mempcpy(dest, src, n) __builtin_mempcpy (dest, src, n)
-+# elif __GNUC_PREREQ (3, 0)
- # define __mempcpy(dest, src, n) \
- (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) \
- && __string2_1bptr_p (src) && n <= 8 \
-@@ -387,10 +387,18 @@
- /* Return pointer to C in S. */
- #ifndef _HAVE_STRING_ARCH_strchr
- extern void *__rawmemchr (const void *__s, int __c);
--# define strchr(s, c) \
-+# if __GNUC_PREREQ (3, 2)
-+# define strchr(s, c) \
-+ (__extension__ (__builtin_constant_p (c) && !__builtin_constant_p (s) \
-+ && (c) == '\0' \
-+ ? (char *) __rawmemchr (s, c) \
-+ : __builtin_strchr (s, c)))
-+# else
-+# define strchr(s, c) \
- (__extension__ (__builtin_constant_p (c) && (c) == '\0' \
- ? (char *) __rawmemchr (s, c) \
- : strchr (s, c)))
-+# endif
- #endif
-
-
-@@ -560,7 +568,9 @@
- #ifdef __USE_GNU
- # if !defined _HAVE_STRING_ARCH_stpcpy || defined _FORCE_INLINES
- # ifndef _HAVE_STRING_ARCH_stpcpy
--# if __GNUC_PREREQ (3, 0)
-+# if __GNUC_PREREQ (3, 4)
-+# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
-+# elif __GNUC_PREREQ (3, 0)
- # define __stpcpy(dest, src) \
- (__extension__ (__builtin_constant_p (src) \
- ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8 \
-@@ -742,16 +752,8 @@
-
- /* Copy no more than N characters of SRC to DEST. */
- #ifndef _HAVE_STRING_ARCH_strncpy
--# if defined _USE_STRING_ARCH_memset && defined _USE_STRING_ARCH_mempcpy
--# define strncpy(dest, src, n) \
-- (__extension__ ({ char *__dest = (dest); \
-- __builtin_constant_p (src) && __builtin_constant_p (n) \
-- ? (strlen (src) + 1 >= ((size_t) (n)) \
-- ? (char *) memcpy (__dest, src, n) \
-- : (memset (__mempcpy (__dest, src, strlen (src)), \
-- '\0', n - strlen (src)), \
-- __dest)) \
-- : strncpy (__dest, src, n); }))
-+# if __GNUC_PREREQ (3, 2)
-+# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)
- # else
- # define strncpy(dest, src, n) \
- (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) \
-@@ -774,6 +776,8 @@
- : (*((char *) __mempcpy (strchr (__dest, '\0'), \
- src, n)) = '\0', __dest)) \
- : strncat (dest, src, n); }))
-+# elif __GNUC_PREREQ (3, 2)
-+# define strncat(dest, src, n) __builtin_strncat (dest, src, n)
- # else
- # define strncat(dest, src, n) \
- (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) \
-@@ -787,7 +791,28 @@
-
- /* Compare characters of S1 and S2. */
- #ifndef _HAVE_STRING_ARCH_strcmp
--# define strcmp(s1, s2) \
-+# if __GNUC_PREREQ (3, 2)
-+# define strcmp(s1, s2) \
-+ __extension__ \
-+ ({ size_t __s1_len, __s2_len; \
-+ (__builtin_constant_p (s1) && __builtin_constant_p (s2) \
-+ && (__s1_len = strlen (s1), __s2_len = strlen (s2), \
-+ (!__string2_1bptr_p (s1) || __s1_len >= 4) \
-+ && (!__string2_1bptr_p (s2) || __s2_len >= 4)) \
-+ ? __builtin_strcmp (s1, s2) \
-+ : (__builtin_constant_p (s1) && __string2_1bptr_p (s1) \
-+ && (__s1_len = strlen (s1), __s1_len < 4) \
-+ ? (__builtin_constant_p (s2) && __string2_1bptr_p (s2) \
-+ ? __builtin_strcmp (s1, s2) \
-+ : __strcmp_cg (s1, s2, __s1_len)) \
-+ : (__builtin_constant_p (s2) && __string2_1bptr_p (s2) \
-+ && (__s2_len = strlen (s2), __s2_len < 4) \
-+ ? (__builtin_constant_p (s1) && __string2_1bptr_p (s1) \
-+ ? __builtin_strcmp (s1, s2) \
-+ : __strcmp_gc (s1, s2, __s2_len)) \
-+ : __builtin_strcmp (s1, s2)))); })
-+# else
-+# define strcmp(s1, s2) \
- __extension__ \
- ({ size_t __s1_len, __s2_len; \
- (__builtin_constant_p (s1) && __builtin_constant_p (s2) \
-@@ -807,6 +832,7 @@
- ? __strcmp_cc (s1, s2, __s2_len) \
- : __strcmp_gc (s1, s2, __s2_len)) \
- : strcmp (s1, s2)))); })
-+# endif
-
- # define __strcmp_cc(s1, s2, l) \
- (__extension__ ({ register int __result = \
-@@ -900,7 +926,25 @@
- consists entirely of characters not in REJECT. */
- #if !defined _HAVE_STRING_ARCH_strcspn || defined _FORCE_INLINES
- # ifndef _HAVE_STRING_ARCH_strcspn
--# define strcspn(s, reject) \
-+# if __GNUC_PREREQ (3, 2)
-+# define strcspn(s, reject) \
-+ __extension__ \
-+ ({ char __r0, __r1, __r2; \
-+ (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
-+ ? ((__builtin_constant_p (s) && __string2_1bptr_p (s)) \
-+ ? __builtin_strcspn (s, reject) \
-+ : ((__r0 = ((__const char *) (reject))[0], __r0 == '\0') \
-+ ? strlen (s) \
-+ : ((__r1 = ((__const char *) (reject))[1], __r1 == '\0') \
-+ ? __strcspn_c1 (s, __r0) \
-+ : ((__r2 = ((__const char *) (reject))[2], __r2 == '\0') \
-+ ? __strcspn_c2 (s, __r0, __r1) \
-+ : (((__const char *) (reject))[3] == '\0' \
-+ ? __strcspn_c3 (s, __r0, __r1, __r2) \
-+ : __builtin_strcspn (s, reject)))))) \
-+ : __builtin_strcspn (s, reject)); })
-+# else
-+# define strcspn(s, reject) \
- __extension__ \
- ({ char __r0, __r1, __r2; \
- (__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
-@@ -913,7 +957,8 @@
- : (((__const char *) (reject))[3] == '\0' \
- ? __strcspn_c3 (s, __r0, __r1, __r2) \
- : strcspn (s, reject))))) \
-- : strcspn (s, reject)); })
-+ : strcspn (s, reject)); })
-+# endif
- # endif
-
- __STRING_INLINE size_t __strcspn_c1 (__const char *__s, int __reject);
-@@ -957,7 +1002,25 @@
- consists entirely of characters in ACCEPT. */
- #if !defined _HAVE_STRING_ARCH_strspn || defined _FORCE_INLINES
- # ifndef _HAVE_STRING_ARCH_strspn
--# define strspn(s, accept) \
-+# if __GNUC_PREREQ (3, 2)
-+# define strspn(s, accept) \
-+ __extension__ \
-+ ({ char __a0, __a1, __a2; \
-+ (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
-+ ? ((__builtin_constant_p (s) && __string2_1bptr_p (s)) \
-+ ? __builtin_strspn (s, accept) \
-+ : ((__a0 = ((__const char *) (accept))[0], __a0 == '\0') \
-+ ? ((void) (s), 0) \
-+ : ((__a1 = ((__const char *) (accept))[1], __a1 == '\0') \
-+ ? __strspn_c1 (s, __a0) \
-+ : ((__a2 = ((__const char *) (accept))[2], __a2 == '\0') \
-+ ? __strspn_c2 (s, __a0, __a1) \
-+ : (((__const char *) (accept))[3] == '\0' \
-+ ? __strspn_c3 (s, __a0, __a1, __a2) \
-+ : __builtin_strspn (s, accept)))))) \
-+ : __builtin_strspn (s, accept)); })
-+# else
-+# define strspn(s, accept) \
- __extension__ \
- ({ char __a0, __a1, __a2; \
- (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
-@@ -971,6 +1034,7 @@
- ? __strspn_c3 (s, __a0, __a1, __a2) \
- : strspn (s, accept))))) \
- : strspn (s, accept)); })
-+# endif
- # endif
-
- __STRING_INLINE size_t __strspn_c1 (__const char *__s, int __accept);
-@@ -1014,12 +1078,30 @@
- /* Find the first occurrence in S of any character in ACCEPT. */
- #if !defined _HAVE_STRING_ARCH_strpbrk || defined _FORCE_INLINES
- # ifndef _HAVE_STRING_ARCH_strpbrk
--# define strpbrk(s, accept) \
-+# if __GNUC_PREREQ (3, 2)
-+# define strpbrk(s, accept) \
-+ __extension__ \
-+ ({ char __a0, __a1, __a2; \
-+ (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
-+ ? ((__builtin_constant_p (s) && __string2_1bptr_p (s)) \
-+ ? __builtin_strpbrk (s, accept) \
-+ : ((__a0 = ((__const char *) (accept))[0], __a0 == '\0') \
-+ ? ((void) (s), (char *) NULL) \
-+ : ((__a1 = ((__const char *) (accept))[1], __a1 == '\0') \
-+ ? __builtin_strchr (s, __a0) \
-+ : ((__a2 = ((__const char *) (accept))[2], __a2 == '\0') \
-+ ? __strpbrk_c2 (s, __a0, __a1) \
-+ : (((__const char *) (accept))[3] == '\0' \
-+ ? __strpbrk_c3 (s, __a0, __a1, __a2) \
-+ : __builtin_strpbrk (s, accept)))))) \
-+ : __builtin_strpbrk (s, accept)); })
-+# else
-+# define strpbrk(s, accept) \
- __extension__ \
- ({ char __a0, __a1, __a2; \
- (__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
- ? ((__a0 = ((__const char *) (accept))[0], __a0 == '\0') \
-- ? ((void) (s), NULL) \
-+ ? ((void) (s), (char *) NULL) \
- : ((__a1 = ((__const char *) (accept))[1], __a1 == '\0') \
- ? strchr (s, __a0) \
- : ((__a2 = ((__const char *) (accept))[2], __a2 == '\0') \
-@@ -1028,6 +1110,7 @@
- ? __strpbrk_c3 (s, __a0, __a1, __a2) \
- : strpbrk (s, accept))))) \
- : strpbrk (s, accept)); })
-+# endif
- # endif
-
- __STRING_INLINE char *__strpbrk_c2 (__const char *__s, int __accept1,
Reply to: