Merge branch 'master' of ssh://sources.redhat.com/git/glibc

diff --cc ChangeLog
index 76a0d1d,1517156..bc1c0f1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,14 +1,18 @@@
+ 2009-08-24  Roland McGrath  <roland@redhat.com>
+ 
+       * sysdeps/unix/syscall-template.S: New file.
+       * sysdeps/unix/make-syscalls.sh: Generate rules to use it.
+       * sysdeps/unix/Makefile (omit-deps): Do not omit syscall stubs' deps.
+       (compile-syscall): Pass mkdep and -g options as normal.
+       (s-proto.d, s-proto-cancel.d): Don't "-include" these.
+       (common-generated): Don't add them here.
+ 
  2009-08-24  Ulrich Drepper  <drepper@redhat.com>
  
 +      * math/s_fdim.c: In case of overflows set errno.
 +      * math/s_fdimf.c: Likewise.
 +      * math/s_fdiml.c: Likewise.
 +
        * math/math.h: Define math_errhandling of __FAST_MATH__ is not defined.
        * sysdeps/i386/fpu/bits/mathinline.h: Undefine math_errhandling if we
        are using the inline optimizations.