[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4958 - in glibc-package/branches/glibc-branch-squeeze/debian/patches: . any



Author: aurel32
Date: 2011-09-08 10:37:07 +0000 (Thu, 08 Sep 2011)
New Revision: 4958

Modified:
   glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
   glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
Log:
Update from latest 2.11 SVN


Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff	2011-09-08 10:05:53 UTC (rev 4957)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-getaddrinfo-single-lookup.diff	2011-09-08 10:37:07 UTC (rev 4958)
@@ -4,35 +4,6 @@
 	* nscd/aicache.c (addhstaiX):  Restore only RES_USE_INET6
 	bit from old_res_options.
 
-2011-05-29  Ulrich Drepper  <drepper@gmail.com>
- 
-	[BZ #12350]
-	* sysdeps/posix/getaddrinfo.c (gethosts): Restore only RES_USE_IENT6
-	bit from old_res_options.
-	(gaih_inet): Likewise.
-
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 5ddda88..1e017b2 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -207,7 +207,7 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
-       if (herrno == NETDB_INTERNAL)					      \
- 	{								      \
- 	  __set_h_errno (herrno);					      \
--	  _res.options = old_res_options;				      \
-+	  _res.options |= old_res_options & RES_USE_INET6;		      \
- 	  return -EAI_SYSTEM;						      \
- 	}								      \
-       if (herrno == TRY_AGAIN)						      \
-@@ -1015,7 +1015,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 		nip = nip->next;
- 	    }
- 
--	  _res.options = old_res_options;
-+	  _res.options |= old_res_options & RES_USE_INET6;
- 
- 	  if (no_data != 0 && no_inet6_data != 0)
- 	    {
 diff --git a/nscd/aicache.c b/nscd/aicache.c
 index 3190a13..6c8d83a 100644
 --- a/nscd/aicache.c

Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff	2011-09-08 10:05:53 UTC (rev 4957)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff	2011-09-08 10:37:07 UTC (rev 4958)
@@ -1,7 +1,7 @@
 SVN update of svn://svn.eglibc.org/branches/eglibc-2_11 from revision 12231
 
---- a/stdlib/bug-getcontext.c	(revision 0)
-+++ b/stdlib/bug-getcontext.c	(revision 14920)
+--- a/stdlib/bug-getcontext.c	(révision 0)
++++ b/stdlib/bug-getcontext.c	(révision 15252)
 @@ -0,0 +1,48 @@
 +/* BZ 12420 */
 +
@@ -51,8 +51,8 @@
 +
 +#define TEST_FUNCTION do_test ()
 +#include "../test-skeleton.c"
---- a/stdlib/msort.c	(revision 12231)
-+++ b/stdlib/msort.c	(revision 14920)
+--- a/stdlib/msort.c	(révision 12231)
++++ b/stdlib/msort.c	(révision 15252)
 @@ -25,6 +25,7 @@
  #include <unistd.h>
  #include <memcopy.h>
@@ -80,8 +80,8 @@
  	  pagesize = __sysconf (_SC_PAGESIZE);
  	}
  
---- a/stdlib/Makefile	(revision 12231)
-+++ b/stdlib/Makefile	(revision 14920)
+--- a/stdlib/Makefile	(révision 12231)
++++ b/stdlib/Makefile	(révision 15252)
 @@ -1,4 +1,4 @@
 -# Copyright (C) 1991-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 +# Copyright (C) 1991-2009, 2011 Free Software Foundation, Inc.
@@ -108,8 +108,8 @@
 +link-libm = $(common-objpfx)math/libm.a
 +endif
 +$(objpfx)bug-getcontext: $(link-libm)
---- a/nscd/hstcache.c	(revision 12231)
-+++ b/nscd/hstcache.c	(revision 14920)
+--- a/nscd/hstcache.c	(révision 12231)
++++ b/nscd/hstcache.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Cache handling for host lookup.
 -   Copyright (C) 1998-2008, 2009 Free Software Foundation, Inc.
@@ -173,8 +173,8 @@
  	      errval = EAGAIN;
  	      break;
  	    }
---- a/libio/fmemopen.c	(revision 12231)
-+++ b/libio/fmemopen.c	(revision 14920)
+--- a/libio/fmemopen.c	(révision 12231)
++++ b/libio/fmemopen.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Fmemopen implementation.
 -   Copyright (C) 2000, 2002, 2005, 2006, 2008, 2009
@@ -191,9 +191,9 @@
  
    if (mode[0] == 'a')
      c->pos = c->maxpos;
---- a/libio/fileops.c	(revision 12231)
-+++ b/libio/fileops.c	(revision 14920)
-@@ -291,7 +299,7 @@
+--- a/libio/fileops.c	(révision 12231)
++++ b/libio/fileops.c	(révision 15252)
+@@ -291,7 +291,7 @@
  #ifdef _LIBC
    last_recognized = mode;
  #endif
