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

[commits] r15253 - in /fsf/trunk/libc: ./ debug/ elf/ include/bits/ intl/ locale/ manual/ math/ misc/ misc/bits/ misc/sys/ nptl/ nptl/...



Author: eglibc
Date: Fri Sep  9 00:02:23 2011
New Revision: 15253

Log:
Import glibc-mainline for 2011-09-09

Added:
    fsf/trunk/libc/debug/fdelt_chk.c
    fsf/trunk/libc/include/bits/select2.h
    fsf/trunk/libc/misc/bits/select2.h
    fsf/trunk/libc/wcsmbs/test-wcscmp.c
    fsf/trunk/libc/wcsmbs/test-wmemcmp.c
Removed:
    fsf/trunk/libc/string/test-wcscmp.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makefile
    fsf/trunk/libc/Makerules
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/config.make.in
    fsf/trunk/libc/configure
    fsf/trunk/libc/configure.in
    fsf/trunk/libc/debug/Makefile
    fsf/trunk/libc/debug/Versions
    fsf/trunk/libc/debug/tst-chk1.c
    fsf/trunk/libc/elf/dl-load.c
    fsf/trunk/libc/elf/sprof.c
    fsf/trunk/libc/intl/Makefile
    fsf/trunk/libc/locale/Makefile
    fsf/trunk/libc/manual/libc.texinfo
    fsf/trunk/libc/math/libm-test.inc
    fsf/trunk/libc/misc/Makefile
    fsf/trunk/libc/misc/sys/select.h
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
    fsf/trunk/libc/po/Makefile
    fsf/trunk/libc/posix/Makefile
    fsf/trunk/libc/string/Makefile
    fsf/trunk/libc/string/test-memcmp.c
    fsf/trunk/libc/sysdeps/gnu/Makefile
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_lround.c
    fsf/trunk/libc/sysdeps/mach/hurd/Makefile
    fsf/trunk/libc/sysdeps/mach/hurd/fork.c
    fsf/trunk/libc/sysdeps/mach/hurd/sys/param.h
    fsf/trunk/libc/sysdeps/sparc/sparc32/Makefile
    fsf/trunk/libc/wcsmbs/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Sep  9 00:02:23 2011
@@ -1,3 +1,70 @@
+2011-08-17  Andreas Jaeger  <aj@xxxxxxx>
+
+	* elf/sprof.c (load_shobj): Remove unused variable log_hashfraction.
+
+2011-08-18  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
+	    Ian Lance Taylor  <iant@xxxxxxxxxx>
+
+	* math/libm-test.inc (lround_test): New testcase.
+	* sysdeps/ieee754/dbl-64/s_lround.c (__lround): Don't lose precision.
+
+2011-09-08  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* Makefile: Remove support for automatic cvs check-ins.
+	* Makerules: Likewise.
+	* config.make.in: Likewise.
+	* configure.in: Likewise.
+	* intl/Makefile: Likewise.
+	* locale/Makefile: Likewise.
+	* po/Makefile: Likewise.
+	* posix/Makefile: Likewise.
+	* sysdeps/gnu/Makefile: Likewise.
+	* sysdeps/mach/hurd/Makefile: Likewise.
+	* sysdeps/sparc/sparc32/Makefile: Likewise.
+
+	[BZ #13118]
+	* posix/Makefile (bug-regex32-ENV): Define.
+	Patch by John Stanley <jpsinthemix@xxxxxxxxxxx>.
+
+	* misc/Makefile (headers): Add bits/select2.h.
+	* misc/sys/select.h: Include bits/select2.h for _FORTIFY_SOURCE.
+	* misc/bits/select2.h: New file.
+	* include/bits/select2.h: New file.
+	* debug/Makefile (routines): Add fdelt_chk.
+	* debug/Versions: Export __fdelt_chk and __fdelt_warn for GLIBC_2.15.
+	* debug/tst-chk1.c (do_test): Add tests for FD_SET, FD_CLR, and
+	FD_ISSET.
+	* debug/fdelt_chk.c: New file.
+
+	* wcsmbs/test-wcscmp.c: Moved from string/*.  Adjust.
+	* wcsmbs/test-wmemcmp.c: Likewise.
+	* string/Makefile (strop-tests): Remove wcscmp and wmemcmp.
+	* wcsmbs/Makefile (strop-tests): Add wcscmp and wmemcmp.
+
+2011-09-08  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
+
+	* string/Makefile (strop-tests): Add memcmp.
+	* string/test-wmemcmp.c: New file.
+	* string/test-memcmp.c: Add wmemcmp support.
+
+2011-09-08  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	[BZ #13153]
+	* manual/libc.texinfo (EDITION, VERSION, UPDATED): Update for
+	2011-07-19 change.
+
+	* sysdeps/mach/hurd/fork.c (__fork): Initialize REFS so we don't use a
+	garbage value in a __mach_port_mod_refs call in the cases of the
+	task-self and thread-self ports.
+
+2011-09-06  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro.
+
+2011-09-08  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* elf/dl-load.c (lose): Check for non-null L.
+
 2011-09-07  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* elf/dl-load.c (open_verify): Use O_CLOEXEC.

Modified: fsf/trunk/libc/Makefile
==============================================================================
--- fsf/trunk/libc/Makefile (original)
+++ fsf/trunk/libc/Makefile Fri Sep  9 00:02:23 2011
@@ -33,20 +33,11 @@
 
 ifneq ($(AUTOCONF),no)
 
-ifeq ($(with-cvs),yes)
-define autoconf-it-cvs
-test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
-endef
-else
-autoconf-it-cvs =
-endif
-
 define autoconf-it
 @-rm -f $@.new
 $(AUTOCONF) $(ACFLAGS) $< > $@.new
 chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
 mv -f $@.new $@
-$(autoconf-it-cvs)
 endef
 
 configure: configure.in aclocal.m4; $(autoconf-it)
@@ -414,9 +405,6 @@
 	$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 FAQ: scripts/gen-FAQ.pl FAQ.in
 	$(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated:  $(PERL) $^' $@
-endif
 FORCE:
 
 iconvdata/% localedata/% po/% manual/%: FORCE

Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Fri Sep  9 00:02:23 2011
@@ -1452,9 +1452,6 @@
 # So I don't edit them by mistake.
 	chmod a-w $@-tmp
 	mv -f $@-tmp $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $^' $@
-endif
 endif
 endif
 

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-9-7
+GNU C Library NEWS -- history of user-visible changes.  2011-9-8
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -9,8 +9,8 @@
 
 * The following bugs are resolved with this release:
 
-  9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021,
-  13068, 13092, 13114, 13123, 13134, 13150
+  9696, 12403, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007,
+  13021, 13068, 13092, 13114, 13118, 13123, 13134, 13150
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
@@ -33,6 +33,9 @@
   Contributed by Liubov Dmitrieva.
 
 * New interfaces: scandirat, scandirat64
+  Implemented by Ulrich Drepper.
+
+* Checking versions of FD_SET, FD_CLR, and FD_ISSET added.
   Implemented by Ulrich Drepper.
 
 Version 2.14

Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Fri Sep  9 00:02:23 2011
@@ -53,7 +53,6 @@
 libgcc_s_suffix = @libc_cv_libgcc_s_suffix@
 need-nopic-initfini = @nopic_initfini@
 with-fp = @with_fp@
-with-cvs = @with_cvs@
 old-glibc-headers = @old_glibc_headers@
 unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
 have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@

Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Fri Sep  9 00:02:23 2011
@@ -700,7 +700,6 @@
 oldest_abi
 enable_check_abi
 use_default_link
-with_cvs
 with_fp
 ac_ct_CXX
 CXXFLAGS
@@ -772,7 +771,6 @@
 with_elf
 with_selinux
 with_xcoff
-with_cvs
 with_headers
 with_default_link
 enable_sanity_checks
@@ -1466,7 +1464,6 @@
   --with-elf              if using the ELF object format
   --with-selinux          if building with SELinux support
   --with-xcoff            if using the XCOFF object format
-  --without-cvs           if CVS should not be used
   --with-headers=PATH     location of system headers to use (for example
                           /usr/src/linux/include) [default=compiler default]
   --with-default-link     do not use explicit linker scripts
@@ -3560,21 +3557,6 @@
   withval=$with_xcoff; xcoff=$withval
 else
   xcoff=no
-fi
-
-
-# Check whether --with-cvs was given.
-if test "${with_cvs+set}" = set; then :
-  withval=$with_cvs; with_cvs=$withval
-else
-  with_cvs=yes
-fi
-
-if test "$with_cvs" = yes; then
-  if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null
-  then
-    with_cvs=no
-  fi
 fi
 
 
@@ -5383,8 +5365,7 @@
   test $libc_cv_autoconf_works = yes || AUTOCONF=no
   ;;
 esac
-if test "x$with_cvs" = xyes && test "x$AUTOCONF" = xno; then
-  # If --without-cvs they probably won't change configure.in, so no complaints.
+if test "x$AUTOCONF" = xno; then
   aux_missing="$aux_missing autoconf"
 fi
 
@@ -6235,13 +6216,13 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
         if $READELF -WS conftest$ac_exeext | $AWK '
-        { gsub(/\[ */, "[") }
+	{ gsub(/\[ */, "[") }
 	$2 == ".ctors" || $2 == ".dtors" {
 	  size = strtonum("0x" $6)
 	  align = strtonum("0x" $NF)
 	  seen[$2] = 1
 	  stub[$2] = size == align * 2
-        }
+	}
 	END {
 	  ctors_ok = !seen[".ctors"] || stub[".ctors"]
 	  dtors_ok = !seen[".dtors"] || stub[".dtors"]

Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Fri Sep  9 00:02:23 2011
@@ -93,18 +93,6 @@
 			   [if using the XCOFF object format]),
 	    [xcoff=$withval],
 	    [xcoff=no])
-AC_ARG_WITH([cvs],
-	    AC_HELP_STRING([--without-cvs],
-			   [if CVS should not be used]),
-	    [with_cvs=$withval],
-	    [with_cvs=yes])
-if test "$with_cvs" = yes; then
-  if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null
-  then
-    with_cvs=no
-  fi
-fi
-AC_SUBST(with_cvs)
 
 AC_ARG_WITH([headers],
 	    AC_HELP_STRING([--with-headers=PATH],
@@ -1061,8 +1049,7 @@
   test $libc_cv_autoconf_works = yes || AUTOCONF=no
   ;;
 esac
-if test "x$with_cvs" = xyes && test "x$AUTOCONF" = xno; then
-  # If --without-cvs they probably won't change configure.in, so no complaints.
+if test "x$AUTOCONF" = xno; then
   aux_missing="$aux_missing autoconf"
 fi
 
@@ -1492,13 +1479,13 @@
 ],
 		[dnl
       AS_IF([$READELF -WS conftest$ac_exeext | $AWK '
-        { gsub(/\@<:@ */, "@<:@") }
+	{ gsub(/\@<:@ */, "@<:@") }
 	$2 == ".ctors" || $2 == ".dtors" {
 	  size = strtonum("0x" $6)
 	  align = strtonum("0x" $NF)
 	  seen@<:@$2@:>@ = 1
 	  stub@<:@$2@:>@ = size == align * 2
-        }
+	}
 	END {
 	  ctors_ok = !seen@<:@".ctors"@:>@ || stub@<:@".ctors"@:>@
 	  dtors_ok = !seen@<:@".dtors"@:>@ || stub@<:@".dtors"@:>@

Modified: fsf/trunk/libc/debug/Makefile
==============================================================================
--- fsf/trunk/libc/debug/Makefile (original)
+++ fsf/trunk/libc/debug/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2001,2004-2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1998-2001,2004-2008, 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
@@ -44,6 +44,7 @@
 	    wcstombs_chk asprintf_chk vasprintf_chk dprintf_chk \
 	    vdprintf_chk obprintf_chk \
 	    longjmp_chk ____longjmp_chk \
+	    fdelt_chk \
 	    stack_chk_fail fortify_fail \
 	    $(static-only-routines)
 static-only-routines := warning-nop stack_chk_fail_local

Modified: fsf/trunk/libc/debug/Versions
==============================================================================
--- fsf/trunk/libc/debug/Versions (original)
+++ fsf/trunk/libc/debug/Versions Fri Sep  9 00:02:23 2011
@@ -49,6 +49,9 @@
   GLIBC_2.11 {
     __longjmp_chk;
   }
+  GLIBC_2.15 {
+    __fdelt_chk; __fdelt_warn;
+  }
   GLIBC_PRIVATE {
     __fortify_fail;
   }

Added: fsf/trunk/libc/debug/fdelt_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fdelt_chk.c (added)
+++ fsf/trunk/libc/debug/fdelt_chk.c Fri Sep  9 00:02:23 2011
@@ -1,0 +1,30 @@
+/* Copyright (C) 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sys/select.h>
+
+
+unsigned long int
+__fdelt_chk (unsigned long int d)
+{
+  if (d >= FD_SETSIZE)
+    __chk_fail ();
+
+  return d / __NFDBITS;
+}
+strong_alias (__fdelt_chk, __fdelt_warn)

Modified: fsf/trunk/libc/debug/tst-chk1.c
==============================================================================
--- fsf/trunk/libc/debug/tst-chk1.c (original)
+++ fsf/trunk/libc/debug/tst-chk1.c Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2004,2005,2006,2007,2008,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2004.
 
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
@@ -107,11 +108,11 @@
       FAIL ();					\
     }
 #if __USE_FORTIFY_LEVEL >= 2 && (!defined __cplusplus || defined __va_arg_pack)
-#define CHK_FAIL2_START CHK_FAIL_START
-#define CHK_FAIL2_END CHK_FAIL_END
+# define CHK_FAIL2_START CHK_FAIL_START
+# define CHK_FAIL2_END CHK_FAIL_END
 #else
-#define CHK_FAIL2_START
-#define CHK_FAIL2_END
+# define CHK_FAIL2_START
+# define CHK_FAIL2_END
 #endif
 
 static int
@@ -1448,5 +1449,26 @@
   CHK_FAIL_END
 #endif
 
+  fd_set s;
+  FD_ZERO (&s);
+  FD_SET (FD_SETSIZE - 1, &s);
+#if __USE_FORTIFY_LEVEL >= 1
+  CHK_FAIL_START
+  FD_SET (FD_SETSIZE, &s);
+  CHK_FAIL_END
+#endif
+  FD_CLR (FD_SETSIZE - 1, &s);
+#if __USE_FORTIFY_LEVEL >= 1
+  CHK_FAIL_START
+  FD_CLR (FD_SETSIZE, &s);
+  CHK_FAIL_END
+#endif
+  FD_ISSET (FD_SETSIZE - 1, &s);
+#if __USE_FORTIFY_LEVEL >= 1
+  CHK_FAIL_START
+  FD_ISSET (FD_SETSIZE, &s);
+  CHK_FAIL_END
+#endif
+
   return ret;
 }

Modified: fsf/trunk/libc/elf/dl-load.c
==============================================================================
--- fsf/trunk/libc/elf/dl-load.c (original)
+++ fsf/trunk/libc/elf/dl-load.c Fri Sep  9 00:02:23 2011
@@ -888,7 +888,7 @@
   /* The file might already be closed.  */
   if (fd != -1)
     (void) __close (fd);
-  if (l->l_origin != (char *) -1l)
+  if (l != NULL && l->l_origin != (char *) -1l)
     free (l->l_origin);
   free (l);
   free (realname);

Modified: fsf/trunk/libc/elf/sprof.c
==============================================================================
--- fsf/trunk/libc/elf/sprof.c (original)
+++ fsf/trunk/libc/elf/sprof.c Fri Sep  9 00:02:23 2011
@@ -404,7 +404,6 @@
   ElfW(Addr) mapend = 0;
   const ElfW(Phdr) *ph;
   size_t textsize;
-  unsigned int log_hashfraction;
   ElfW(Ehdr) *ehdr;
   int fd;
   ElfW(Shdr) *shdr;
@@ -474,13 +473,6 @@
   textsize = result->highpc - result->lowpc;
   result->kcountsize = textsize / HISTFRACTION;
   result->hashfraction = HASHFRACTION;
-  if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
-    /* If HASHFRACTION is a power of two, mcount can use shifting
-       instead of integer division.  Precompute shift amount.  */
-    log_hashfraction = __builtin_ffs (result->hashfraction
-				      * sizeof (struct here_fromstruct)) - 1;
-  else
-    log_hashfraction = -1;
   if (do_test)
     printf ("hashfraction = %d\ndivider = %Zu\n",
 	    result->hashfraction,

Added: fsf/trunk/libc/include/bits/select2.h
==============================================================================
--- fsf/trunk/libc/include/bits/select2.h (added)
+++ fsf/trunk/libc/include/bits/select2.h Fri Sep  9 00:02:23 2011
@@ -1,0 +1,1 @@
+#include "../../misc/bits/select2.h"

Modified: fsf/trunk/libc/intl/Makefile
==============================================================================
--- fsf/trunk/libc/intl/Makefile (original)
+++ fsf/trunk/libc/intl/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1995-2003, 2005, 2008, 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
@@ -53,9 +53,6 @@
 ifneq (no,$(BISON))
 plural.c: plural.y
 	$(BISON) $(BISONFLAGS) $@ $^
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -m'$(BISON) $(BISONFLAGS) $@ $^' $@
-endif
 endif
 $(objpfx)plural.o: plural.c
 

Modified: fsf/trunk/libc/locale/Makefile
==============================================================================
--- fsf/trunk/libc/locale/Makefile (original)
+++ fsf/trunk/libc/locale/Makefile Fri Sep  9 00:02:23 2011
@@ -86,9 +86,6 @@
 C-translit.h: C-translit.h.in gen-translit.pl
 	$(PERL) gen-translit.pl < $< > $@.tmp
 	mv -f $@.tmp $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
-endif
 
 localepath = "$(localedir):$(i18ndir)"
 

Modified: fsf/trunk/libc/manual/libc.texinfo
==============================================================================
--- fsf/trunk/libc/manual/libc.texinfo (original)
+++ fsf/trunk/libc/manual/libc.texinfo Fri Sep  9 00:02:23 2011
@@ -18,9 +18,9 @@
 @comment %**end of header (This is for running Texinfo on a region.)
 
 @c sold 0.06/1.09, print run out 21may96
-@set EDITION 0.12
-@set VERSION 2.8
-@set UPDATED 2007-10-27
+@set EDITION 0.13
+@set VERSION 2.14
+@set UPDATED 2011-07-19
 @set ISBN 1-882114-55-8
 
 @copying

Modified: fsf/trunk/libc/math/libm-test.inc
==============================================================================
--- fsf/trunk/libc/math/libm-test.inc (original)
+++ fsf/trunk/libc/math/libm-test.inc Fri Sep  9 00:02:23 2011
@@ -4386,6 +4386,7 @@
   TEST_f_l (lround, 1073741824.01, 1073741824);
 # if LONG_MAX > 281474976710656
   TEST_f_l (lround, 281474976710656.025, 281474976710656);
+  TEST_f_l (llround, -3.65309740835E17, -365309740835000000);
 # endif
   TEST_f_l (lround, 2097152.5, 2097153);
   TEST_f_l (lround, -2097152.5, -2097153);

Modified: fsf/trunk/libc/misc/Makefile
==============================================================================
--- fsf/trunk/libc/misc/Makefile (original)
+++ fsf/trunk/libc/misc/Makefile Fri Sep  9 00:02:23 2011
@@ -31,7 +31,8 @@
 	   sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
 	   regexp.h bits/select.h bits/mman.h sys/xattr.h \
 	   syslog.h sys/syslog.h \
-	   bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h
+	   bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
+	   bits/select2.h
 
 routines := brk sbrk sstk ioctl \
 	    readv writev preadv preadv64 pwritev pwritev64 \

Added: fsf/trunk/libc/misc/bits/select2.h
==============================================================================
--- fsf/trunk/libc/misc/bits/select2.h (added)
+++ fsf/trunk/libc/misc/bits/select2.h Fri Sep  9 00:02:23 2011
@@ -1,0 +1,34 @@
+/* Checking macros for select functions.
+   Copyright (C) 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _SYS_SELECT_H
+# error "Never include <bits/select2.h> directly; use <sys/select.h> instead."
+#endif
+
+/* Helper functions to issue warnings and errors when needed.  */
+extern unsigned long int __fdelt_chk (unsigned long int __d);
+extern unsigned long int __fdelt_warn (unsigned long int __d)
+  __warnattr ("bit outside of fd_set selected");
+#undef __FDELT
+#define	__FDELT(d) \
+  ({ unsigned long int __d = d;						    \
+     (__builtin_constant_p (__d)					    \
+      ? (__d >= __FD_SETSIZE						    \
+	 ? __fdelt_warn (__d) : (__d / __NFDBITS))			    \
+      : __fdelt_chk (__d)); })

Modified: fsf/trunk/libc/misc/sys/select.h
==============================================================================
--- fsf/trunk/libc/misc/sys/select.h (original)
+++ fsf/trunk/libc/misc/sys/select.h Fri Sep  9 00:02:23 2011
@@ -1,5 +1,5 @@
 /* `fd_set' type and related macros, and `select'/`pselect' declarations.
-   Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1996-2003, 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
@@ -125,6 +125,12 @@
 		    const __sigset_t *__restrict __sigmask);
 #endif
 
+
+/* Define some inlines helping to catch common problems.  */
+#if __USE_FORTIFY_LEVEL > 0 && defined __GNUC__
+# include <bits/select2.h>
+#endif
+
 __END_DECLS
 
 #endif /* sys/select.h */

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Sep  9 00:02:23 2011
@@ -1,3 +1,10 @@
+2011-09-08  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12403]
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+	(pthread_rwlock_timedwrlock): Use correct macro in test.
+	Patch by H.J. Lu <hongjiu.lu@xxxxxxxxx>.
+
 2011-09-06  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait): Don't

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S Fri Sep  9 00:02:23 2011
@@ -190,7 +190,7 @@
 
 7:	movq	%rdx, %rax
 
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
 	addq	$16, %rsp
 	cfi_adjust_cfa_offset(-16)
 	popq	%r14

Modified: fsf/trunk/libc/po/Makefile
==============================================================================
--- fsf/trunk/libc/po/Makefile (original)
+++ fsf/trunk/libc/po/Makefile Fri Sep  9 00:02:23 2011
@@ -74,9 +74,6 @@
 			   -f $(objdir)/tmp-libc.pot-files po/$@.new
 	rm $(objdir)/tmp-libc.pot-files
 	mv -f $@.new $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
-endif
 
 po-sed-cmd = \
   '/\/tst-/d;$(foreach S,[ch] cxx sh ksh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))'
@@ -116,9 +113,6 @@
 	chmod 444 $@
 
 linguas: $(pofiles:$(podir)/%=%)
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -m'Copied from $(podir)' $^
-endif
 linguas.mo: $(pofiles:$(podir)/%.po=%.mo)
 
 endif

Modified: fsf/trunk/libc/posix/Makefile
==============================================================================
--- fsf/trunk/libc/posix/Makefile (original)
+++ fsf/trunk/libc/posix/Makefile Fri Sep  9 00:02:23 2011
@@ -208,6 +208,7 @@
 bug-regex25-ENV = LOCPATH=$(common-objpfx)localedata
 bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata
 bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata
+bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata
 tst-rxspencer-ARGS = --utf8 rxspencer/tests
 tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
 tst-pcre-ARGS = PCRE.tests
@@ -218,16 +219,10 @@
 testcases.h: TESTS TESTS2C.sed
 	sed -f TESTS2C.sed < $< > $@T
 	mv -f $@T $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
-endif
 
 ptestcases.h: PTESTS PTESTS2C.sed
 	sed -f PTESTS2C.sed < $< > $@T
 	mv -f $@T $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
-endif
 
 # Run a test on the header files we use.
 # XXX Please note that for now we ignore the result of this test.

Modified: fsf/trunk/libc/string/Makefile
==============================================================================
--- fsf/trunk/libc/string/Makefile (original)
+++ fsf/trunk/libc/string/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2005-2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002, 2005-2010, 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
@@ -46,7 +46,7 @@
 # for -fbounded-pointer compiles.  Glibc uses memchr for explicit checks.
 o-objects.ob	:= memcpy.o memset.o memchr.o
 
-strop-tests	:=  wcscmp memchr memcmp memcpy memmove mempcpy memset memccpy	\
+strop-tests	:= memchr memcmp memcpy memmove mempcpy memset memccpy	\
 		   stpcpy stpncpy strcat strchr strcmp strcpy strcspn	\
 		   strlen strncmp strncpy strpbrk strrchr strspn memmem	\
 		   strstr strcasestr strnlen strcasecmp strncasecmp	\

Modified: fsf/trunk/libc/string/test-memcmp.c
==============================================================================
--- fsf/trunk/libc/string/test-memcmp.c (original)
+++ fsf/trunk/libc/string/test-memcmp.c Fri Sep  9 00:02:23 2011
@@ -1,7 +1,8 @@
 /* Test and measure memcmp functions.
-   Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@xxxxxxxxxx>, 1999.
+   Added wmemcmp support by Liubov Dmitrieva <liubov.dmitrieva@xxxxxxxxx>, 2011.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -20,25 +21,47 @@
 
 #define TEST_MAIN
 #include "test-string.h"
-
-typedef int (*proto_t) (const char *, const char *, size_t);
-int simple_memcmp (const char *, const char *, size_t);
-
-IMPL (simple_memcmp, 0)
-IMPL (memcmp, 1)
+#ifdef WIDE
+# include <inttypes.h>
+# include <wchar.h>
+
+# define L(str) L##str
+# define MEMCMP wmemcmp
+# define MEMCPY wmemcpy
+# define SIMPLE_MEMCMP simple_wmemcmp
+# define STUPID_MEMCMP stupid_wmemcmp
+# define CHAR wchar_t
+# define MAX_CHAR 256000
+# define UCHAR uint32_t
+# define CHARBYTES 4
+#else
+# define L(str) str
+# define MEMCMP memcmp
+# define MEMCPY memcpy
+# define SIMPLE_MEMCMP simple_memcmp
+# define STUPID_MEMCMP stupid_memcmp
+# define CHAR char
+# define MAX_CHAR 255
+# define UCHAR unsigned char
+# define CHARBYTES 1
+#endif
+
+typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
 
 int
-simple_memcmp (const char *s1, const char *s2, size_t n)
+SIMPLE_MEMCMP (const CHAR *s1, const CHAR *s2, size_t n)
 {
   int ret = 0;
 
-  while (n--
-	 && (ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) == 0);
+  while (n-- && (ret = *(UCHAR *) s1++ - *(UCHAR *) s2++) == 0);
   return ret;
 }
 
+IMPL (SIMPLE_MEMCMP, 0)
+IMPL (MEMCMP, 1)
+
 static int
-check_result (impl_t *impl, const char *s1, const char *s2, size_t len,
+check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, size_t len,
 	      int exp_result)
 {
   int result = CALL (impl, s1, s2, len);
@@ -56,7 +79,7 @@
 }
 
 static void
-do_one_test (impl_t *impl, const char *s1, const char *s2, size_t len,
+do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, size_t len,
 	     int exp_result)
 {
   if (check_result (impl, s1, s2, len, exp_result) < 0)
@@ -85,24 +108,24 @@
 do_test (size_t align1, size_t align2, size_t len, int exp_result)
 {
   size_t i;
-  char *s1, *s2;
+  CHAR *s1, *s2;
 
   if (len == 0)
     return;
 
-  align1 &= 7;
-  if (align1 + len >= page_size)
+  align1 &= 63;
+  if (align1 + (len + 1) * CHARBYTES >= page_size)
     return;
 
-  align2 &= 7;
-  if (align2 + len >= page_size)
+  align2 &= 63;
+  if (align2 + (len + 1) * CHARBYTES >= page_size)
     return;
 
-  s1 = (char *) (buf1 + align1);
-  s2 = (char *) (buf2 + align2);
+  s1 = (CHAR *) (buf1 + align1);
+  s2 = (CHAR *) (buf2 + align2);
 
   for (i = 0; i < len; i++)
-    s1[i] = s2[i] = 1 + 23 * i % 255;
+    s1[i] = s2[i] = 1 + (23 << ((CHARBYTES - 1) * 8)) * i % MAX_CHAR;
 
   s1[len] = align1;
   s2[len] = align2;
@@ -124,12 +147,12 @@
   size_t i, j, n, align1, align2, pos, len;
   int result;
   long r;
-  unsigned char *p1 = buf1 + page_size - 512;
-  unsigned char *p2 = buf2 + page_size - 512;
+  UCHAR *p1 =  (UCHAR *) (buf1 + page_size - 512 * CHARBYTES);
+  UCHAR *p2 =  (UCHAR *) (buf2 + page_size - 512 * CHARBYTES);
 
   for (n = 0; n < ITERATIONS; n++)
     {
-      align1 = random () & 31;
+   align1 = random () & 31;
       if (random () & 1)
 	align2 = random () & 31;
       else
@@ -142,7 +165,7 @@
 	pos = 511 - j - (random () & 7);
       len = random () & 511;
       if (len + j >= 512)
-        len = 511 - j - (random () & 7);
+	len = 511 - j - (random () & 7);
       j = len + align1 + 64;
       if (j > 512) j = 512;
       for (i = 0; i < j; ++i)
@@ -152,10 +175,10 @@
 
       result = 0;
       if (pos >= len)
-	memcpy (p2 + align2, p1 + align1, len);
+	MEMCPY ((CHAR *) p2 + align2, (const CHAR *) p1 + align1, len);
       else
 	{
-	  memcpy (p2 + align2, p1 + align1, pos);
+	  MEMCPY ((CHAR *) p2 + align2, (const CHAR *) p1 + align1, pos);
 	  if (p2[align2 + pos] == p1[align1 + pos])
 	    {
 	      p2[align2 + pos] = random () & 255;
@@ -171,16 +194,14 @@
 
       FOR_EACH_IMPL (impl, 1)
 	{
-	  r = CALL (impl, (char *) (p1 + align1), (char *) (p2 + align2), len);
-	  /* Test whether on 64-bit architectures where ABI requires
-	     callee to promote has the promotion been done.  */
-	  asm ("" : "=g" (r) : "0" (r));
+	  r = CALL (impl, (CHAR *) p1 + align1, (const CHAR *) p2 + align2,
+		    len);
 	  if ((r == 0 && result)
 	      || (r < 0 && result >= 0)
 	      || (r > 0 && result <= 0))
 	    {
 	      error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd, %zd) %ld != %d, p1 %p p2 %p",
-		     n, impl->name, align1, align2, len, pos, r, result, p1, p2);
+		     n, impl->name, align1 * CHARBYTES & 63,  align2 * CHARBYTES & 63, len, pos, r, result, p1, p2);
 	      ret = 1;
 	    }
 	}
