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

diff --cc ChangeLog
index 76a21df3aaac80f4157771f782f875f7fe9c2f06,fbd5a492f6186fea19ef49bec60b21dffc44d44b..ef639398b505f0a12866919e8d289039e5ca668a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,12 +1,34 @@@
+ 2011-10-25  Andreas Schwab  <schwab@redhat.com>
+ 
+       * wcsmbs/wcscmp.c (WCSCMP): Compare as wchar_t, not wint_t.
+       * wcsmbs/wmemcmp.c (WMEMCMP): Likewise.
+ 
+       * string/test-strchr.c (do_test): Don't generate NUL bytes.
+ 
  2011-10-25  Ulrich Drepper  <drepper@gmail.com>
  
 +      * sysdeps/ieee754/dbl-64/e_atanh.c: Use math_force_eval instead of a
 +      useful if() expression.
 +      * sysdeps/ieee754/dbl-64/e_j0.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/s_ceil.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/s_expm1.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/s_floor.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/s_log1p.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/s_round.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c: Likewise.
 +      * sysdeps/ieee754/dbl-64/wordsize-64/s_round.c: Likewise.
 +      * sysdeps/ieee754/flt-32/e_atanhf.c: Likewise.
 +      * sysdeps/ieee754/flt-32/e_j0f.c: Likewise.
 +      * sysdeps/ieee754/flt-32/s_ceilf.c: Likewise.
 +      * sysdeps/ieee754/flt-32/s_expm1f.c: Likewise.
 +      * sysdeps/ieee754/flt-32/s_floorf.c: Likewise.
 +      * sysdeps/ieee754/flt-32/s_log1pf.c: Likewise.
 +      * sysdeps/ieee754/flt-32/s_roundf.c: Likewise.
 +      * sysdeps/ieee754/ldbl-96/e_atanhl.c: Likewise.
 +      * sysdeps/ieee754/ldbl-96/e_j0l.c: Likewise.
 +      * sysdeps/ieee754/ldbl-96/s_roundl.c: Likewise.
 +
        * sysdeps/x86_64/fpu/math_private.h: Use VEX encoding when possible.
  
  2011-10-25  Andreas Schwab  <schwab@redhat.com>