@@ -202,7 +202,7 @@
      {
        switch (*++mode)
  	{
-@@ -1005,18 +1013,18 @@
+@@ -1005,18 +1005,18 @@
        /* Adjust for read-ahead (bytes is buffer). */
        offset -= fp->_IO_read_end - fp->_IO_read_ptr;
        if (fp->_offset == _IO_pos_BAD)
@@ -232,7 +232,7 @@
        /* Make offset absolute, assuming current pointer is file_ptr(). */
        offset += fp->_offset;
        if (offset < 0)
-@@ -1278,7 +1286,7 @@
+@@ -1278,7 +1278,7 @@
  	{
  	  f->_flags |= _IO_ERR_SEEN;
  	  break;
@@ -241,7 +241,7 @@
        to_do -= count;
        data = (void *) ((char *) data + count);
      }
-@@ -1366,12 +1374,12 @@
+@@ -1366,12 +1366,12 @@
        do_write = to_do - (block_size >= 128 ? to_do % block_size : 0);
  
        if (do_write)
@@ -256,8 +256,8 @@
  
        /* Now write out the remainder.  Normally, this will fit in the
  	 buffer, but it's somewhat messier for line-buffered files,
---- a/wcsmbs/bits/wchar2.h	(revision 12231)
-+++ b/wcsmbs/bits/wchar2.h	(revision 14920)
+--- a/wcsmbs/bits/wchar2.h	(révision 12231)
++++ b/wcsmbs/bits/wchar2.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Checking macros for wchar functions.
 -   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -382,8 +382,8 @@
  {
    /* We would have to include <limits.h> to get a definition of MB_LEN_MAX.
       But this would only disturb the namespace.  So we define our own
---- a/wcsmbs/wchar.h	(revision 12231)
-+++ b/wcsmbs/wchar.h	(revision 14920)
+--- a/wcsmbs/wchar.h	(révision 12231)
++++ b/wcsmbs/wchar.h	(révision 15252)
 @@ -319,8 +319,7 @@
  #endif
  
@@ -410,8 +410,8 @@
       __THROW;
  #endif	/* use GNU */
  
---- a/include/alloca.h	(revision 12231)
-+++ b/include/alloca.h	(revision 14920)
+--- a/include/alloca.h	(révision 12231)
++++ b/include/alloca.h	(révision 15252)
 @@ -14,6 +14,7 @@
  
  extern int __libc_use_alloca (size_t size) __attribute__ ((const));
@@ -420,28 +420,8 @@
  
  #define __MAX_ALLOCA_CUTOFF	65536
  
---- a/include/link.h	(revision 12231)
-+++ b/include/link.h	(revision 14920)
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2011 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -236,6 +236,9 @@
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
-+    /* The init and fini list generated at startup, saved when the
-+       object is also loaded dynamically.  */
-+    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
---- a/include/atomic.h	(revision 12231)
-+++ b/include/atomic.h	(revision 14920)
+--- a/include/atomic.h	(révision 12231)
++++ b/include/atomic.h	(révision 15252)
 @@ -33,7 +33,7 @@
       the multi-thread case.  The interfaces have the prefix
       "catomic_".
@@ -451,9 +431,35 @@
       "atomic_".
  
     Architectures must provide a few lowlevel macros (the compare
---- a/ChangeLog	(revision 12231)
-+++ b/ChangeLog	(revision 14920)
-@@ -1,3 +1,359 @@
+--- a/ChangeLog	(révision 12231)
++++ b/ChangeLog	(révision 15252)
+@@ -1,3 +1,369 @@
++2011-05-29  Ulrich Drepper  <drepper@gmail.com>
++
++	[BZ #12350]
++	* sysdeps/posix/getaddrinfo.c (gethosts): Restore only RES_USE_IENT6
++	bit from old_res_options.
++	(gaih_inet): Likewise.
++
++2011-05-28  Ulrich Drepper  <drepper@gmail.com>
++
++	[BZ #12811]
++	* posix/regex_internal.c (build_wcs_buffer): Don't signal we have to
++	grow the buffers more if it already has to be sufficient.
++	(build_wcs_upper_buffer): Likewise.
++	* posix/regexec.c (check_matching): Likewise.
++	(clean_state_log_if_needed): Likewise.
++	(extend_buffers): Don't enlarge buffers beyond size of the input
++	buffer.
++	Patches mostly by Emil Wojak <emil@wojak.eu>.
++	* posix/bug-regex32.c: New file.
++	* posix/Makefile (tests): Add bug-regex32.
++
++2011-05-14  Ulrich Drepper  <drepper@gmail.com>
++
++	* iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before
++	storing incomplete byte sequence in state object.
++
 +2011-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	[BZ #12775]
@@ -478,6 +484,8 @@
 +	* sysdeps/pthread/aio_misc.c (__aio_init): Compute optim.aio_num
 +	correctly.
 +
++	* libio/fileops.c (_IO_new_file_close_it): Initialize write_status.
++
 +	* iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before
 +	storing incomplete byte sequence in state object.  Avoid testing for
 +	guaranteed too small input if we know there is enough data available.
@@ -619,24 +627,6 @@
 +
 +	* libio/fmemopen.c (fmemopen): Don't read past end of buffer.
 +
-+2011-02-23  Andreas Schwab  <schwab@redhat.com>
-+	    Ulrich Drepper  <drepper@gmail.com>
-+
-+	[BZ #12509]
-+	* include/link.h (struct link_map): Add l_orig_initfini.
-+	* elf/dl-load.c (_dl_map_object_from_fd): Free realname before
-+	returning unsuccessfully.
-+	* elf/dl-close.c (_dl_close_worker): If this is the last explicit
-+	close of a file loaded at startup, restore the original l_initfini
-+	list.
-+	* elf/dl-deps.c (_dl_map_object_deps): Don't free old l_initfini
-+	list, store the pointer.
-+	* elf/Makefile ($(objpfx)noload-mem): New rule.
-+	(noload-ENV): Define.
-+	(tests): Add $(objpfx)noload-mem.
-+	* elf/noload.c: Include <memcheck.h>.
-+	(main): Call mtrace.  Close all opened handles.
-+
 +2011-02-17  Andreas Schwab  <schwab@redhat.com>
 +
 +	[BZ #12454]
@@ -813,8 +803,8 @@
  2010-05-31  Petr Baudis  <pasky@suse.cz>
  
  	[BZ #11149]
---- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S	(revision 12231)
-+++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S	(revision 14920)
+--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S	(révision 12231)
++++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S	(révision 15252)
 @@ -1,5 +1,5 @@
  /* isnanf().  PowerPC32 version.
 -   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -832,8 +822,8 @@
  hidden_def (__isnanf)
  weak_alias (__isnanf, isnanf)
 -
---- a/sysdeps/powerpc/dl-tls.h	(revision 12231)
-+++ b/sysdeps/powerpc/dl-tls.h	(revision 14920)
+--- a/sysdeps/powerpc/dl-tls.h	(révision 12231)
++++ b/sysdeps/powerpc/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  PowerPC version.
 -   Copyright (C) 2003 Free Software Foundation, Inc.
@@ -848,8 +838,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/unix/sysv/linux/s390/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/s390/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/s390 version.
 -   Copyright (C) 2000-2003,2005,2006,2009 Free Software Foundation, Inc.
@@ -866,13 +856,13 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c	(révision 15252)
 @@ -1 +1 @@
 -#include "../../fxstat.c"
 +#include "../../i386/fxstat.c"
---- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/SPARC version.
 -   Copyright (C) 1997,1999,2000,2003,2005,2006,2009
@@ -889,8 +879,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* System-specific socket constants and types.  Linux/SPARC version.
 -   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
@@ -929,8 +919,8 @@
  #define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
    };
  
---- a/sysdeps/unix/sysv/linux/i386/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/i386/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/i386 version.
 -   Copyright (C) 1997,2000,2003,2005,2006,2009,2010
@@ -947,8 +937,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h	(révision 15252)
 @@ -172,7 +172,7 @@
         : "r9", "r10", "r11", "r12",					\
           "cr0", "ctr", "lr", "memory");					\
@@ -967,8 +957,8 @@
    })
  #define INTERNAL_SYSCALL(name, err, nr, args...)			\
    INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, args)
---- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/PowerPC version.
 -   Copyright (C) 1997,2000,2003,2005,2006,2008,2009
@@ -985,8 +975,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/mkdirat.c	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/mkdirat.c	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/mkdirat.c	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/mkdirat.c	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
 +/* Copyright (C) 2005, 2006, 2009, 2011 Free Software Foundation, Inc.
@@ -1002,8 +992,8 @@
  	__have_atfcts = -1;
        else
  # endif
---- a/sysdeps/unix/sysv/linux/bits/socket.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/bits/socket.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/bits/socket.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/bits/socket.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* System-specific socket constants and types.  Linux version.
 -   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
@@ -1031,8 +1021,8 @@
  #define	AF_MAX		PF_MAX
  
  /* Socket level values.  Others are defined in the appropriate headers.
---- a/sysdeps/unix/sysv/linux/sh/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/sh/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/SH version.
 -   Copyright (C) 1997,1999,2000,2003,2005,2006,2009
@@ -1049,8 +1039,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/x86_64/getcontext.S	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/x86_64/getcontext.S	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/x86_64/getcontext.S	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/x86_64/getcontext.S	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Save current context.
 -   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -1066,8 +1056,8 @@
  	stmxcsr oMXCSR(%rdi)
  
  	/* Save the current signal mask with
---- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2001,2004,2005,2006,2009,2010 Free Software Foundation, Inc.
 +/* Copyright (C) 2001,2004,2005,2006,2009,2010,2011 Free Software Foundation, Inc.
@@ -1108,8 +1098,8 @@
  /* Jump to the position specified by ENV, causing the
     setjmp call there to return VAL, or 1 if VAL is 0.
     void __longjmp (__jmp_buf env, int val).  */
---- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h	(révision 15252)
 @@ -1,5 +1,6 @@
  /* Definitions for POSIX memory map interface.  Linux/x86_64 version.
 -   Copyright (C) 2001,2003,2005,2006,2009,2010 Free Software Foundation, Inc.
@@ -1127,8 +1117,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/ia64/bits/mman.h	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/ia64/bits/mman.h	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/ia64/bits/mman.h	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/ia64/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/ia64 version.
 -   Copyright (C) 1997,1998,2000,2003,2005,2006,2009
@@ -1145,16 +1135,16 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c	(revision 14920)
+--- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c	(révision 12231)
++++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c	(révision 15252)
 @@ -1,4 +1,5 @@
  #define readdir64_r __no_readdir64_r_decl
 +#define GETDENTS_64BIT_ALIGNED 1
  #include <sysdeps/unix/readdir_r.c>
  #undef readdir64_r
  weak_alias (__readdir_r, readdir64_r)
---- a/sysdeps/unix/readdir_r.c	(revision 12231)
-+++ b/sysdeps/unix/readdir_r.c	(revision 14920)
+--- a/sysdeps/unix/readdir_r.c	(révision 12231)
++++ b/sysdeps/unix/readdir_r.c	(révision 15252)
 @@ -117,7 +117,8 @@
  #ifdef GETDENTS_64BIT_ALIGNED
        /* The d_reclen value might include padding which is not part of
@@ -1165,8 +1155,8 @@
  #endif
        *result = memcpy (entry, dp, reclen);
  #ifdef GETDENTS_64BIT_ALIGNED
---- a/sysdeps/pthread/aio_misc.c	(revision 12231)
-+++ b/sysdeps/pthread/aio_misc.c	(revision 14920)
+--- a/sysdeps/pthread/aio_misc.c	(révision 12231)
++++ b/sysdeps/pthread/aio_misc.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Handle general operations.
 -   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2009
@@ -1203,8 +1193,8 @@
      }
  
    if (init->aio_idle_time != 0)
---- a/sysdeps/i386/dl-tls.h	(revision 12231)
-+++ b/sysdeps/i386/dl-tls.h	(revision 14920)
+--- a/sysdeps/i386/dl-tls.h	(révision 12231)
++++ b/sysdeps/i386/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  i386 version.
 -   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
@@ -1219,8 +1209,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/i386/Makefile	(revision 12231)
-+++ b/sysdeps/i386/Makefile	(revision 14920)
+--- a/sysdeps/i386/Makefile	(révision 12231)
++++ b/sysdeps/i386/Makefile	(révision 15252)
 @@ -51,6 +51,7 @@
  # And a couple of other routines
  ifeq ($(subdir),stdlib)
@@ -1229,8 +1219,8 @@
  endif
  ifeq ($(subdir),elf)
  CFLAGS-dl-init.c += -mpreferred-stack-boundary=4
---- a/sysdeps/i386/fpu/libm-test-ulps	(revision 12231)
-+++ b/sysdeps/i386/fpu/libm-test-ulps	(revision 14920)
+--- a/sysdeps/i386/fpu/libm-test-ulps	(révision 12231)
++++ b/sysdeps/i386/fpu/libm-test-ulps	(révision 15252)
 @@ -857,8 +857,8 @@
  ildouble: 2
  ldouble: 2
@@ -1242,8 +1232,8 @@
  ildouble: 4
  ldouble: 4
  Test "yn (10, 1.0) == -121618014.278689189288130426667971145":
---- a/sysdeps/wordsize-64/tst-writev.c	(revision 0)
-+++ b/sysdeps/wordsize-64/tst-writev.c	(revision 14920)
+--- a/sysdeps/wordsize-64/tst-writev.c	(révision 0)
++++ b/sysdeps/wordsize-64/tst-writev.c	(révision 15252)
 @@ -0,0 +1,107 @@
 +/* Copyright (C) 2011 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -1352,8 +1342,8 @@
 +
 +#define TEST_FUNCTION do_test ()
 +#include "../test-skeleton.c"
---- a/sysdeps/s390/dl-tls.h	(revision 12231)
-+++ b/sysdeps/s390/dl-tls.h	(revision 14920)
+--- a/sysdeps/s390/dl-tls.h	(révision 12231)
++++ b/sysdeps/s390/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  s390 version.
 -   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
@@ -1372,8 +1362,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/x86_64/dl-tls.h	(revision 12231)
-+++ b/sysdeps/x86_64/dl-tls.h	(revision 14920)
+--- a/sysdeps/x86_64/dl-tls.h	(révision 12231)
++++ b/sysdeps/x86_64/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  x86-64 version.
 -   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -1388,8 +1378,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/x86_64/fpu/e_powl.S	(revision 12231)
-+++ b/sysdeps/x86_64/fpu/e_powl.S	(revision 14920)
+--- a/sysdeps/x86_64/fpu/e_powl.S	(révision 12231)
++++ b/sysdeps/x86_64/fpu/e_powl.S	(révision 15252)
 @@ -1,5 +1,5 @@
  /* ix87 specific implementation of pow function.
 -   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007
@@ -1406,8 +1396,8 @@
  	jz	7f
  	fsub	%st(1)		// x-1 : 1.0 : y
  	fyl2xp1			// log2(x) : y
---- a/sysdeps/posix/spawni.c	(revision 12231)
-+++ b/sysdeps/posix/spawni.c	(revision 14920)
+--- a/sysdeps/posix/spawni.c	(révision 12231)
++++ b/sysdeps/posix/spawni.c	(révision 15252)
 @@ -142,9 +142,7 @@
      }
    else if ((flags & POSIX_SPAWN_SETSCHEDULER) != 0)
@@ -1419,8 +1409,26 @@
  	_exit (SPAWN_ERROR);
      }
  #endif
---- a/sysdeps/posix/getaddrinfo.c	(revision 12231)
-+++ b/sysdeps/posix/getaddrinfo.c	(revision 14920)
+--- a/sysdeps/posix/getaddrinfo.c	(révision 12231)
++++ b/sysdeps/posix/getaddrinfo.c	(révision 15252)
+@@ -207,7 +207,7 @@
+       if (herrno == NETDB_INTERNAL)					      \
+ 	{								      \
+ 	  __set_h_errno (herrno);					      \
+-	  _res.options = old_res_options;				      \
++	  _res.options |= old_res_options & RES_USE_INET6;		      \
+ 	  return -EAI_SYSTEM;						      \
+ 	}								      \
+       if (herrno == TRY_AGAIN)						      \
+@@ -842,7 +842,7 @@
+ 		nip = nip->next;
+ 	    }
+ 
+-	  _res.options = old_res_options;
++	  _res.options |= old_res_options & RES_USE_INET6;
+ 
+ 	  if (no_data != 0 && no_inet6_data != 0)
+ 	    {
 @@ -963,6 +963,7 @@
  		   make a copy.  */
  		if (out == canon)
@@ -1429,8 +1437,8 @@
  	      }
  	    else
  #endif
---- a/sysdeps/ia64/dl-tls.h	(revision 12231)
-+++ b/sysdeps/ia64/dl-tls.h	(revision 14920)
+--- a/sysdeps/ia64/dl-tls.h	(révision 12231)
++++ b/sysdeps/ia64/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  IA-64 version.
 -   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
@@ -1445,8 +1453,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/mach/hurd/ifreq.h	(revision 0)
-+++ b/sysdeps/mach/hurd/ifreq.h	(revision 14920)
+--- a/sysdeps/mach/hurd/ifreq.h	(révision 0)
++++ b/sysdeps/mach/hurd/ifreq.h	(révision 15252)
 @@ -0,0 +1,45 @@
 +/* Copyright (C) 1999, 2002, 2003, 2011 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -1493,8 +1501,8 @@
 +{
 +  munmap (ifreqs, num_ifs * sizeof (struct ifreq));
 +}
---- a/sysdeps/sparc/dl-tls.h	(revision 12231)
-+++ b/sysdeps/sparc/dl-tls.h	(revision 14920)
+--- a/sysdeps/sparc/dl-tls.h	(révision 12231)
++++ b/sysdeps/sparc/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  SPARC version.
 -   Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1509,8 +1517,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/sysdeps/sh/dl-tls.h	(revision 12231)
-+++ b/sysdeps/sh/dl-tls.h	(revision 14920)
+--- a/sysdeps/sh/dl-tls.h	(révision 12231)
++++ b/sysdeps/sh/dl-tls.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  SH version.
 -   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1525,8 +1533,8 @@
 +
 +/* Value used for dtv entries for which the allocation is delayed.  */
 +#define TLS_DTV_UNALLOCATED	((void *) -1l)
---- a/misc/mntent_r.c	(revision 12231)
-+++ b/misc/mntent_r.c	(revision 14920)
+--- a/misc/mntent_r.c	(révision 12231)
++++ b/misc/mntent_r.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Utilities for reading/writing fstab, mtab, etc.
 -   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010
@@ -1545,8 +1553,8 @@
  }
  weak_alias (__addmntent, addmntent)
  
---- a/misc/error.c	(revision 12231)
-+++ b/misc/error.c	(revision 14920)
+--- a/misc/error.c	(révision 12231)
++++ b/misc/error.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Error handler for noninteractive utilities
 -   Copyright (C) 1990-1998, 2000-2005, 2006 Free Software Foundation, Inc.
@@ -1565,8 +1573,8 @@
  	/* Simply return and print nothing.  */
  	return;
  
---- a/inet/getnameinfo.c	(revision 12231)
-+++ b/inet/getnameinfo.c	(revision 14920)
+--- a/inet/getnameinfo.c	(révision 12231)
++++ b/inet/getnameinfo.c	(révision 15252)
 @@ -159,7 +159,7 @@
  int
  getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
@@ -1585,8 +1593,8 @@
      }
  
    if (serv && (servlen > 0))
---- a/nss/nss_files/files-hosts.c	(revision 12231)
-+++ b/nss/nss_files/files-hosts.c	(revision 14920)
+--- a/nss/nss_files/files-hosts.c	(révision 12231)
++++ b/nss/nss_files/files-hosts.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Hosts file parser in nss_files module.
 -   Copyright (C) 1996-2001, 2003-2008, 2009 Free Software Foundation, Inc.
@@ -1693,8 +1701,8 @@
  	}								      \
  									      \
  									      \
---- a/string/bits/string3.h	(revision 12231)
-+++ b/string/bits/string3.h	(revision 14920)
+--- a/string/bits/string3.h	(révision 12231)
++++ b/string/bits/string3.h	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 +/* Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
@@ -1721,8 +1729,8 @@
  {
    (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
  }
---- a/iconv/loop.c	(revision 12231)
-+++ b/iconv/loop.c	(revision 14920)
+--- a/iconv/loop.c	(révision 12231)
++++ b/iconv/loop.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Conversion loop frame work.
 -   Copyright (C) 1998-2002, 2003, 2005, 2008 Free Software Foundation, Inc.
@@ -1740,8 +1748,8 @@
        inptr = bytebuf;
        inptrp = &inptr;
        inend = &bytebuf[inlen];
---- a/math/test-powl.c	(revision 0)
-+++ b/math/test-powl.c	(revision 14920)
+--- a/math/test-powl.c	(révision 0)
++++ b/math/test-powl.c	(révision 15252)
 @@ -0,0 +1,51 @@
 +/* Test for powl
 +   Copyright (C) 2011 Free Software Foundation, Inc.
@@ -1794,8 +1802,8 @@
 +
 +  return result;
 +}
---- a/math/Makefile	(revision 12231)
-+++ b/math/Makefile	(revision 14920)
+--- a/math/Makefile	(révision 12231)
++++ b/math/Makefile	(révision 15252)
 @@ -92,7 +92,8 @@
  # Rules for the test suite.
  tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
@@ -1814,8 +1822,8 @@
  CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
  			 -DTEST_FAST_MATH -fno-builtin
  CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
---- a/malloc/malloc.c	(revision 12231)
-+++ b/malloc/malloc.c	(revision 14920)
+--- a/malloc/malloc.c	(révision 12231)
++++ b/malloc/malloc.c	(révision 15252)
 @@ -2832,7 +2832,7 @@
    max_fast_bin = fastbin_index(get_max_fast ());
  
@@ -1825,8 +1833,8 @@
  
      /* The following test can only be performed for the main arena.
         While mallopt calls malloc_consolidate to get rid of all fast
---- a/nptl/ChangeLog	(revision 12231)
-+++ b/nptl/ChangeLog	(revision 14920)
+--- a/nptl/ChangeLog	(révision 12231)
++++ b/nptl/ChangeLog	(révision 15252)
 @@ -1,3 +1,21 @@
 +2011-05-11  Ulrich Drepper  <drepper@gmail.com>
 +
@@ -1849,8 +1857,8 @@
  2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
  
  	* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.
---- a/nptl/alloca_cutoff.c	(revision 12231)
-+++ b/nptl/alloca_cutoff.c	(revision 14920)
+--- a/nptl/alloca_cutoff.c	(révision 12231)
++++ b/nptl/alloca_cutoff.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Determine whether block of given size can be allocated on the stack or not.
 -   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1863,8 +1871,8 @@
  		       ?: __MAX_ALLOCA_CUTOFF * 4));
  }
 +libc_hidden_def (__libc_alloca_cutoff)
---- a/nptl/allocatestack.c	(revision 12231)
-+++ b/nptl/allocatestack.c	(revision 14920)
+--- a/nptl/allocatestack.c	(révision 12231)
++++ b/nptl/allocatestack.c	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc.
 +/* Copyright (C) 2002-2007, 2009, 2011 Free Software Foundation, Inc.
@@ -1899,8 +1907,8 @@
  
  	      lll_lock (stack_cache_lock, LLL_PRIVATE);
  
---- a/nptl/Versions	(revision 12231)
-+++ b/nptl/Versions	(revision 14920)
+--- a/nptl/Versions	(révision 12231)
++++ b/nptl/Versions	(révision 15252)
 @@ -27,6 +27,7 @@
      pthread_cond_broadcast; pthread_cond_timedwait;
    }
@@ -1909,8 +1917,8 @@
      # Internal libc interface to libpthread
      __libc_dl_error_tsd;
    }
---- a/login/programs/pt_chown.c	(revision 12231)
-+++ b/login/programs/pt_chown.c	(revision 14920)
+--- a/login/programs/pt_chown.c	(révision 12231)
++++ b/login/programs/pt_chown.c	(révision 15252)
 @@ -64,7 +64,7 @@
  Copyright (C) %s Free Software Foundation, Inc.\n\
  This is free software; see the source for copying conditions.  There is NO\n\
@@ -1929,8 +1937,8 @@
      return FAIL_EACCES;
  
    /* Set the permission mode to readable and writable by the owner,
---- a/shadow/sgetspent.c	(revision 12231)
-+++ b/shadow/sgetspent.c	(revision 14920)
+--- a/shadow/sgetspent.c	(révision 12231)
++++ b/shadow/sgetspent.c	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 +/* Copyright (C) 1996, 1997, 2011 Free Software Foundation, Inc.
@@ -1948,10 +1956,103 @@
      {
        char *new_buf;
        buffer_size += BUFLEN_SPWD;
---- a/posix/regexec.c	(revision 12231)
-+++ b/posix/regexec.c	(revision 14920)
-@@ -3333,6 +3333,8 @@
+--- a/posix/regex_internal.c	(révision 12231)
++++ b/posix/regex_internal.c	(révision 15252)
+@@ -237,14 +237,9 @@
+       else
+ 	p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
+       mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
+-      if (BE (mbclen == (size_t) -2, 0))
++      if (BE (mbclen == (size_t) -1 || mbclen == 0
++	      || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len), 0))
  	{
+-	  /* The buffer doesn't have enough space, finish to build.  */
+-	  pstr->cur_state = prev_st;
+-	  break;
+-	}
+-      else if (BE (mbclen == (size_t) -1 || mbclen == 0, 0))
+-	{
+ 	  /* We treat these cases as a singlebyte character.  */
+ 	  mbclen = 1;
+ 	  wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+@@ -252,6 +247,12 @@
+ 	    wc = pstr->trans[wc];
+ 	  pstr->cur_state = prev_st;
+ 	}
++      else if (BE (mbclen == (size_t) -2, 0))
++	{
++	  /* The buffer doesn't have enough space, finish to build.  */
++	  pstr->cur_state = prev_st;
++	  break;
++	}
+ 
+       /* Write wide character and padding.  */
+       pstr->wcs[byte_idx++] = wc;
+@@ -334,9 +335,11 @@
+ 	      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+ 		pstr->wcs[byte_idx++] = WEOF;
+ 	    }
+-	  else if (mbclen == (size_t) -1 || mbclen == 0)
++	  else if (mbclen == (size_t) -1 || mbclen == 0
++		   || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+ 	    {
+-	      /* It is an invalid character or '\0'.  Just use the byte.  */
++	      /* It is an invalid character, an incomplete character
++		 at the end of the string, or '\0'.  Just use the byte.  */
+ 	      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+ 	      pstr->mbs[byte_idx] = ch;
+ 	      /* And also cast it to wide char.  */
+@@ -449,7 +452,8 @@
+ 	    for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+ 	      pstr->wcs[byte_idx++] = WEOF;
+ 	  }
+-	else if (mbclen == (size_t) -1 || mbclen == 0)
++	else if (mbclen == (size_t) -1 || mbclen == 0
++		 || (mbclen == (size_t) -2 && pstr->bufs_len >= pstr->len))
+ 	  {
+ 	    /* It is an invalid character or '\0'.  Just use the byte.  */
+ 	    int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
+--- a/posix/regexec.c	(révision 12231)
++++ b/posix/regexec.c	(révision 15252)
+@@ -1,5 +1,5 @@
+ /* Extended regular expression matching and search library.
+-   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
++   Copyright (C) 2002-2005,2007,2009,2010,2011 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+ 
+@@ -1120,12 +1120,13 @@
+       re_dfastate_t *old_state = cur_state;
+       int next_char_idx = re_string_cur_idx (&mctx->input) + 1;
+ 
+-      if (BE (next_char_idx >= mctx->input.bufs_len, 0)
+-          || (BE (next_char_idx >= mctx->input.valid_len, 0)
+-              && mctx->input.valid_len < mctx->input.len))
+-        {
+-          err = extend_buffers (mctx);
+-          if (BE (err != REG_NOERROR, 0))
++      if ((BE (next_char_idx >= mctx->input.bufs_len, 0)
++	   && mctx->input.bufs_len < mctx->input.len)
++	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
++	      && mctx->input.valid_len < mctx->input.len))
++	{
++	  err = extend_buffers (mctx);
++	  if (BE (err != REG_NOERROR, 0))
+ 	    {
+ 	      assert (err == REG_ESPACE);
+ 	      return -2;
+@@ -1696,7 +1697,8 @@
+ {
+   int top = mctx->state_log_top;
+ 
+-  if (next_state_log_idx >= mctx->input.bufs_len
++  if ((next_state_log_idx >= mctx->input.bufs_len
++       && mctx->input.bufs_len < mctx->input.len)
+       || (next_state_log_idx >= mctx->input.valid_len
+ 	  && mctx->input.valid_len < mctx->input.len))
+     {
+@@ -3333,6 +3335,8 @@
+ 	{
  	  state->trtable = (re_dfastate_t **)
  	    calloc (sizeof (re_dfastate_t *), SBC_MAX);
 +	  if (BE (state->trtable == NULL, 0))
@@ -1959,8 +2060,67 @@
  	  return 1;
  	}
        return 0;
---- a/posix/fnmatch.c	(revision 12231)
-+++ b/posix/fnmatch.c	(revision 14920)
+@@ -4066,7 +4070,7 @@
+   re_string_t *pstr = &mctx->input;
+ 
+   /* Double the lengthes of the buffers.  */
+-  ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
++  ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
+   if (BE (ret != REG_NOERROR, 0))
+     return ret;
+ 
+--- a/posix/Makefile	(révision 12231)
++++ b/posix/Makefile	(révision 15252)
+@@ -106,7 +106,7 @@
+ 		   tst-fnmatch2 tst-cpucount tst-cpuset
+ tests-$(OPTION_EGLIBC_LOCALE_CODE)					    \
+ 		+= tst-fnmatch tst-regexloc bug-regex1 bug-regex5 \
+-		   bug-regex23 bug-regex25
++		   bug-regex23 bug-regex25 bug-regex32
+ tests-$(OPTION_EGLIBC_INET) \
+ 	        += tst-getaddrinfo bug-ga1 tst-getaddrinfo2 \
+ 		   tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 tst-getaddrinfo3
+--- a/posix/bug-regex32.c	(révision 0)
++++ b/posix/bug-regex32.c	(révision 15252)
+@@ -0,0 +1,36 @@
++// BZ 12811
++#include <regex.h>
++#include <stdio.h>
++#include <locale.h>
++
++static int
++do_test (void)
++{
++  char buf[1000];
++  regex_t preg;
++  if (setlocale (LC_CTYPE, "de_DE.UTF-8") == NULL)
++    {
++      puts ("setlocale failed");
++      return 1;
++    }
++
++  int e = regcomp (&preg, ".*ab", REG_ICASE);
++  if (e != 0)
++    {
++      regerror (e, &preg, buf, sizeof (buf));
++      printf ("regcomp = %d \"%s\"\n", e, buf);
++      return 1;
++    }
++
++  // Incomplete character at the end of the buffer
++  e = regexec (&preg, "aaaaaaaaaaaa\xc4", 0, NULL, 0);
++
++  regfree (&preg);
++  regerror (e, &preg, buf, sizeof (buf));
++  printf ("regexec = %d \"%s\"\n", e, buf);
++
++  return e != REG_NOMATCH;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+--- a/posix/fnmatch.c	(révision 12231)
++++ b/posix/fnmatch.c	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010
 +/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010,2011
@@ -1992,8 +2152,8 @@
  
  	  wstring_malloc = wstring
  	    = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));
---- a/stdio-common/printf_fp.c	(revision 12231)
-+++ b/stdio-common/printf_fp.c	(revision 14920)
+--- a/stdio-common/printf_fp.c	(révision 12231)
++++ b/stdio-common/printf_fp.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Floating point output for `printf'.
 -   Copyright (C) 1995-2003, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -2051,8 +2211,8 @@
  
        PRINT (tmpptr, wstartp, wide ? wcp - wstartp : cp - tmpptr);
  
---- a/stdio-common/tst-grouping.c	(revision 0)
-+++ b/stdio-common/tst-grouping.c	(revision 14920)
+--- a/stdio-common/tst-grouping.c	(révision 0)
++++ b/stdio-common/tst-grouping.c	(révision 15252)
 @@ -0,0 +1,83 @@
 +/* BZ 12394, test by Bruno Haible.  */
 +#include <locale.h>
@@ -2137,8 +2297,8 @@
 +
 +#define TEST_FUNCTION do_test ()
 +#include "../test-skeleton.c"
---- a/stdio-common/_i18n_number.h	(revision 12231)
-+++ b/stdio-common/_i18n_number.h	(revision 14920)
+--- a/stdio-common/_i18n_number.h	(révision 12231)
++++ b/stdio-common/_i18n_number.h	(révision 15252)
 @@ -33,8 +33,8 @@
  # define decimal NULL
  # define thousands NULL
@@ -2172,8 +2332,8 @@
      }
  #endif
  
---- a/stdio-common/bug23.c	(revision 0)
-+++ b/stdio-common/bug23.c	(revision 14920)
+--- a/stdio-common/bug23.c	(révision 0)
++++ b/stdio-common/bug23.c	(révision 15252)
 @@ -0,0 +1,21 @@
 +#include <stdio.h>
 +#include <string.h>
@@ -2196,8 +2356,8 @@
 +
 +#define TEST_FUNCTION do_test ()
 +#include "../test-skeleton.c"
---- a/stdio-common/Makefile	(revision 12231)
-+++ b/stdio-common/Makefile	(revision 14920)
+--- a/stdio-common/Makefile	(révision 12231)
++++ b/stdio-common/Makefile	(révision 15252)
 @@ -1,4 +1,4 @@
 -# Copyright (C) 1991-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 +# Copyright (C) 1991-2009, 2011 Free Software Foundation, Inc.
@@ -2224,8 +2384,8 @@
  
  ifneq (,$(filter %REENTRANT, $(defines)))
  CPPFLAGS += -D_IO_MTSAFE_IO
---- a/stdio-common/vfprintf.c	(revision 12231)
-+++ b/stdio-common/vfprintf.c	(revision 14920)
+--- a/stdio-common/vfprintf.c	(révision 12231)
++++ b/stdio-common/vfprintf.c	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1991-2008, 2009   Free Software Foundation, Inc.
 +/* Copyright (C) 1991-2008, 2009, 2011   Free Software Foundation, Inc.
@@ -2242,8 +2402,8 @@
  
  	    /* Copy the old array's elements to the new space.  */
  	    memmove (specs, old, nspecs * sizeof (struct printf_spec));
---- a/stdio-common/printf-parsemb.c	(revision 12231)
-+++ b/stdio-common/printf-parsemb.c	(revision 14920)
+--- a/stdio-common/printf-parsemb.c	(révision 12231)
++++ b/stdio-common/printf-parsemb.c	(révision 15252)
 @@ -295,9 +295,9 @@
        /* We don't try to get the types for all arguments if the format
  	 uses more than one.  The normal case is covered though.  If
@@ -2257,8 +2417,8 @@
      {
        /* Find the data argument types of a built-in spec.  */
        spec->ndata_args = 1;
---- a/resolv/res_debug.c	(revision 12231)
-+++ b/resolv/res_debug.c	(revision 14920)
+--- a/resolv/res_debug.c	(révision 12231)
++++ b/resolv/res_debug.c	(révision 15252)
 @@ -189,7 +189,7 @@
  						buf = malloc(buflen += 1024);
  					if (buf == NULL) {
@@ -2285,8 +2445,8 @@
  				/* XXX nonreentrant */
  	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
  				return (nbuf);
---- a/resolv/netdb.h	(revision 12231)
-+++ b/resolv/netdb.h	(revision 14920)
+--- a/resolv/netdb.h	(révision 12231)
++++ b/resolv/netdb.h	(révision 15252)
 @@ -1,4 +1,4 @@
 -  /* Copyright (C) 1996-2002, 2003, 2004, 2009 Free Software Foundation, Inc.
 +  /* Copyright (C) 1996-2004, 2009, 2011 Free Software Foundation, Inc.
@@ -2302,8 +2462,8 @@
  #endif	/* POSIX */
  
  #ifdef __USE_GNU
---- a/resolv/res_init.c	(revision 12231)
-+++ b/resolv/res_init.c	(revision 14920)
+--- a/resolv/res_init.c	(révision 12231)
++++ b/resolv/res_init.c	(révision 15252)
 @@ -545,6 +545,11 @@
  		} else if (!strncmp(cp, "single-request",
  				    sizeof("single-request") - 1)) {
@@ -2316,8 +2476,8 @@
  		} else {
  			/* XXX - print a warning here? */
  		}
---- a/resolv/res_query.c	(revision 12231)
-+++ b/resolv/res_query.c	(revision 14920)
+--- a/resolv/res_query.c	(révision 12231)
++++ b/resolv/res_query.c	(révision 15252)
 @@ -123,7 +123,7 @@
  {
  	HEADER *hp = (HEADER *) answer;
@@ -2368,8 +2528,8 @@
  		ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
  					      answer, anslen, answerp,
  					      answerp2, nanswerp2, resplen2);
---- a/resolv/resolv.h	(revision 12231)
-+++ b/resolv/resolv.h	(revision 14920)
+--- a/resolv/resolv.h	(révision 12231)
++++ b/resolv/resolv.h	(révision 15252)
 @@ -102,7 +102,7 @@
  # define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
  
@@ -2388,8 +2548,8 @@
  
  #define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
  
---- a/resolv/nss_dns/dns-host.c	(revision 12231)
-+++ b/resolv/nss_dns/dns-host.c	(revision 14920)
+--- a/resolv/nss_dns/dns-host.c	(révision 12231)
++++ b/resolv/nss_dns/dns-host.c	(révision 15252)
 @@ -599,7 +599,6 @@
    int (*name_ok) (const char *);
    u_char packtmp[NS_MAXCDNAME];
@@ -2425,8 +2585,8 @@
  	    *ttlp = ttl;
  
  	  (*pat)->name = canon ?: h_name;
---- a/conform/data/netdb.h-data	(revision 12231)
-+++ b/conform/data/netdb.h-data	(revision 14920)
+--- a/conform/data/netdb.h-data	(révision 12231)
++++ b/conform/data/netdb.h-data	(révision 15252)
 @@ -87,7 +87,7 @@
  function {struct hostent*} gethostbyaddr (const void*, socklen_t, int)
  function {struct hostent*} gethostbyname (const char*)
@@ -2436,8 +2596,8 @@
  function {struct netent*} getnetbyaddr (uint32_t, int)
  function {struct netent*} getnetbyname (const char*)
  function {struct netent*} getnetent (void)
---- a/elf/dl-tls.c	(revision 12231)
-+++ b/elf/dl-tls.c	(revision 14920)
+--- a/elf/dl-tls.c	(révision 12231)
++++ b/elf/dl-tls.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Thread-local storage handling in the ELF dynamic linker.  Generic version.
 -   Copyright (C) 2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
@@ -2456,121 +2616,8 @@
  /* Out-of-memory handler.  */
  #ifdef SHARED
  static void
---- a/elf/Makefile	(revision 12231)
-+++ b/elf/Makefile	(revision 14920)
-@@ -210,7 +210,7 @@
- ifeq (yesyes,$(have-fpie)$(build-shared))
- tests: $(objpfx)tst-pie1.out
- endif
--tests: $(objpfx)tst-leaks1-mem
-+tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-mem
- tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
- tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
- modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
-@@ -664,6 +664,10 @@
- LDFLAGS-noload = -rdynamic
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
-+$(objpfx)noload-mem: $(objpfx)noload.out
-+	$(common-objpfx)malloc/mtrace $(objpfx)noload.mtrace > $@
-+noload-ENV = MALLOC_TRACE=$(objpfx)noload.mtrace
-+
- LDFLAGS-nodelete = -rdynamic
- LDFLAGS-nodelmod1.so = -Wl,--enable-new-dtags,-z,nodelete
- LDFLAGS-nodelmod4.so = -Wl,--enable-new-dtags,-z,nodelete
---- a/elf/noload.c	(revision 12231)
-+++ b/elf/noload.c	(revision 14920)
-@@ -1,20 +1,28 @@
- #include <dlfcn.h>
- #include <stdio.h>
-+#include <mcheck.h>
- 
- int
- main (void)
- {
-   int result = 0;
-+  void *p;
- 
-+  mtrace ();
-+
-   /* First try to load an object which is a dependency.  This should
-      succeed.  */
--  if (dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
-+  p = dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD);
-+  if (p == NULL)
-     {
-       printf ("cannot open \"testobj1.so\": %s\n", dlerror ());
-       result = 1;
-     }
-   else
--    puts ("loading \"testobj1.so\" succeeded, OK");
-+    {
-+      puts ("loading \"testobj1.so\" succeeded, OK");
-+      dlclose (p);
-+    }
- 
-   /* Now try loading an object which is not already loaded.  */
-   if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) != NULL)
-@@ -25,8 +33,6 @@
-   else
-     {
-       /* Load the object and run the same test again.  */
--      void *p;
--
-       puts ("\"testobj5.so\" wasn't loaded and RTLD_NOLOAD prevented it, OK");
- 
-       p = dlopen ("testobj5.so", RTLD_LAZY);
-@@ -41,13 +47,17 @@
- 	{
- 	  puts ("loading \"testobj5.so\" succeeded, OK");
- 
--	  if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
-+	  void *q = dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD);
-+	  if (q == NULL)
- 	    {
- 	      printf ("cannot open \"testobj5.so\": %s\n", dlerror ());
- 	      result = 1;
- 	    }
- 	  else
--	    puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
-+	    {
-+	      puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
-+	      dlclose (q);
-+	    }
- 
- 	  if (dlclose (p) != 0)
- 	    {
---- a/elf/dl-close.c	(revision 12231)
-+++ b/elf/dl-close.c	(revision 14920)
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2011 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,8 +119,17 @@
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
--	dl_close_state = rerun;
-+      if (map->l_direct_opencount == 0)
-+	{
-+	  if (map->l_type == lt_loaded)
-+	    dl_close_state = rerun;
-+	  else if (map->l_type == lt_library)
-+	    {
-+	      struct link_map **oldp = map->l_initfini;
-+	      map->l_initfini = map->l_orig_initfini;
-+	      _dl_scope_free (oldp);
-+	    }
-+	}
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
---- a/elf/dl-deps.c	(revision 12231)
-+++ b/elf/dl-deps.c	(revision 14920)
+--- a/elf/dl-deps.c	(révision 12231)
++++ b/elf/dl-deps.c	(révision 15252)
 @@ -491,6 +491,10 @@
    if (errno == 0 && errno_saved != 0)
      __set_errno (errno_saved);
@@ -2582,19 +2629,17 @@
    struct link_map **old_l_initfini = NULL;
    if (map->l_initfini != NULL && map->l_type == lt_loaded)
      {
-@@ -665,9 +669,5 @@
-       _dl_scope_free (old_l_reldeps);
+@@ -666,8 +670,4 @@
      }
    if (old_l_initfini != NULL)
--    _dl_scope_free (old_l_initfini);
+     _dl_scope_free (old_l_initfini);
 -
 -  if (errno_reason)
 -    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
 -		      NULL, errstring);
-+      map->l_orig_initfini = old_l_initfini;
  }
---- a/elf/dl-dst.h	(revision 12231)
-+++ b/elf/dl-dst.h	(revision 14920)
+--- a/elf/dl-dst.h	(révision 12231)
++++ b/elf/dl-dst.h	(révision 15252)
 @@ -1,6 +1,5 @@
  /* Handling of dynamic sring tokens.
 -   Copyright (C) 1999,2001,2002,2003,2004,2006,2007
@@ -2675,8 +2720,8 @@
      }									      \
    else
  #endif
---- a/elf/dl-runtime.c	(revision 12231)
-+++ b/elf/dl-runtime.c	(revision 14920)
+--- a/elf/dl-runtime.c	(révision 12231)
++++ b/elf/dl-runtime.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* On-demand PLT fixup for shared objects.
 -   Copyright (C) 1995-2009, 2010 Free Software Foundation, Inc.
@@ -2692,8 +2737,8 @@
  
    /* Get the symbol name.  */
    const char *strtab = (const void *) D_PTR (reloc_result->bound,
---- a/elf/dl-load.c	(revision 12231)
-+++ b/elf/dl-load.c	(revision 14920)
+--- a/elf/dl-load.c	(révision 12231)
++++ b/elf/dl-load.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Map in a shared object's segments from the file.
 -   Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
@@ -2954,23 +2999,7 @@
    /* Count the number of necessary elements in the result array.  */
    nelems = 0;
    for (cp = copy; *cp != '\0'; ++cp)
-@@ -897,6 +987,7 @@
-     {
-       /* We are not supposed to load the object unless it is already
- 	 loaded.  So return now.  */
-+      free (realname);
-       __close (fd);
-       return NULL;
-     }
-@@ -915,6 +1006,7 @@
-       _dl_zerofd = _dl_sysdep_open_zero_fill ();
-       if (_dl_zerofd == -1)
- 	{
-+	  free (realname);
- 	  __close (fd);
- 	  _dl_signal_error (errno, NULL, NULL,
- 			    N_("cannot open zero fill device"));
-@@ -2100,7 +2192,9 @@
+@@ -2100,7 +2190,9 @@
  	    {
  #ifdef SHARED
  	      // XXX Correct to unconditionally default to namespace 0?
@@ -2981,7 +3010,7 @@
  #else
  	      l = loader;
  #endif
-@@ -2166,7 +2260,7 @@
+@@ -2166,7 +2258,7 @@
      {
        /* The path may contain dynamic string tokens.  */
        realname = (loader
@@ -2990,8 +3019,8 @@
  		  : local_strdup (name));
        if (realname == NULL)
  	fd = -1;
---- a/elf/ldconfig.c	(revision 12231)
-+++ b/elf/ldconfig.c	(revision 14920)
+--- a/elf/ldconfig.c	(révision 12231)
++++ b/elf/ldconfig.c	(révision 15252)
 @@ -387,15 +387,18 @@
      }
  
@@ -3017,8 +3046,8 @@
    char *path = entry->path;
    if (opt_chroot)
      path = chroot_canon (opt_chroot, path);
---- a/elf/dl-lookup.c	(revision 12231)
-+++ b/elf/dl-lookup.c	(revision 14920)
+--- a/elf/dl-lookup.c	(révision 12231)
++++ b/elf/dl-lookup.c	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Look up a symbol in the loaded objects.
 -   Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
@@ -3117,8 +3146,8 @@
  	      ++tab->n_elements;
  
  	      __rtld_lock_unlock_recursive (tab->lock);
---- a/io/fcntl.h	(revision 12231)
-+++ b/io/fcntl.h	(revision 14920)
+--- a/io/fcntl.h	(révision 12231)
++++ b/io/fcntl.h	(révision 15252)
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007, 2009
 +/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007,2009,2010,2011
@@ -3134,8 +3163,8 @@
  # define AT_EACCESS		0x200	/* Test access permitted for
  					   effective IDs, not real IDs.  */
  #endif
---- a/ports/sysdeps/arm/sysdep.h	(revision 12231)
-+++ b/ports/sysdeps/arm/sysdep.h	(revision 14920)
+--- a/ports/sysdeps/arm/sysdep.h	(révision 12231)
++++ b/ports/sysdeps/arm/sysdep.h	(révision 15252)
 @@ -18,6 +18,7 @@
     02111-1307 USA.  */
  
@@ -3174,8 +3203,8 @@
  
  #if defined(__ARM_EABI__)
  /* Tag_ABI_align8_preserved: This code preserves 8-byte
---- a/ports/sysdeps/arm/elf/start.S	(revision 12231)
-+++ b/ports/sysdeps/arm/elf/start.S	(revision 14920)
+--- a/ports/sysdeps/arm/elf/start.S	(révision 12231)
++++ b/ports/sysdeps/arm/elf/start.S	(révision 15252)
 @@ -134,6 +134,7 @@
  	bl abort
  
@@ -3184,8 +3213,8 @@
  .L_GOT:
  	.word _GLOBAL_OFFSET_TABLE_ - .L_GOT
  	.word __libc_csu_fini(GOT)
---- a/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h	(revision 12231)
-+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h	(revision 14920)
+--- a/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h	(révision 12231)
++++ b/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/ARM version.
 -   Copyright (C) 1997, 2000, 2003, 2005, 2006, 2009
@@ -3202,8 +3231,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h	(revision 12231)
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h	(revision 14920)
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h	(révision 12231)
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/m68k version.
 -   Copyright (C) 1997, 2000, 2003, 2005, 2008, 2009
@@ -3220,8 +3249,23 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h	(revision 12231)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h	(revision 14920)
+--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c	(révision 0)
++++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c	(révision 15252)
+@@ -0,0 +1 @@
++/* Empty.  */
+--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c	(révision 0)
++++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c	(révision 15252)
+@@ -0,0 +1 @@
++/* Empty.  */
+--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list	(révision 0)
++++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list	(révision 15252)
+@@ -0,0 +1,4 @@
++# File name	Caller	Syscall name	# args	Strong name	Weak names
++
++fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs fstatfs64 __fstatfs64
++statfs		-	statfs		i:sp	__statfs	statfs statfs64 __statfs64
+--- a/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h	(révision 12231)
++++ b/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h	(révision 15252)
 @@ -1,5 +1,5 @@
  /* Definitions for POSIX memory map interface.  Linux/MIPS version.
 -   Copyright (C) 1997, 2000, 2003, 2004, 2005, 2006, 2009
@@ -3238,8 +3282,8 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h	(revision 12231)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h	(revision 14920)
+--- a/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h	(révision 12231)
++++ b/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h	(révision 15252)
 @@ -1,6 +1,6 @@
  /* System-specific socket constants and types.  Linux/MIPS version.
     Copyright (C) 1991, 92, 1994-1999, 2000, 2001, 2004, 2005, 2006, 2007, 2008,
@@ -3268,9 +3312,17 @@
  #define	AF_MAX		PF_MAX
  
  /* Socket level values.  Others are defined in the appropriate headers.
---- a/ports/ChangeLog.mips	(revision 12231)
-+++ b/ports/ChangeLog.mips	(revision 14920)
-@@ -1,3 +1,13 @@
+--- a/ports/ChangeLog.mips	(révision 12231)
++++ b/ports/ChangeLog.mips	(révision 15252)
+@@ -1,3 +1,21 @@
++2011-09-06  Joseph Myers  <joseph@codesourcery.com>
++
++	[BZ #13109]
++	* sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list (fstatfs)
++	(statfs): New.
++	* sysdeps/unix/sysv/linux/mips/mips64/n64/fstatfs64.c,
++	sysdeps/unix/sysv/linux/mips/mips64/n64/statfs64.c: New.
++
 +2011-01-25  Joseph Myers  <joseph@codesourcery.com>
 +
 +	* sysdeps/unix/sysv/linux/mips/bits/mman.h (MADV_HUGEPAGE,
@@ -3284,8 +3336,8 @@
  2009-12-16  Joseph Myers  <joseph@codesourcery.com>
  
  	* sysdeps/mips/dl-lookup.c: Update from generic version.
---- a/ports/ChangeLog.arm	(revision 12231)
-+++ b/ports/ChangeLog.arm	(revision 14920)
+--- a/ports/ChangeLog.arm	(révision 12231)
++++ b/ports/ChangeLog.arm	(révision 15252)
 @@ -1,3 +1,19 @@
 +2011-06-30  Richard Sandiford  <richard.sandiford@linaro.org>
 +
@@ -3306,8 +3358,8 @@
  2009-11-19  Joseph Myers  <joseph@codesourcery.com>
  
  	* sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PSELECT,
---- a/ports/ChangeLog.m68k	(revision 12231)
-+++ b/ports/ChangeLog.m68k	(revision 14920)
+--- a/ports/ChangeLog.m68k	(révision 12231)
++++ b/ports/ChangeLog.m68k	(révision 15252)
 @@ -1,3 +1,8 @@
 +2011-01-18  Andreas Schwab  <schwab@linux-m68k.org>
 +


Reply to: