Merge commit 'glibc-2.12.2' into fedora/2.12/master

diff --cc ChangeLog
index b88252046231d7fd8abf42e1173e6e7a949f8596,afd9059b50e0297f6389fefd5644d772ca47415e..0b401f437578cf16c4fbc77c17e80aac8f1ae5c4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -18,6 -329,6 +329,11 @@@
        (do_preload): Use __RTLD_SECURE instead of is_preloaded.
        (dlmopen_doit): Add __RTLD_SECURE to mode bits.
  
++2010-12-13  Andreas Schwab  <schwab@redhat.com>
++
++      * elf/dl-object.c (_dl_new_object): Ignore origin of privileged
++      program.
++
  2010-10-06  Ulrich Drepper  <drepper@gmail.com>
  
        * string/bug-strstr1.c: New file.

diff --cc ChangeLog.17
Simple merge

diff --cc Makeconfig
Simple merge

diff --cc elf/dl-object.c
Simple merge

diff --cc elf/ldconfig.c
Simple merge

diff --cc malloc/mcheck.c
index 28210068ff9d8c9883f617b2696282c02038bc58,e2eb83f41db6d6347223f55a1327fd7c2addad71..01394acd9001e2b4d70979264255fe9364a7cd95
--- 1/malloc/mcheck.c
--- 2/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);

diff --cc nptl/ChangeLog
Simple merge

diff --cc nptl/Makefile
Simple merge

diff --cc posix/Makefile
Simple merge

diff --cc sysdeps/unix/sysv/linux/check_pf.c
Simple merge