@@ -190,7 +211,7 @@
 static void
 check1 (void)
 {
-  char s1[116], s2[116];
+  CHAR s1[116], s2[116];
   int n, exp_result;
 
   s1[0] = -108;
@@ -427,7 +448,7 @@
   s2[115] = 1;
 
   n = 116;
-  exp_result = simple_memcmp (s1, s2, n);
+  exp_result = SIMPLE_MEMCMP (s1, s2, n);
   FOR_EACH_IMPL (impl, 0)
     check_result (impl, s1, s2, n, exp_result);
 }
@@ -448,9 +469,9 @@
 
   for (i = 1; i < 16; ++i)
     {
-      do_test (i, i, i, 0);
-      do_test (i, i, i, 1);
-      do_test (i, i, i, -1);
+      do_test (i * CHARBYTES, i * CHARBYTES, i, 0);
+      do_test (i * CHARBYTES, i * CHARBYTES, i, 1);
+      do_test (i * CHARBYTES, i * CHARBYTES, i, -1);
     }
 
   for (i = 0; i < 16; ++i)
@@ -466,20 +487,19 @@
       do_test (0, 0, 2 << i, 1);
       do_test (0, 0, 2 << i, -1);
       do_test (0, 0, 16 << i, 0);
-      do_test (8 - i, 2 * i, 16 << i, 0);
+      do_test ((8 - i) * CHARBYTES, (2 * i) * CHARBYTES, 16 << i, 0);
       do_test (0, 0, 16 << i, 1);
       do_test (0, 0, 16 << i, -1);
     }
 
   for (i = 1; i < 8; ++i)
     {
-      do_test (i, 2 * i, 8 << i, 0);
-      do_test (i, 2 * i, 8 << i, 1);
-      do_test (i, 2 * i, 8 << i, -1);
+      do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 0);
+      do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 1);
+      do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, -1);
     }
 
   do_random_tests ();
   return ret;
 }
