Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts: ChangeLog
git-mirror · Jan 25, 2012 · 83cf1b9 · 83cf1b9
2 parents b15549e + a037381
commit 83cf1b9
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 6,102 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,25 @@
 	* debug/tst-chk1.c: Don't declare gets here.
 	* stdio-common/tst-gets.c: Likewise.
 
+2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* posix/glob: Remove directory.
+
+2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* wcsmbs/Makefile (tst-c16c32-1-ENV): Define.
+
+2012-01-22  Pino Toscano  <toscano.pino@tiscali.it>
+
+	* sysdeps/mach/hurd/socket.c (__socket): Return EAFNOSUPPORT instead
+	of the non-standard EPFNOSUPPORT.
+
+2011-12-26  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* sysdeps/mach/hurd/mmap.c (__mmap): When MAPADDR is nonzero, try
+	__vm_allocate and __vm_map with ANYWHERE set to 0 first, and try with
+	ANYWHERE set to 1 only on KERN_NO_SPACE error.
+
 2012-01-21  Ulrich Drepper  <drepper@gmail.com>
 
 	* wcsmbs/uchar.h: Test __STDC_VERSION__.

diff --git a/posix/glob/ChangeLog b/posix/glob/ChangeLog
diff --git a/posix/glob/Makefile.ami b/posix/glob/Makefile.ami
diff --git a/posix/glob/Makefile.in b/posix/glob/Makefile.in
diff --git a/posix/glob/SCOPTIONS b/posix/glob/SCOPTIONS
diff --git a/posix/glob/SMakefile b/posix/glob/SMakefile