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

diff --cc ChangeLog
index 8ab75bf1dee72f6aff43e6bb2167efd7e75d5338,2fdca19e09bb09dd1e10936d9f0e96469fa5a73f..e3d8dd44d554c5f39bc48157fd453d53e4cdbbb7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,108 +1,113 @@@
+ 2010-10-13  Jakub Jelinek  <jakub@redhat.com>
+ 
+       [BZ #3268]
+       * math/libm-test.inc (fma_test): Some more fmaf and fma tests.
+       * sysdeps/i386/i686/multiarch/s_fma.c: Include ldbl-96 version
+       instead of dbl-64.
+       * sysdeps/i386/fpu/bits/mathinline.h (fma, fmaf, fmal): Remove
+       inlines.
+       * sysdeps/ieee754/ldbl-96/s_fma.c: New file.
+       * sysdeps/ieee754/dbl-64/s_fma.c (__fma): Fix exponent adjustment
+       if one of x and y is very large and the other is subnormal.
+       * sysdeps/s390/fpu/s_fmaf.c: New file.
+       * sysdeps/s390/fpu/s_fma.c: New file.
+       * sysdeps/powerpc/fpu/s_fmaf.S: New file.
+       * sysdeps/powerpc/fpu/s_fma.S: New file.
+       * sysdeps/powerpc/powerpc32/fpu/s_fma.S: New file.
+       * sysdeps/powerpc/powerpc64/fpu/s_fma.S: New file.
+       * sysdeps/unix/sysv/linux/s390/fpu/s_fma.c: New file.
+ 
+ 2010-10-12  Jakub Jelinek  <jakub@redhat.com>
+ 
+       [BZ #3268]
+       * math/libm-test.inc (fma_test): Add some more fmaf tests, add
+       fma tests.
+       * sysdeps/ieee754/dbl-64/s_fmaf.c (__fmaf): Fix Inf/Nan check.
+       * sysdeps/ieee754/dbl-64/s_fma.c: New file.
+       * sysdeps/i386/i686/multiarch/s_fma.c: Include
+       sysdeps/ieee754/dbl-64/s_fma.c instead of math/s_fma.c.
+       * sysdeps/x86_64/multiarch/s_fma.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/s_fma.c: Likewise.
+       * sysdeps/ieee754/ldbl-128/s_fma.c: New file.
+ 
+ 2010-10-12  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #12078]
+       * posix/regcomp.c (parse_branch): One more memory leak plugged.
+       * posix/bug-regex31.input: Add test case.
+ 
+ 2010-10-11  Ulrich Drepper  <drepper@gmail.com>
+ 
+       * posix/bug-regex31.c: Rewrite to run multiple tests from stdin.
+       * posix/bug-regex31.input: New file.
+ 
+       [BZ #12078]
+       * posix/regcomp.c (parse_branch): Free memory when allocation failed.
+       (parse_sub_exp): Fix last change, use postorder.
+ 
+       * posix/bug-regex31.c: New file.
+       * posix/Makefile: Add rules to build and run bug-regex31.
+ 
+       * posix/regcomp.c (parse_bracket_exp): Add missing re_free calls.
+ 
+       [BZ #12078]
+       * posix/regcomp.c (parse_sub_exp): Free tree data when it is not used.
+ 
+       [BZ #12108]
+       * stdio-common/psiginfo.c (psiginfo): Don't expext SIGRTMIN..SIGRTMAX
+       to have entries in sys_siglist.
+ 
+       [BZ #12093]
+       * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): ->ifa_addr might
+       be NULL.
+ 
+ 2010-10-07  Jakub Jelinek  <jakub@redhat.com>
+ 
+       [BZ #3268]
+       * math/libm-test.inc (fma_test): Add 2 fmaf tests.
+       * sysdeps/ieee754/dbl-64/s_fmaf.c: New file.
+       * sysdeps/i386/i686/multiarch/s_fmaf.c: Include
+       sysdeps/ieee754/dbl-64/s_fmaf.c instead of math/s_fmaf.c.
+       * sysdeps/x86_64/multiarch/s_fmaf.c: Likewise.
+       * include/fenv.h (feupdateenv, fetestexcept): Add libm_hidden_proto.
+       * math/feupdateenv.c (feupdateenv): Add libm_hidden_ver.
+       * sysdeps/i386/fpu/feupdateenv.c (feupdateenv): Likewise.
+       * sysdeps/powerpc/fpu/feupdateenv.c (feupdateenv): Likewise.
+       * sysdeps/x86_64/fpu/feupdateenv.c (feupdateenv): Likewise.
+       * sysdeps/sparc/fpu/feupdateenv.c (feupdateenv): Likewise.
+       * sysdeps/ia64/fpu/feupdateenv.c (feupdateenv): Add libm_hidden_def.
+       * sysdeps/s390/fpu/feupdateenv.c (feupdateenv): Likewise.
+       * math/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/ia64/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/i386/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/s390/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/powerpc/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/x86_64/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/sparc/fpu/ftestexcept.c (fetestexcept): Likewise.
+       * sysdeps/sh/sh4/fpu/ftestexcept.c (fetestexcept): Likewise.
+ 
+ 2010-10-11  Ulrich Drepper  <drepper@gmail.com>
+ 
+       [BZ #12107]
+       * stdio-common/psiginfo.c (psiginfo): Terminate all strings with
+       newline.
+ 
+ 2010-10-06  Ulrich Drepper  <drepper@gmail.com>
+ 
+       * string/bug-strstr1.c: New file.
+       * string/Makefile: Add rules to build and run bug-strstr1.
+ 
+ 2010-10-05  Eric Blake  <eblake@redhat.com>
+ 
+       [BZ #12092]
+       * string/str-two-way.h (two_way_long_needle): Always clear memory
+       when skipping input due to the shift table.
+ 
 +2010-10-05  Andreas Schwab  <schwab@redhat.com>
 +
 +      * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
 +      decoding ACE if AI_CANONIDN.
 +
  2010-10-03  Ulrich Drepper  <drepper@gmail.com>
  
        [BZ #12005]

diff --cc nptl/ChangeLog
Simple merge

diff --cc posix/Makefile
Simple merge

diff --cc posix/regcomp.c
Simple merge

diff --cc sysdeps/unix/sysv/linux/check_pf.c
Simple merge