-
 #include "../test-skeleton.c"

Removed: fsf/trunk/libc/string/test-wcscmp.c
==============================================================================
--- fsf/trunk/libc/string/test-wcscmp.c (original)
+++ fsf/trunk/libc/string/test-wcscmp.c (removed)
@@ -1,2 +1,0 @@
-#define WIDE 1
-#include "test-strcmp.c"

Modified: fsf/trunk/libc/sysdeps/gnu/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/Makefile (original)
+++ fsf/trunk/libc/sysdeps/gnu/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010
+# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010,2011
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -26,9 +26,6 @@
 # Make it unwritable so noone will edit it by mistake.
 	-chmod a-w $@-tmp
 	mv -f $@-tmp $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs commit -m'Regenerated from $^' $@
-endif
 
 ifeq ($(subdir),stdio-common)
 
@@ -63,7 +60,7 @@
 
 ifeq ($(subdir),login)
 sysdep_routines += setutxent getutxent endutxent getutxid getutxline \
-                   pututxline utmpxname updwtmpx getutmpx getutmp
+		   pututxline utmpxname updwtmpx getutmpx getutmp
 
 sysdep_headers += utmpx.h bits/utmpx.h
 endif

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_lround.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_lround.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_lround.c Fri Sep  9 00:02:23 2011
@@ -51,7 +51,7 @@
   else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
     {
       if (j0 >= 52)
-	result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
+	result = ((long int) i0 << (j0 - 20)) | ((long int) i1 << (j0 - 52));
       else
 	{
 	  u_int32_t j = i1 + (0x80000000 >> (j0 - 20));

Modified: fsf/trunk/libc/sysdeps/mach/hurd/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/Makefile (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009
+# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009,2011
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -94,10 +94,6 @@
 # Make it unwritable so noone will edit it by mistake.
 	-chmod a-w $(hurd)/bits/errno.h-tmp
 	$(move-if-change) $(hurd)/bits/errno.h-tmp $(hurd)/bits/errno.h
-ifeq ($(with-cvs),yes)
-	test ! -d $(hurd)/CVS || \
-	  (cd $(hurd) && cvs commit -m'Regenerated from $^' bits/errno.h)
-endif
 	touch $@
 
 common-generated += errnos.d stamp-errnos

Modified: fsf/trunk/libc/sysdeps/mach/hurd/fork.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/fork.c (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/fork.c Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,1995,1996,1997,1999,2001,2002,2004,2005,2006
+/* Copyright (C) 1994,1995,1996,1997,1999,2001,2002,2004,2005,2006,2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -313,7 +313,7 @@
 	    {
 	      /* This is a send right or a dead name.
 		 Give the child as many references for it as we have.  */
-	      mach_port_urefs_t refs, *record_refs = NULL;
+	      mach_port_urefs_t refs = 0, *record_refs = NULL;
 	      mach_port_t insert;
 	      mach_msg_type_name_t insert_type = MACH_MSG_TYPE_COPY_SEND;
 	      if (portnames[i] == newtask || portnames[i] == newproc)

Modified: fsf/trunk/libc/sysdeps/mach/hurd/sys/param.h
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/sys/param.h (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/sys/param.h Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1994,1995,1997,1999,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,6 +119,10 @@
 #define	MAX(a,b) (((a)>(b))?(a):(b))
 
 
+/* Unit of `st_blocks'.  */
+#define DEV_BSIZE       512
+
+
 /* Scale factor for scaled integers used to count %cpu time and load avgs.
 
    The number of CPU `tick's that map to a unique `%age' can be expressed

Modified: fsf/trunk/libc/sysdeps/sparc/sparc32/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc32/Makefile (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc32/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-1998, 2000, 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
@@ -50,8 +50,5 @@
 # Make it unwritable so noone will edit it by mistake.
 	-chmod a-w $@-tmp
 	mv -f $@-tmp $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs commit -m'Regenerated from $<' $@
-endif
 
 sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/sparc32/%.S)

Modified: fsf/trunk/libc/wcsmbs/Makefile
==============================================================================
--- fsf/trunk/libc/wcsmbs/Makefile (original)
+++ fsf/trunk/libc/wcsmbs/Makefile Fri Sep  9 00:02:23 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2000,2002,2003,2004,2005,2006,2007
+# Copyright (C) 1995-2000,2002,2003,2004,2005,2006,2007,2011
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -42,9 +42,10 @@
 	    isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \
 	    isoc99_swscanf isoc99_vswscanf
 
+strop-tests :=  wcscmp wmemcmp
 tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
 	 tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \
-	 wcsatcliff
+	 wcsatcliff $(addprefix test-,$(strop-tests))
 
 include ../Rules
 

Added: fsf/trunk/libc/wcsmbs/test-wcscmp.c
==============================================================================
--- fsf/trunk/libc/wcsmbs/test-wcscmp.c (added)
+++ fsf/trunk/libc/wcsmbs/test-wcscmp.c Fri Sep  9 00:02:23 2011
@@ -1,0 +1,2 @@
+#define WIDE 1
+#include "../string/test-strcmp.c"

Added: fsf/trunk/libc/wcsmbs/test-wmemcmp.c
==============================================================================
--- fsf/trunk/libc/wcsmbs/test-wmemcmp.c (added)
+++ fsf/trunk/libc/wcsmbs/test-wmemcmp.c Fri Sep  9 00:02:23 2011
@@ -1,0 +1,2 @@
+#define WIDE 1
+#include "../string/test-memcmp.c"