From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 18 Jan 2011 09:48:36 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into fedora/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11be2acce8384212388dd442c7f4eaa7b4a5f1a1;p=thirdparty%2Fglibc.git

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

11be2acce8384212388dd442c7f4eaa7b4a5f1a1
diff --cc ChangeLog.17
index 283a5587bc6,92f97396804..d933d56f4f6
--- a/ChangeLog.17
+++ b/ChangeLog.17
@@@ -1016,19 -1010,6 +1016,13 @@@
  	* sysdeps/x86_64/fpu/fegetenv.c: Likewise
  	* sysdeps/s390/fpu/fegetenv.c: Likewise.  Remove unused headers.
  
 +2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
 +
 +	[BZ #10855]
 +	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
 +	used later with MMAP_FIXED | MMAP_SHARED to cope with different
 +	alignment restrictions.
 +
- 2010-02-08  Andreas Schwab  <schwab@redhat.com>
- 
- 	[BZ #11155]
- 	* sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386
- 	version.
- 
  2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
  
  	[BZ #11230]
diff --cc nptl/Versions
index 52ca0bfee08,5a884202f1f..fb7728df964
--- a/nptl/Versions
+++ b/nptl/Versions
@@@ -27,9 -27,9 +27,10 @@@ libc 
      pthread_cond_broadcast; pthread_cond_timedwait;
    }
    GLIBC_PRIVATE {
+     __libc_alloca_cutoff;
      # Internal libc interface to libpthread
      __libc_dl_error_tsd;
 +    __getrlimit;
    }
  }