From: Andreas Schwab <schwab@redhat.com>
Date: Mon, 4 Oct 2010 09:11:52 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fedora/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e25e746460afc5ffe306847aca41ff4433c40f3;p=thirdparty%2Fglibc.git

Merge remote branch 'origin/master' into fedora/master
---

9e25e746460afc5ffe306847aca41ff4433c40f3
diff --cc ChangeLog
index 44886cf62f3,faf2befa24b..f8131b9bc08
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,45 +1,73 @@@
+ 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-09-28  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+ 
+ 	* sysdeps/sh/sh4/fpu/fpu_control.h: Add 'extern "C"' protection to
+ 	__set_fpscr.
+ 
+ 2010-09-30  Andreas Jaeger  <aj@suse.de>
+ 
+ 	* sysdeps/unix/sysv/linux_fsinfo.h (BTRFS_SUPER_MAGIC): Define.
+ 	(CGROUP_SUPER_MAGIC): Define.
+ 	* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
+ 	Handle btrfs and cgroup file systems.
+ 	* sysdeps/unix/sysv/linux/pathconf.c (__statfs_filesize_max):
+ 	Likewise.
+ 
+ 2010-09-27  Luis Machado  <luisgpm@br.ibm.com>
+ 
+ 	* sysdeps/powerpc/powerpc32/rtld-memset.c: New file.
+ 	* sysdeps/powerpc/powerpc64/rtld-memset.c: New file.
+ 
+ 2010-09-29  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+ 
+ 	[BZ #12067]
+ 	* sysdeps/s390/s390-32/elf/start.S: Fix address calculation when
+ 	trying to locate the ELF header.
+ 
+ 2010-09-27  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	[BZ #11611]
+ 	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
+ 	Mask out sign-bit copies when constructing f_fsid.
+ 
 +2010-09-28  Andreas Schwab  <schwab@redhat.com>
 +
 +	* elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
 +	before performing relro protection.
 +
 +2010-09-27  Andreas Schwab  <schwab@redhat.com>
 +
 +	* include/link.h (struct link_map): Add l_free_initfini.
 +	* elf/dl-deps.c (_dl_map_object_deps): Set it when assigning
 +	l_initfini.
 +	* elf/rtld.c (dl_main): Clear it on all objects loaded on startup.
 +	* elf/dl-libc.c (free_mem): Free l_initfini if l_free_initfini is
 +	set.
 +
 +	[BZ #11561]
 +	* posix/regcomp.c (parse_bracket_exp): When looking up collating
 +	elements compare against the byte sequence of it, not its name.
 +
 +	[BZ #6530]
 +	* stdio-common/vfprintf.c (process_string_arg): Revert 2000-07-22
 +	change.
 +
 +	* nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen
 +	as size_t.
 +
 +	* sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing
 +	backslash.
 +
  2010-09-24  Petr Baudis <pasky@suse.cz>
  
  	* debug/stack_chk_fail_local.c: Add missing licence exception.
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);