From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 30 Nov 2010 09:38:11 +0000 (+0100)
Subject: Merge commit 'glibc-2.11.3' into fedora/2.11/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=331523bb4b8953eb6f854689426d5e400ac566a9;p=thirdparty%2Fglibc.git

Merge commit 'glibc-2.11.3' into fedora/2.11/master
---

331523bb4b8953eb6f854689426d5e400ac566a9
diff --cc ChangeLog
index 0e1306ef6d1,49dcad65c23..a7c0b0fddd7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -13,12 -262,44 +262,50 @@@
  	(do_preload): Use __RTLD_SECURE instead of is_preloaded.
  	(dlmopen_doit): Add __RTLD_SECURE to mode bits.
  
+ 2010-10-06  Ulrich Drepper  <drepper@gmail.com>
+ 
+ 	* string/bug-strstr1.c: New file.
+ 	* string/Makefile: Add rules to build and run bug-strstr1.
+ 
+ 2010-10-05  Eric Blake  <eblake@redhat.com>
+ 
+ 	[BZ #12092]
+ 	* string/str-two-way.h (two_way_long_needle): Always clear memory
+ 	when skipping input due to the shift table.
+ 
+ 2010-10-03  Ulrich Drepper  <drepper@gmail.com>
+ 
+ 	[BZ #12005]
+ 	* malloc/mcheck.c: Handle large requests.
+ 
+ 	[BZ #12077]
+ 	* sysdeps/x86_64/strcmp.S: Fix handling of remaining bytes in buffer
+ 	for strncmp and strncasecmp.
+ 	* string/stratcliff.c: Add tests for strcmp and strncmp.
+ 	* wcsmbs/wcsatcliff.c: Adjust for stratcliff change.
+ 
+ 2010-06-02  Kirill A. Shutemov  <kirill@shutemov.name>
+ 
+ 	* elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch
+ 	requires it.
+ 
+ 2010-06-02  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* nis/nss_nis/nis-initgroups.c (get_uid): Properly resize buffer.
+ 
+ 2010-06-07  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	* libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of
+ 	__REDIRECT followed by __THROW.
+ 	* wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
+ 	* posix/getopt.h (getopt): Likewise.
+ 
 +2010-10-18  Andreas Schwab  <schwab@redhat.com>
 +
 +	* elf/dl-load.c (is_dst): Remove last parameter.
 +	(_dl_dst_count): Ignore $ORIGIN in privileged programs.
 +	(_dl_dst_substitute): Likewise.
 +
  2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
  
  	[BZ #11640]
diff --cc malloc/mcheck.c
index 28210068ff9,e2eb83f41db..01394acd900
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@@ -24,25 -25,10 +25,26 @@@
  # include <mcheck.h>
  # include <stdint.h>
  # include <stdio.h>
 +# include <stdlib.h>
  # include <libintl.h>
+ # include <errno.h>
  #endif
  
 +#ifdef _LIBC
 +extern __typeof (malloc) __libc_malloc;
 +extern __typeof (free) __libc_free;
 +extern __typeof (realloc) __libc_realloc;
 +libc_hidden_proto (__libc_malloc)
 +libc_hidden_proto (__libc_realloc)
 +libc_hidden_proto (__libc_free)
 +libc_hidden_proto (__libc_memalign)
 +#else
 +# define __libc_malloc(sz) malloc (sz)
 +# define __libc_free(ptr) free (ptr)
 +# define __libc_realloc(ptr, sz) realloc (ptr, sz)
 +# define __libc_memalign(al, sz) memalign (al, sz)
 +#endif
 +
  /* Old hook values.  */
  static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
  static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);