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

[commits] r15494 - in /fsf/trunk/libc: ./ elf/ include/ inet/ locale/programs/ math/ nscd/ nss/ nss/nss_files/ po/ stdio-common/ stdli...



Author: eglibc
Date: Mon Oct 10 00:01:59 2011
New Revision: 15494

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

Added:
    fsf/trunk/libc/nscd/netgroupcache.c
    fsf/trunk/libc/nscd/nscd_netgroup.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_isinf_ns.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c
    fsf/trunk/libc/sysdeps/ieee754/flt-32/s_isinf_nsf.c
    fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_isinf_nsl.c
    fsf/trunk/libc/sysdeps/ieee754/ldbl-96/s_isinf_nsl.c
    fsf/trunk/libc/sysdeps/x86_64/memrchr.S
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/elf/dl-conflict.c
    fsf/trunk/libc/elf/dl-load.c
    fsf/trunk/libc/elf/dl-reloc.c
    fsf/trunk/libc/elf/do-rel.h
    fsf/trunk/libc/elf/dynamic-link.h
    fsf/trunk/libc/elf/rtld.c
    fsf/trunk/libc/include/dlfcn.h
    fsf/trunk/libc/include/math.h
    fsf/trunk/libc/inet/getnetgrent_r.c
    fsf/trunk/libc/locale/programs/locarchive.c
    fsf/trunk/libc/math/Makefile
    fsf/trunk/libc/math/divtc3.c
    fsf/trunk/libc/math/e_exp10.c
    fsf/trunk/libc/math/e_exp10f.c
    fsf/trunk/libc/math/e_exp10l.c
    fsf/trunk/libc/math/e_exp2l.c
    fsf/trunk/libc/math/e_j0l.c
    fsf/trunk/libc/math/e_j1l.c
    fsf/trunk/libc/math/e_jnl.c
    fsf/trunk/libc/math/e_lgammal_r.c
    fsf/trunk/libc/math/e_rem_pio2l.c
    fsf/trunk/libc/math/e_scalb.c
    fsf/trunk/libc/math/e_scalbf.c
    fsf/trunk/libc/math/e_scalbl.c
    fsf/trunk/libc/math/k_cosl.c
    fsf/trunk/libc/math/k_sinl.c
    fsf/trunk/libc/math/k_tanl.c
    fsf/trunk/libc/math/libm-test.inc
    fsf/trunk/libc/math/multc3.c
    fsf/trunk/libc/math/s_cacoshf.c
    fsf/trunk/libc/math/s_casin.c
    fsf/trunk/libc/math/s_casinf.c
    fsf/trunk/libc/math/s_casinl.c
    fsf/trunk/libc/math/s_catan.c
    fsf/trunk/libc/math/s_catanf.c
    fsf/trunk/libc/math/s_catanh.c
    fsf/trunk/libc/math/s_catanhf.c
    fsf/trunk/libc/math/s_catanhl.c
    fsf/trunk/libc/math/s_catanl.c
    fsf/trunk/libc/math/s_ccos.c
    fsf/trunk/libc/math/s_ccosf.c
    fsf/trunk/libc/math/s_ccosh.c
    fsf/trunk/libc/math/s_ccoshf.c
    fsf/trunk/libc/math/s_ccoshl.c
    fsf/trunk/libc/math/s_ccosl.c
    fsf/trunk/libc/math/s_cexp.c
    fsf/trunk/libc/math/s_cexpf.c
    fsf/trunk/libc/math/s_cexpl.c
    fsf/trunk/libc/math/s_clog.c
    fsf/trunk/libc/math/s_clog10.c
    fsf/trunk/libc/math/s_clog10f.c
    fsf/trunk/libc/math/s_clog10l.c
    fsf/trunk/libc/math/s_clogf.c
    fsf/trunk/libc/math/s_clogl.c
    fsf/trunk/libc/math/s_csin.c
    fsf/trunk/libc/math/s_csinf.c
    fsf/trunk/libc/math/s_csinh.c
    fsf/trunk/libc/math/s_csinhf.c
    fsf/trunk/libc/math/s_csinhl.c
    fsf/trunk/libc/math/s_csinl.c
    fsf/trunk/libc/math/s_csqrt.c
    fsf/trunk/libc/math/s_csqrtf.c
    fsf/trunk/libc/math/s_csqrtl.c
    fsf/trunk/libc/math/s_ctan.c
    fsf/trunk/libc/math/s_ctanf.c
    fsf/trunk/libc/math/s_ctanh.c
    fsf/trunk/libc/math/s_ctanhf.c
    fsf/trunk/libc/math/s_ctanhl.c
    fsf/trunk/libc/math/s_ctanl.c
    fsf/trunk/libc/math/s_ldexp.c
    fsf/trunk/libc/math/s_ldexpf.c
    fsf/trunk/libc/math/s_ldexpl.c
    fsf/trunk/libc/math/s_significand.c
    fsf/trunk/libc/math/s_significandf.c
    fsf/trunk/libc/math/s_significandl.c
    fsf/trunk/libc/math/w_acos.c
    fsf/trunk/libc/math/w_acosf.c
    fsf/trunk/libc/math/w_acosh.c
    fsf/trunk/libc/math/w_acoshf.c
    fsf/trunk/libc/math/w_acoshl.c
    fsf/trunk/libc/math/w_acosl.c
    fsf/trunk/libc/math/w_asin.c
    fsf/trunk/libc/math/w_asinf.c
    fsf/trunk/libc/math/w_asinl.c
    fsf/trunk/libc/math/w_atan2.c
    fsf/trunk/libc/math/w_atan2f.c
    fsf/trunk/libc/math/w_atan2l.c
    fsf/trunk/libc/math/w_atanh.c
    fsf/trunk/libc/math/w_atanhf.c
    fsf/trunk/libc/math/w_atanhl.c
    fsf/trunk/libc/math/w_cosh.c
    fsf/trunk/libc/math/w_coshf.c
    fsf/trunk/libc/math/w_coshl.c
    fsf/trunk/libc/math/w_dremf.c
    fsf/trunk/libc/math/w_exp10.c
    fsf/trunk/libc/math/w_exp10f.c
    fsf/trunk/libc/math/w_exp10l.c
    fsf/trunk/libc/math/w_exp2.c
    fsf/trunk/libc/math/w_exp2f.c
    fsf/trunk/libc/math/w_exp2l.c
    fsf/trunk/libc/math/w_fmod.c
    fsf/trunk/libc/math/w_fmodf.c
    fsf/trunk/libc/math/w_fmodl.c
    fsf/trunk/libc/math/w_hypot.c
    fsf/trunk/libc/math/w_hypotf.c
    fsf/trunk/libc/math/w_hypotl.c
    fsf/trunk/libc/math/w_j0.c
    fsf/trunk/libc/math/w_j0f.c
    fsf/trunk/libc/math/w_j0l.c
    fsf/trunk/libc/math/w_j1.c
    fsf/trunk/libc/math/w_j1f.c
    fsf/trunk/libc/math/w_j1l.c
    fsf/trunk/libc/math/w_jn.c
    fsf/trunk/libc/math/w_jnf.c
    fsf/trunk/libc/math/w_jnl.c
    fsf/trunk/libc/math/w_lgamma.c
    fsf/trunk/libc/math/w_lgamma_r.c
    fsf/trunk/libc/math/w_lgammaf.c
    fsf/trunk/libc/math/w_lgammaf_r.c
    fsf/trunk/libc/math/w_lgammal.c
    fsf/trunk/libc/math/w_lgammal_r.c
    fsf/trunk/libc/math/w_log.c
    fsf/trunk/libc/math/w_log10.c
    fsf/trunk/libc/math/w_log10f.c
    fsf/trunk/libc/math/w_log10l.c
    fsf/trunk/libc/math/w_log2.c
    fsf/trunk/libc/math/w_log2f.c
    fsf/trunk/libc/math/w_log2l.c
    fsf/trunk/libc/math/w_logf.c
    fsf/trunk/libc/math/w_logl.c
    fsf/trunk/libc/math/w_pow.c
    fsf/trunk/libc/math/w_powf.c
    fsf/trunk/libc/math/w_powl.c
    fsf/trunk/libc/math/w_remainder.c
    fsf/trunk/libc/math/w_remainderf.c
    fsf/trunk/libc/math/w_remainderl.c
    fsf/trunk/libc/math/w_scalb.c
    fsf/trunk/libc/math/w_scalbf.c
    fsf/trunk/libc/math/w_scalbl.c
    fsf/trunk/libc/math/w_sinh.c
    fsf/trunk/libc/math/w_sinhf.c
    fsf/trunk/libc/math/w_sinhl.c
    fsf/trunk/libc/math/w_sqrt.c
    fsf/trunk/libc/math/w_sqrtf.c
    fsf/trunk/libc/math/w_sqrtl.c
    fsf/trunk/libc/math/w_tgamma.c
    fsf/trunk/libc/math/w_tgammaf.c
    fsf/trunk/libc/math/w_tgammal.c
    fsf/trunk/libc/nscd/Makefile
    fsf/trunk/libc/nscd/cache.c
    fsf/trunk/libc/nscd/connections.c
    fsf/trunk/libc/nscd/grpcache.c
    fsf/trunk/libc/nscd/nscd-client.h
    fsf/trunk/libc/nscd/nscd.conf
    fsf/trunk/libc/nscd/nscd.h
    fsf/trunk/libc/nscd/nscd_conf.c
    fsf/trunk/libc/nscd/nscd_proto.h
    fsf/trunk/libc/nscd/selinux.c
    fsf/trunk/libc/nss/Versions
    fsf/trunk/libc/nss/getent.c
    fsf/trunk/libc/nss/nss_files/files-init.c
    fsf/trunk/libc/nss/nsswitch.c
    fsf/trunk/libc/nss/nsswitch.h
    fsf/trunk/libc/po/ca.po
    fsf/trunk/libc/po/ja.po
    fsf/trunk/libc/stdio-common/printf_fp.c
    fsf/trunk/libc/stdio-common/printf_fphex.c
    fsf/trunk/libc/stdio-common/printf_size.c
    fsf/trunk/libc/stdlib/longlong.h
    fsf/trunk/libc/string/test-memcmp.c
    fsf/trunk/libc/sunrpc/netname.c
    fsf/trunk/libc/sysdeps/i386/dl-machine.h
    fsf/trunk/libc/sysdeps/ia64/dl-machine.h
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_finite.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_isnan.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_isnan.c
    fsf/trunk/libc/sysdeps/ieee754/flt-32/s_finitef.c
    fsf/trunk/libc/sysdeps/ieee754/flt-32/s_isnanf.c
    fsf/trunk/libc/sysdeps/powerpc/fpu/libm-test-ulps
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/dl-machine.h
    fsf/trunk/libc/sysdeps/powerpc/powerpc64/dl-machine.h
    fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h
    fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h
    fsf/trunk/libc/sysdeps/sh/dl-machine.h
    fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h
    fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/time.c
    fsf/trunk/libc/sysdeps/x86_64/dl-machine.h
    fsf/trunk/libc/sysdeps/x86_64/fpu/math_private.h
    fsf/trunk/libc/sysdeps/x86_64/memchr.S
    fsf/trunk/libc/sysdeps/x86_64/multiarch/rawmemchr.S
    fsf/trunk/libc/sysdeps/x86_64/rawmemchr.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Oct 10 00:01:59 2011
@@ -1,3 +1,348 @@
+2011-10-09  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* po/ja.po: Update from translation team.
+
+2011-10-08  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* locale/programs/locarchive.c (prepare_address_space): New function.
+	(create_archive, enlarge_archive, open_archive): Use it.
+
+	* sysdeps/unix/sysv/linux/x86_64/time.c: Move #include <dl-vdso.h>
+	inside [SHARED], where it is used.
+
+	* nscd/nscd_proto.h: Declare __nscd_setnetgrent.
+
+	* nss/getent.c (netgroup_keys): Remove unused variable.
+	* sysdeps/ieee754/flt-32/s_isinf_nsf.c: Likewise.
+
+2011-10-08  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* include/math.h: Declare __isinf_ns, __isinf_nsf, __isinf_nsl.
+	* sysdeps/ieee754/dbl-64/s_isinf_ns.c: New file.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c: New file.
+	* sysdeps/ieee754/flt-32/s_isinf_nsf.c: New file.
+	* sysdeps/ieee754/ldbl-128/s_isinf_nsl.c: New file.
+	* sysdeps/ieee754/ldbl-96/s_isinf_nsl.c: New file.
+	* math/Makefile (libm-calls): Add s_isinf_ns.
+	* math/divtc3.c: Use __isinf_nsl instead of isinf.
+	* math/multc3.c: Likewise.
+	* math/s_casin.c: Likewise.
+	* math/s_casinf.c: Likewise.
+	* math/s_casinl.c: Likewise.
+	* math/s_ccos.c: Likewise.
+	* math/s_ccosf.c: Likewise.
+	* math/s_ccosl.c: Likewise.
+	* math/s_ctan.c: Likewise.
+	* math/s_ctanf.c: Likewise.
+	* math/s_ctanh.c: Likewise.
+	* math/s_ctanhf.c: Likewise.
+	* math/s_ctanhl.c: Likewise.
+	* math/s_ctanl.c: Likewise.
+	* math/w_fmod.c: Likewise.
+	* math/w_fmodf.c: Likewise.
+	* math/w_fmodl.c: Likewise.
+	* math/w_remainder.c: Likewise.
+	* math/w_remainderf.c: Likewise.
+	* math/w_remainderl.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_finite.c: Undefine __finite.
+	* sysdeps/ieee754/dbl-64/s_isnan.c: Undefine __isnan.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c: Undefine __finite.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_isnan.c: Undefine __nan.
+	* sysdeps/ieee754/flt-32/s_finitef.c: Undefine __finitef.
+	* sysdeps/ieee754/flt-32/s_isnanf.c: Undefine __nan.
+	* sysdeps/x86_64/fpu/math_private.h: Add optimized versions of __isnsn,
+	__isnanf, __isinf_ns, __isinf_nsf, __finite, and __finitef.
+
+	* stdio-common/printf_fp.c: Use the fact that isinf returns the sign
+	of the number.
+	* stdio-common/printf_fphex.c: Likewise.
+	* stdio-common/printf_size.c: Likewise.
+
+	* math/e_exp10.c: Include math_private.h using <...> not "...".
+	* math/e_exp10f.c: Likewise.
+	* math/e_exp10l.c: Likewise.
+	* math/e_exp2l.c: Likewise.
+	* math/e_j0l.c: Likewise.
+	* math/e_j1l.c: Likewise.
+	* math/e_jnl.c: Likewise.
+	* math/e_lgammal_r.c: Likewise.
+	* math/e_rem_pio2l.c: Likewise.
+	* math/e_scalb.c: Likewise.
+	* math/e_scalbf.c: Likewise.
+	* math/e_scalbl.c: Likewise.
+	* math/k_cosl.c: Likewise.
+	* math/k_sinl.c: Likewise.
+	* math/k_tanl.c: Likewise.
+	* math/s_cacoshf.c: Likewise.
+	* math/s_catan.c: Likewise.
+	* math/s_catanf.c: Likewise.
+	* math/s_catanh.c: Likewise.
+	* math/s_catanhf.c: Likewise.
+	* math/s_catanhl.c: Likewise.
+	* math/s_catanl.c: Likewise.
+	* math/s_ccosh.c: Likewise.
+	* math/s_ccoshf.c: Likewise.
+	* math/s_ccoshl.c: Likewise.
+	* math/s_cexp.c: Likewise.
+	* math/s_cexpf.c: Likewise.
+	* math/s_cexpl.c: Likewise.
+	* math/s_clog.c: Likewise.
+	* math/s_clog10.c: Likewise.
+	* math/s_clog10f.c: Likewise.
+	* math/s_clog10l.c: Likewise.
+	* math/s_clogf.c: Likewise.
+	* math/s_clogl.c: Likewise.
+	* math/s_csin.c: Likewise.
+	* math/s_csinf.c: Likewise.
+	* math/s_csinh.c: Likewise.
+	* math/s_csinhf.c: Likewise.
+	* math/s_csinhl.c: Likewise.
+	* math/s_csinl.c: Likewise.
+	* math/s_csqrt.c: Likewise.
+	* math/s_csqrtf.c: Likewise.
+	* math/s_csqrtl.c: Likewise.
+	* math/s_ctan.c: Likewise.
+	* math/s_ctanf.c: Likewise.
+	* math/s_ctanh.c: Likewise.
+	* math/s_ctanhf.c: Likewise.
+	* math/s_ctanhl.c: Likewise.
+	* math/s_ctanl.c: Likewise.
+	* math/s_ldexp.c: Likewise.
+	* math/s_ldexpf.c: Likewise.
+	* math/s_ldexpl.c: Likewise.
+	* math/s_significand.c: Likewise.
+	* math/s_significandf.c: Likewise.
+	* math/s_significandl.c: Likewise.
+	* math/w_acos.c: Likewise.
+	* math/w_acosf.c: Likewise.
+	* math/w_acosh.c: Likewise.
+	* math/w_acoshf.c: Likewise.
+	* math/w_acoshl.c: Likewise.
+	* math/w_acosl.c: Likewise.
+	* math/w_asin.c: Likewise.
+	* math/w_asinf.c: Likewise.
+	* math/w_asinl.c: Likewise.
+	* math/w_atan2.c: Likewise.
+	* math/w_atan2f.c: Likewise.
+	* math/w_atan2l.c: Likewise.
+	* math/w_atanh.c: Likewise.
+	* math/w_atanhf.c: Likewise.
+	* math/w_atanhl.c: Likewise.
+	* math/w_cosh.c: Likewise.
+	* math/w_coshf.c: Likewise.
+	* math/w_coshl.c: Likewise.
+	* math/w_dremf.c: Likewise.
+	* math/w_exp10.c: Likewise.
+	* math/w_exp10f.c: Likewise.
+	* math/w_exp10l.c: Likewise.
+	* math/w_exp2.c: Likewise.
+	* math/w_exp2f.c: Likewise.
+	* math/w_fmod.c: Likewise.
+	* math/w_fmodf.c: Likewise.
+	* math/w_fmodl.c: Likewise.
+	* math/w_hypot.c: Likewise.
+	* math/w_hypotf.c: Likewise.
+	* math/w_hypotl.c: Likewise.
+	* math/w_j0.c: Likewise.
+	* math/w_j0f.c: Likewise.
+	* math/w_j0l.c: Likewise.
+	* math/w_j1.c: Likewise.
+	* math/w_j1f.c: Likewise.
+	* math/w_j1l.c: Likewise.
+	* math/w_jn.c: Likewise.
+	* math/w_jnf.c: Likewise.
+	* math/w_jnl.c: Likewise.
+	* math/w_lgamma.c: Likewise.
+	* math/w_lgamma_r.c: Likewise.
+	* math/w_lgammaf.c: Likewise.
+	* math/w_lgammaf_r.c: Likewise.
+	* math/w_lgammal.c: Likewise.
+	* math/w_lgammal_r.c: Likewise.
+	* math/w_log.c: Likewise.
+	* math/w_log10.c: Likewise.
+	* math/w_log10f.c: Likewise.
+	* math/w_log10l.c: Likewise.
+	* math/w_log2.c: Likewise.
+	* math/w_log2f.c: Likewise.
+	* math/w_log2l.c: Likewise.
+	* math/w_logf.c: Likewise.
+	* math/w_logl.c: Likewise.
+	* math/w_pow.c: Likewise.
+	* math/w_powf.c: Likewise.
+	* math/w_powl.c: Likewise.
+	* math/w_remainder.c: Likewise.
+	* math/w_remainderf.c: Likewise.
+	* math/w_remainderl.c: Likewise.
+	* math/w_scalb.c: Likewise.
+	* math/w_scalbf.c: Likewise.
+	* math/w_scalbl.c: Likewise.
+	* math/w_sinh.c: Likewise.
+	* math/w_sinhf.c: Likewise.
+	* math/w_sinhl.c: Likewise.
+	* math/w_sqrt.c: Likewise.
+	* math/w_sqrtf.c: Likewise.
+	* math/w_sqrtl.c: Likewise.
+	* math/w_tgamma.c: Likewise.
+	* math/w_tgammaf.c: Likewise.
+	* math/w_tgammal.c: Likewise.
+
+	* po/ja.po: Update from translation team.
+
+2011-09-29  Andreas Jaeger  <aj@xxxxxxx>
+
+	[BZ #13179]
+	* sunrpc/netname.c (netname2host): Fix logic.
+
+	[BZ #6779]
+	[BZ #6783]
+	* math/w_remainderl.c (__remainderl): Handle (NaN, 0) and (Inf,y)
+	correctly.
+	* math/w_remainder.c (__remainder): Likewise.
+	* math/w_remainderf.c (__remainderf): Likewise.
+	* math/libm-test.inc (remainder_test): Add test cases.
+
+2011-10-04  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* stdlib/longlong.h: Update from GCC.  Fix zarch smul_ppmm and
+	sdiv_qrnnd.
+
+2011-10-07  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* string/test-memcmp.c: Avoid unncessary #defines.
+	Patch by Liubov Dmitrieva <liubov.dmitrieva@xxxxxxxxx>.
+
+2011-08-31  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
+
+	* sysdeps/x86_64/multiarch/rawmemchr.S: Update.
+	Use new sse2 version for core i3 - i7 as it's faster
+	than sse42 version.
+	(bit_Prefer_PMINUB_for_stringop): New.
+	* sysdeps/x86_64/rawmemchr.S: Update.
+	Replace with faster SSE2 version.
+	* sysdeps/x86_64/memrchr.S: New file.
+	* sysdeps/x86_64/memchr.S: Update.
+	Replace with faster SSE2 version.
+
+2011-09-12  Marek Polacek  <mpolacek@xxxxxxxxxx>
+
+	* elf/dl-load.c (lose): Add cast to avoid warning.
+
+2011-10-07  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* po/ca.po: Update from translation team.
+
+	* inet/getnetgrent_r.c: Hook up nscd.
+	* nscd/Makefile (routines): Add nscd_netgroup.
+	(nscd-modules): Add netgroupcache.
+	(CFLAGS-netgroupcache.c): Define.
+	* nscd/cache.c (readdfcts): Add entries for GETNETGRENT and INNETGR.
+	(cache_search): Add const to second parameter.
+	* nscd/connections.c (serv2str): Add entries for GETNETGRENT and
+	INNETGR.
+	(dbs): Add netgrdb entry.
+	(reqinfo): Add entries for GETNETGRENT, INNETGR, and GETFDNETGR.
+	(verify_persistent_db): Handle netgrdb.
+	(handle_request): Handle GETNETGRENT, INNETGR, and GETFDNETGR.
+	* nscd/nscd-client.h (request_type): Add GETNETGRENT, INNETGR, and
+	GETFDNETGR.
+	(netgroup_response_header): Define.
+	(innetgroup_response_header): Define.
+	(datahead): Add netgroup_response_header and innetgroup_response_header
+	elements.
+	* nscd/nscd.conf: Add entries for netgroup cache.
+	* nscd/nscd.h (dbtype): Add netgrdb.
+	(_PATH_NSCD_NETGROUP_DB): Define.
+	(netgroup_iov_disabled): Declare.
+	(xmalloc, xcalloc, xrealloc): Move declarations here.
+	(cache_search): Adjust prototype.
+	Add netgroup-related prototypes.
+	* nscd/nscd_conf.c (dbnames): Add netgrdb entry.
+	* nscd/nscd_proto.h (__nss_not_use_nscd_netgroup): Declare.
+	(__nscd_innetgr): Declare.
+	* nscd/selinux.c (perms): Use access_vector_t as element type and
+	add netgroup-related initializers.
+	* nscd/netgroupcache.c: New file.
+	* nscd/nscd_netgroup.c: New file.
+	* nss/Versions [libc] (GLIBC_PRIVATE): Export __nss_lookup.
+	* nss/getent.c (netgroup_keys): Use setnetgrent only for one parameter.
+	For four parameters use innetgr.
+	* nss/nss_files/files-init.c: Add definition and callback for netgr.
+	* nss/nsswitch.c (__nss_lookup): Add libc_hidden_def.
+	(__nss_disable_nscd): Set __nss_not_use_nscd_netgroup.
+	* nss/nsswitch.h (__nss_lookup): Add libc_hidden_proto.
+
+	* nscd/connections.c (register_traced_file): Don't register file
+	for disabled databases.
+
+2011-10-06  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nscd/grpcache.c (cache_addgr): Initialize written in all cases.
+
+	* nss/nsswitch.c (__nss_lookup_function): Fix order of deleting
+	from tree and freeing node.
+
+2011-09-25  Jiri Olsa  <jolsa@xxxxxxxxxx>
+
+	* nss/nsswitch.c (__nss_database_lookup): Handle
+	nss_parse_service_list out of memory case.
+
+2011-09-15  Jiri Olsa  <jolsa@xxxxxxxxxx>
+
+	* nss/nsswitch.c (__nss_lookup_function): Handle __tsearch
+	out of memory case.
+
+2011-10-04  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* include/dlfcn.h (__RTLD_NOIFUNC): Define.
+	* elf/do-rel.h (elf_dynamic_do_rel): Add parameter skip_ifunc and
+	pass it down.
+	* elf/dynamic-link.h: Adjust prototypes of elf_machine_rel,
+	elf_machine_rela, elf_machine_lazy_rel.
+	(_ELF_DYNAMIC_DO_RELOC): Add parameter skip_ifunc and pass it down.
+	(ELF_DYNAMIC_DO_REL): Likewise.
+	(ELF_DYNAMIC_DO_RELA): Likewise.
+	(ELF_DYNAMIC_RELOCATE): Likewise.
+	* elf/dl-reloc.c (_dl_relocate_object): Pass __RTLD_NOIFUNC down
+	to ELF_DYNAMIC_DO_REL.
+	* elf/rtld.c (_dl_start): Adjust use of ELF_DYNAMIC_RELOCATE.
+	(dl_main): In trace mode always set __RTLD_NOIFUNC.
+	* elf/dl-conflict.c (_dl_resolve_conflicts): Adjust call to
+	elf_machine_rela.
+	* sysdeps/i386/dl-machine.h (elf_machine_rel): Add parameter
+	skip_ifunc, don't call ifunc function if non-zero.
+	(elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	(elf_machine_lazy_rela): Likewise.
+	* sysdeps/ia64/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
+	Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
+	Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/s390/s390-32/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+	* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+
+2011-09-28  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nss/nss_files/files-init.c (_nss_files_init): Use static
+	initialization for all the *_traced_file variables.
+
+2011-09-28  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/powerpc/fpu/libm-test-ulps: Adjust ULPs for jn tests.
+
 2011-09-27  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	[BZ #13226]
@@ -39,6 +384,7 @@
 
 	* sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c: New file.
 
+	[BZ #13192]
 	* sysdeps/unix/sysv/linux/bits/in.h (IP_MULTICAST_ALL): Define.
 	Patch mostly by Neil Horman <nhorman@xxxxxxxxxxxxx>.
 

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Mon Oct 10 00:01:59 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-9-11
+GNU C Library NEWS -- history of user-visible changes.  2011-10-8
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -9,9 +9,9 @@
 
 * The following bugs are resolved with this release:
 
-  9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907, 12922,
-  12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118, 13123,
-  13134, 13138, 13150
+  6779, 6783, 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907,
+  12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118,
+  13123, 13134, 13138, 13150, 13179, 13192
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
@@ -30,13 +30,19 @@
   x86-64.
   Contributed by Liubov Dmitrieva.
 
-* Optimized strchrm strrchr for SSE on x86-32.
+* Optimized strchr and strrchr for SSE on x86-32.
   Contributed by Liubov Dmitrieva.
 
+* Optimized memchr, memrchr, rawmemchr for x86-64.
+  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.
+
+* nscd now also caches the netgroup database.
   Implemented by Ulrich Drepper.
 
 Version 2.14

Modified: fsf/trunk/libc/elf/dl-conflict.c
==============================================================================
--- fsf/trunk/libc/elf/dl-conflict.c (original)
+++ fsf/trunk/libc/elf/dl-conflict.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Resolve conflicts against already prelinked libraries.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2001.
 
@@ -69,7 +69,8 @@
     GL(dl_num_cache_relocations) += conflictend - conflict;
 
     for (; conflict < conflictend; ++conflict)
-      elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
+      elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset,
+			0);
   }
 #endif
 }

Modified: fsf/trunk/libc/elf/dl-load.c
==============================================================================
--- fsf/trunk/libc/elf/dl-load.c (original)
+++ fsf/trunk/libc/elf/dl-load.c Mon Oct 10 00:01:59 2011
@@ -889,7 +889,7 @@
   if (fd != -1)
     (void) __close (fd);
   if (l != NULL && l->l_origin != (char *) -1l)
-    free (l->l_origin);
+    free ((char *) l->l_origin);
   free (l);
   free (realname);
 

Modified: fsf/trunk/libc/elf/dl-reloc.c
==============================================================================
--- fsf/trunk/libc/elf/dl-reloc.c (original)
+++ fsf/trunk/libc/elf/dl-reloc.c Mon Oct 10 00:01:59 2011
@@ -162,6 +162,7 @@
   /* Initialize it to make the compiler happy.  */
   const char *errstring = NULL;
   int lazy = reloc_mode & RTLD_LAZY;
+  int skip_ifunc = reloc_mode & __RTLD_NOIFUNC;
 
 #ifdef SHARED
   /* If we are auditing, install the same handlers we need for profiling.  */
@@ -261,7 +262,7 @@
 
 #include "dynamic-link.h"
 
-    ELF_DYNAMIC_RELOCATE (l, lazy, consider_profiling);
+    ELF_DYNAMIC_RELOCATE (l, lazy, consider_profiling, skip_ifunc);
 
 #ifndef PROF
     if (__builtin_expect (consider_profiling, 0))

Modified: fsf/trunk/libc/elf/do-rel.h
==============================================================================
--- fsf/trunk/libc/elf/do-rel.h (original)
+++ fsf/trunk/libc/elf/do-rel.h Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Do relocations for ELF dynamic linking.
-   Copyright (C) 1995-2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-2003, 2004, 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
@@ -52,7 +52,7 @@
 auto inline void __attribute__ ((always_inline))
 elf_dynamic_do_rel (struct link_map *map,
 		    ElfW(Addr) reladdr, ElfW(Addr) relsize,
-		    int lazy)
+		    int lazy, int skip_ifunc)
 {
   const ElfW(Rel) *r = (const void *) reladdr;
   const ElfW(Rel) *end = (const void *) (reladdr + relsize);
@@ -66,7 +66,7 @@
     {
       /* Doing lazy PLT relocations; they need very little info.  */
       for (; r < end; ++r)
-	elf_machine_lazy_rel (map, l_addr, r);
+	elf_machine_lazy_rel (map, l_addr, r, skip_ifunc);
     }
   else
 #endif
@@ -119,14 +119,14 @@
 	      ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)] & 0x7fff;
 	      elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)],
 			       &map->l_versions[ndx],
-			       (void *) (l_addr + r->r_offset));
+			       (void *) (l_addr + r->r_offset), skip_ifunc);
 	    }
 	}
 #ifndef RTLD_BOOTSTRAP
       else
 	for (; r < end; ++r)
 	  elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL,
-			   (void *) (l_addr + r->r_offset));
+			   (void *) (l_addr + r->r_offset), skip_ifunc);
 #endif
     }
 }

Modified: fsf/trunk/libc/elf/dynamic-link.h
==============================================================================
--- fsf/trunk/libc/elf/dynamic-link.h (original)
+++ fsf/trunk/libc/elf/dynamic-link.h Mon Oct 10 00:01:59 2011
@@ -60,7 +60,7 @@
 auto inline void __attribute__((always_inline))
 elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
 		 const ElfW(Sym) *sym, const struct r_found_version *version,
-		 void *const reloc_addr);
+		 void *const reloc_addr, int skip_ifunc);
 auto inline void __attribute__((always_inline))
 elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
 			  void *const reloc_addr);
@@ -69,7 +69,7 @@
 auto inline void __attribute__((always_inline))
 elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 		  const ElfW(Sym) *sym, const struct r_found_version *version,
-		  void *const reloc_addr);
+		  void *const reloc_addr, int skip_ifunc);
 auto inline void __attribute__((always_inline))
 elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
 			   void *const reloc_addr);
@@ -77,11 +77,13 @@
 # if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL
 auto inline void __attribute__((always_inline))
 elf_machine_lazy_rel (struct link_map *map,
-		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc);
+		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+		      int skip_ifunc);
 # else
 auto inline void __attribute__((always_inline))
 elf_machine_lazy_rel (struct link_map *map,
-		      ElfW(Addr) l_addr, const ElfW(Rela) *reloc);
+		      ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
+		      int skip_ifunc);
 # endif
 #endif
 
@@ -254,7 +256,7 @@
    not happen we do something more optimal.  */
 
 # ifdef ELF_MACHINE_PLTREL_OVERLAP
-#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \
+#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \
   do {									      \
     struct { ElfW(Addr) start, size; int lazy; } ranges[3];		      \
     int ranges_index;							      \
@@ -284,10 +286,11 @@
       elf_dynamic_do_##reloc ((map),					      \
 			      ranges[ranges_index].start,		      \
 			      ranges[ranges_index].size,		      \
-			      ranges[ranges_index].lazy);		      \
+			      ranges[ranges_index].lazy,		      \
+			      skip_ifunc);				      \
   } while (0)
 # else
-#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \
+#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \
   do {									      \
     struct { ElfW(Addr) start, size; int lazy; } ranges[2];		      \
     ranges[0].lazy = 0;							      \
@@ -324,7 +327,8 @@
       }									      \
 									      \
     if (ELF_DURING_STARTUP)						      \
-      elf_dynamic_do_##reloc ((map), ranges[0].start, ranges[0].size, 0);     \
+      elf_dynamic_do_##reloc ((map), ranges[0].start, ranges[0].size, 0,      \
+			      skip_ifunc);				      \
     else								      \
       {									      \
 	int ranges_index;						      \
@@ -332,7 +336,8 @@
 	  elf_dynamic_do_##reloc ((map),				      \
 				  ranges[ranges_index].start,		      \
 				  ranges[ranges_index].size,		      \
-				  ranges[ranges_index].lazy);		      \
+				  ranges[ranges_index].lazy,		      \
+				  skip_ifunc);				      \
       }									      \
   } while (0)
 # endif
@@ -345,29 +350,29 @@
 
 # if ! ELF_MACHINE_NO_REL
 #  include "do-rel.h"
-#  define ELF_DYNAMIC_DO_REL(map, lazy) \
-  _ELF_DYNAMIC_DO_RELOC (REL, rel, map, lazy, _ELF_CHECK_REL)
-# else
-#  define ELF_DYNAMIC_DO_REL(map, lazy) /* Nothing to do.  */
+#  define ELF_DYNAMIC_DO_REL(map, lazy, skip_ifunc) \
+  _ELF_DYNAMIC_DO_RELOC (REL, rel, map, lazy, skip_ifunc, _ELF_CHECK_REL)
+# else
+#  define ELF_DYNAMIC_DO_REL(map, lazy, skip_ifunc) /* Nothing to do.  */
 # endif
 
 # if ! ELF_MACHINE_NO_RELA
 #  define DO_RELA
 #  include "do-rel.h"
-#  define ELF_DYNAMIC_DO_RELA(map, lazy) \
-  _ELF_DYNAMIC_DO_RELOC (RELA, rela, map, lazy, _ELF_CHECK_REL)
-# else
-#  define ELF_DYNAMIC_DO_RELA(map, lazy) /* Nothing to do.  */
+#  define ELF_DYNAMIC_DO_RELA(map, lazy, skip_ifunc) \
+  _ELF_DYNAMIC_DO_RELOC (RELA, rela, map, lazy, skip_ifunc, _ELF_CHECK_REL)
+# else
+#  define ELF_DYNAMIC_DO_RELA(map, lazy, skip_ifunc) /* Nothing to do.  */
 # endif
 
 /* This can't just be an inline function because GCC is too dumb
    to inline functions containing inlines themselves.  */
-# define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile) \
+# define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile, skip_ifunc) \
   do {									      \
     int edr_lazy = elf_machine_runtime_setup ((map), (lazy),		      \
 					      (consider_profile));	      \
-    ELF_DYNAMIC_DO_REL ((map), edr_lazy);				      \
-    ELF_DYNAMIC_DO_RELA ((map), edr_lazy);				      \
+    ELF_DYNAMIC_DO_REL ((map), edr_lazy, skip_ifunc);			      \
+    ELF_DYNAMIC_DO_RELA ((map), edr_lazy, skip_ifunc);			      \
   } while (0)
 
 #endif

Modified: fsf/trunk/libc/elf/rtld.c
==============================================================================
--- fsf/trunk/libc/elf/rtld.c (original)
+++ fsf/trunk/libc/elf/rtld.c Mon Oct 10 00:01:59 2011
@@ -544,7 +544,7 @@
       /* Relocate ourselves so we can do normal function calls and
 	 data access using the global offset table.  */
 
-      ELF_DYNAMIC_RELOCATE (&bootstrap_map, 0, 0);
+      ELF_DYNAMIC_RELOCATE (&bootstrap_map, 0, 0, 0);
     }
   bootstrap_map.l_relocated = 1;
 
@@ -1951,8 +1951,9 @@
 
 	  /* Relocate the main executable.  */
 	  struct relocate_args args = { .l = l,
-					.reloc_mode = (GLRO(dl_lazy)
-						       ? RTLD_LAZY : 0) };
+					.reloc_mode = ((GLRO(dl_lazy)
+						       ? RTLD_LAZY : 0)
+						       | __RTLD_NOIFUNC) };
 	  _dl_receive_error (print_unresolved, relocate_doit, &args);
 
 	  /* This loop depends on the dependencies of the executable to
@@ -2029,7 +2030,8 @@
 	      struct relocate_args args;
 	      unsigned int i;
 
-	      args.reloc_mode = GLRO(dl_lazy) ? RTLD_LAZY : 0;
+	      args.reloc_mode = ((GLRO(dl_lazy) ? RTLD_LAZY : 0)
+				 | __RTLD_NOIFUNC);
 
 	      i = main_map->l_searchlist.r_nlist;
 	      while (i-- > 0)
@@ -2049,7 +2051,7 @@
 		  /* Mark the link map as not yet relocated again.  */
 		  GL(dl_rtld_map).l_relocated = 0;
 		  _dl_relocate_object (&GL(dl_rtld_map),
-				       main_map->l_scope, 0, 0);
+				       main_map->l_scope, __RTLD_NOIFUNC, 0);
 		}
 	    }
 #define VERNEEDTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (DT_VERNEED))

Modified: fsf/trunk/libc/include/dlfcn.h
==============================================================================
--- fsf/trunk/libc/include/dlfcn.h (original)
+++ fsf/trunk/libc/include/dlfcn.h Mon Oct 10 00:01:59 2011
@@ -10,6 +10,7 @@
 #define __RTLD_CALLMAP	0x10000000
 #define __RTLD_AUDIT	0x08000000
 #define __RTLD_SECURE	0x04000000 /* Apply additional security checks.  */
+#define __RTLD_NOIFUNC	0x02000000 /* Suppress calling ifunc functions.  */
 
 #define __LM_ID_CALLER	-2
 

Modified: fsf/trunk/libc/include/math.h
==============================================================================
--- fsf/trunk/libc/include/math.h (original)
+++ fsf/trunk/libc/include/math.h Mon Oct 10 00:01:59 2011
@@ -31,4 +31,8 @@
 libm_hidden_proto (__expm1l)
 # endif
 
+extern int __isinf_ns (double);
+extern int __isinf_nsf (float);
+extern int __isinf_nsl (long double);
+
 #endif

Modified: fsf/trunk/libc/inet/getnetgrent_r.c
==============================================================================
--- fsf/trunk/libc/inet/getnetgrent_r.c (original)
+++ fsf/trunk/libc/inet/getnetgrent_r.c Mon Oct 10 00:01:59 2011
@@ -28,6 +28,7 @@
 #include "netgroup.h"
 #include "nsswitch.h"
 #include <sysdep.h>
+#include <nscd/nscd_proto.h>
 
 
 /* Protect above variable against multiple uses at the same time.  */
@@ -101,7 +102,7 @@
 {
   enum nss_status (*endfct) (struct __netgrent *);
 
-  if (datap->nip == NULL)
+  if (datap->nip == NULL || datap->nip == (service_user *) -1l)
     return;
 
   endfct = __nss_lookup_function (datap->nip, "endnetgrent");
@@ -189,8 +190,21 @@
 
   __libc_lock_lock (lock);
 
+  if (__nss_not_use_nscd_netgroup > 0
+      && ++__nss_not_use_nscd_netgroup > NSS_NSCD_RETRY)
+    __nss_not_use_nscd_netgroup = 0;
+
+  if (!__nss_not_use_nscd_netgroup
+      && !__nss_database_custom[NSS_DBSIDX_netgroup])
+    {
+      result = __nscd_setnetgrent (group, &dataset);
+      if (result >= 0)
+	goto out;
+    }
+
   result = internal_setnetgrent (group, &dataset);
 
+ out:
   __libc_lock_unlock (lock);
 
   return result;
@@ -226,6 +240,26 @@
 			    char *buffer, size_t buflen, int *errnop);
 libc_hidden_proto (internal_getnetgrent_r)
 
+
+static enum nss_status
+nscd_getnetgrent (struct __netgrent *datap, char *buffer, size_t buflen,
+		  int *errnop)
+{
+  if (datap->cursor >= datap->data + datap->data_size)
+    return NSS_STATUS_UNAVAIL;
+
+  datap->type = triple_val;
+  datap->val.triple.host = datap->cursor;
+  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+  datap->val.triple.user = datap->cursor;
+  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+  datap->val.triple.domain = datap->cursor;
+  datap->cursor = (char *) rawmemchr (datap->cursor, '\0') + 1;
+
+  return NSS_STATUS_SUCCESS;
+}
+
+
 int
 internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
 			  struct __netgrent *datap,
@@ -239,9 +273,18 @@
   /* Run through available functions, starting with the same function last
      run.  We will repeat each function as long as it succeeds, and then go
      on to the next service action.  */
-  int no_more = (datap->nip == NULL
-		 || (fct = __nss_lookup_function (datap->nip, "getnetgrent_r"))
-		    == NULL);
+  int no_more = datap->nip == NULL;
+  if (! no_more)
+    {
+      if (datap->nip == (service_user *) -1l)
+	fct = nscd_getnetgrent;
+      else
+	{
+	  fct = __nss_lookup_function (datap->nip, "getnetgrent_r");
+	  no_more = fct == NULL;
+	}
+    }
+
   while (! no_more)
     {
       status = DL_CALL_FCT (*fct, (datap, buffer, buflen, &errno));
@@ -342,6 +385,18 @@
 innetgr (const char *netgroup, const char *host, const char *user,
 	 const char *domain)
 {
+  if (__nss_not_use_nscd_netgroup > 0
+      && ++__nss_not_use_nscd_netgroup > NSS_NSCD_RETRY)
+    __nss_not_use_nscd_netgroup = 0;
+
+  if (!__nss_not_use_nscd_netgroup
+      && !__nss_database_custom[NSS_DBSIDX_netgroup])
+    {
+      int result = __nscd_innetgr (netgroup, host, user, domain);
+      if (result >= 0)
+	return result;
+    }
+
   union
   {
     enum nss_status (*f) (const char *, struct __netgrent *);
@@ -453,7 +508,7 @@
 	  entry.needed_groups = tmp->next;
 	  tmp->next = entry.known_groups;
 	  entry.known_groups = tmp;
-	  current_group = entry.known_groups->name;
+	  current_group = tmp->name;
 	  continue;
 	}
 

Modified: fsf/trunk/libc/locale/programs/locarchive.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locarchive.c (original)
+++ fsf/trunk/libc/locale/programs/locarchive.c Mon Oct 10 00:01:59 2011
@@ -74,6 +74,29 @@
 /* Size of the reserved address space area.  */
 #define RESERVE_MMAP_SIZE	512 * 1024 * 1024
 
+/* To prepare for enlargements of the mmaped area reserve some address
+   space.  On some machines, being a file mapping rather than an anonymous
+   mapping affects the address selection.  So do this mapping from the
+   actual file, even though it's only a dummy to reserve address space.  */
+static void *
+prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags)
+{
+  if (total < RESERVE_MMAP_SIZE)
+    {
+      void *p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_SHARED, fd, 0);
+      if (p != MAP_FAILED)
+        {
+          *reserved = RESERVE_MMAP_SIZE;
+          *xflags = MAP_FIXED;
+          return p;
+        }
+    }
+
+  *reserved = total;
+  *xflags = 0;
+  return NULL;
+}
+
 
 static void
 create_archive (const char *archivefname, struct locarhandle *ah)
@@ -81,7 +104,6 @@
   int fd;
   char fname[strlen (archivefname) + sizeof (".XXXXXX")];
   struct locarhead head;
-  void *p;
   size_t total;
 
   strcpy (stpcpy (fname, archivefname), ".XXXXXX");
@@ -129,19 +151,9 @@
       error (EXIT_FAILURE, errval, _("cannot resize archive file"));
     }
 
-  /* To prepare for enlargements of the mmaped area reserve some
-     address space.  */
-  size_t reserved = RESERVE_MMAP_SIZE;
-  int xflags = 0;
-  if (total < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-		       -1, 0)) != MAP_FAILED))
-    xflags = MAP_FIXED;
-  else
-    {
-      p = NULL;
-      reserved = total;
-    }
+  size_t reserved;
+  int xflags;
+  void *p = prepare_address_space (fd, total, &reserved, &xflags);
 
   /* Map the header and all the administration data structures.  */
   p = mmap64 (p, total, PROT_READ | PROT_WRITE, MAP_SHARED | xflags, fd, 0);
@@ -297,7 +309,6 @@
   int fd;
   struct locarhead newhead;
   size_t total;
-  void *p;
   unsigned int cnt, loccnt;
   struct namehashent *oldnamehashtab;
   struct locarhandle new_ah;
@@ -390,19 +401,9 @@
       error (EXIT_FAILURE, errval, _("cannot resize archive file"));
     }
 
-  /* To prepare for enlargements of the mmaped area reserve some
-     address space.  */
-  size_t reserved = RESERVE_MMAP_SIZE;
-  int xflags = 0;
-  if (total < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-		       -1, 0)) != MAP_FAILED))
-    xflags = MAP_FIXED;
-  else
-    {
-      p = NULL;
-      reserved = total;
-    }
+  size_t reserved;
+  int xflags;
+  void *p = prepare_address_space (fd, total, &reserved, &xflags);
 
   /* Map the header and all the administration data structures.  */
   p = mmap64 (p, total, PROT_READ | PROT_WRITE, MAP_SHARED | xflags, fd, 0);
@@ -605,20 +606,9 @@
   ah->fd = fd;
   ah->mmaped = st.st_size;
 
-  /* To prepare for enlargements of the mmaped area reserve some
-     address space.  */
-  size_t reserved = RESERVE_MMAP_SIZE;
-  int xflags = 0;
-  void *p;
-  if (st.st_size < reserved
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-		       -1, 0)) != MAP_FAILED))
-    xflags = MAP_FIXED;
-  else
-    {
-      p = NULL;
-      reserved = st.st_size;
-    }
+  size_t reserved;
+  int xflags;
+  void *p = prepare_address_space (fd, st.st_size, &reserved, &xflags);
 
   /* Map the entire file.  We might need to compare the category data
      in the file with the newly added data.  */

Modified: fsf/trunk/libc/math/Makefile
==============================================================================
--- fsf/trunk/libc/math/Makefile (original)
+++ fsf/trunk/libc/math/Makefile Mon Oct 10 00:01:59 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2001,2002,2003,2004,2005,2006
+# Copyright (C) 1996-2001,2002,2003,2004,2005,2006,2011
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -60,7 +60,7 @@
 	     s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos	\
 	     s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
 	     s_fma s_lrint s_llrint s_lround s_llround e_exp10 w_log2	\
-	     $(calls:s_%=m_%)
+	     s_isinf_ns $(calls:s_%=m_%)
 
 include ../Makeconfig
 

Modified: fsf/trunk/libc/math/divtc3.c
==============================================================================
--- fsf/trunk/libc/math/divtc3.c (original)
+++ fsf/trunk/libc/math/divtc3.c Mon Oct 10 00:01:59 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <rth@xxxxxxxxxx>, 2005.
 
@@ -55,17 +55,19 @@
 	  x = __copysignl (INFINITY, c) * a;
 	  y = __copysignl (INFINITY, c) * b;
 	}
-      else if ((isinf (a) || isinf (b)) && isfinite (c) && isfinite (d))
+      else if ((__isinf_nsl (a) || __isinf_nsl (b))
+	       && isfinite (c) && isfinite (d))
 	{
-	  a = __copysignl (isinf (a) ? 1 : 0, a);
-	  b = __copysignl (isinf (b) ? 1 : 0, b);
+	  a = __copysignl (__isinf_nsl (a) ? 1 : 0, a);
+	  b = __copysignl (__isinf_nsl (b) ? 1 : 0, b);
 	  x = INFINITY * (a * c + b * d);
 	  y = INFINITY * (b * c - a * d);
 	}
-      else if ((isinf (c) || isinf (d)) && isfinite (a) && isfinite (b))
+      else if ((__isinf_nsl (c) || __isinf_nsl (d))
+	       && isfinite (a) && isfinite (b))
 	{
-	  c = __copysignl (isinf (c) ? 1 : 0, c);
-	  d = __copysignl (isinf (d) ? 1 : 0, d);
+	  c = __copysignl (__isinf_nsl (c) ? 1 : 0, c);
+	  d = __copysignl (__isinf_nsl (d) ? 1 : 0, d);
 	  x = 0.0 * (a * c + b * d);
 	  y = 0.0 * (b * c - a * d);
 	}

Modified: fsf/trunk/libc/math/e_exp10.c
==============================================================================
--- fsf/trunk/libc/math/e_exp10.c (original)
+++ fsf/trunk/libc/math/e_exp10.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 double

Modified: fsf/trunk/libc/math/e_exp10f.c
==============================================================================
--- fsf/trunk/libc/math/e_exp10f.c (original)
+++ fsf/trunk/libc/math/e_exp10f.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 float

Modified: fsf/trunk/libc/math/e_exp10l.c
==============================================================================
--- fsf/trunk/libc/math/e_exp10l.c (original)
+++ fsf/trunk/libc/math/e_exp10l.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 long double

Modified: fsf/trunk/libc/math/e_exp2l.c
==============================================================================
--- fsf/trunk/libc/math/e_exp2l.c (original)
+++ fsf/trunk/libc/math/e_exp2l.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __ieee754_exp2l (long double x)

Modified: fsf/trunk/libc/math/e_j0l.c
==============================================================================
--- fsf/trunk/libc/math/e_j0l.c (original)
+++ fsf/trunk/libc/math/e_j0l.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __ieee754_j0l (long double x)

Modified: fsf/trunk/libc/math/e_j1l.c
==============================================================================
--- fsf/trunk/libc/math/e_j1l.c (original)
+++ fsf/trunk/libc/math/e_j1l.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __ieee754_j1l (long double x)

Modified: fsf/trunk/libc/math/e_jnl.c
==============================================================================
--- fsf/trunk/libc/math/e_jnl.c (original)
+++ fsf/trunk/libc/math/e_jnl.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __ieee754_jnl (int n, long double x)

Modified: fsf/trunk/libc/math/e_lgammal_r.c
==============================================================================
--- fsf/trunk/libc/math/e_lgammal_r.c (original)
+++ fsf/trunk/libc/math/e_lgammal_r.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __ieee754_lgammal_r (long double x, int *signgamp)

Modified: fsf/trunk/libc/math/e_rem_pio2l.c
==============================================================================
--- fsf/trunk/libc/math/e_rem_pio2l.c (original)
+++ fsf/trunk/libc/math/e_rem_pio2l.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 int
 __ieee754_rem_pio2l (long double x, long double *y)

Modified: fsf/trunk/libc/math/e_scalb.c
==============================================================================
--- fsf/trunk/libc/math/e_scalb.c (original)
+++ fsf/trunk/libc/math/e_scalb.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 
 #include <fenv.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef _SCALB_INT
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/e_scalbf.c
==============================================================================
--- fsf/trunk/libc/math/e_scalbf.c (original)
+++ fsf/trunk/libc/math/e_scalbf.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
 
 #include <fenv.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef _SCALB_INT
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/e_scalbl.c
==============================================================================
--- fsf/trunk/libc/math/e_scalbl.c (original)
+++ fsf/trunk/libc/math/e_scalbl.c Mon Oct 10 00:01:59 2011
@@ -26,7 +26,7 @@
 
 #include <fenv.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef _SCALB_INT
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/k_cosl.c
==============================================================================
--- fsf/trunk/libc/math/k_cosl.c (original)
+++ fsf/trunk/libc/math/k_cosl.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __kernel_cosl (long double x, long double y)

Modified: fsf/trunk/libc/math/k_sinl.c
==============================================================================
--- fsf/trunk/libc/math/k_sinl.c (original)
+++ fsf/trunk/libc/math/k_sinl.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __kernel_sinl (long double x, long double y, int iy)

Modified: fsf/trunk/libc/math/k_tanl.c
==============================================================================
--- fsf/trunk/libc/math/k_tanl.c (original)
+++ fsf/trunk/libc/math/k_tanl.c Mon Oct 10 00:01:59 2011
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <errno.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __kernel_tanl (long double x, long double y, int iy)

Modified: fsf/trunk/libc/math/libm-test.inc
==============================================================================
--- fsf/trunk/libc/math/libm-test.inc (original)
+++ fsf/trunk/libc/math/libm-test.inc Mon Oct 10 00:01:59 2011
@@ -189,7 +189,7 @@
 
 
 #define MANT_DIG CHOOSE ((LDBL_MANT_DIG-1), (DBL_MANT_DIG-1), (FLT_MANT_DIG-1),  \
-                         (LDBL_MANT_DIG-1), (DBL_MANT_DIG-1), (FLT_MANT_DIG-1))
+			 (LDBL_MANT_DIG-1), (DBL_MANT_DIG-1), (FLT_MANT_DIG-1))
 
 static void
 init_max_error (void)
@@ -4940,11 +4940,27 @@
 
   START (remainder);
 
+  errno = 0;
   TEST_ff_f (remainder, 1, 0, nan_value, INVALID_EXCEPTION);
+  check_int ("errno for remainder(1, 0) = EDOM ", errno, EDOM, 0, 0, 0);
+  errno = 0;
   TEST_ff_f (remainder, 1, minus_zero, nan_value, INVALID_EXCEPTION);
+  check_int ("errno for remainder(1, -0) = EDOM ", errno, EDOM, 0, 0, 0);
+  errno = 0;
   TEST_ff_f (remainder, plus_infty, 1, nan_value, INVALID_EXCEPTION);
+  check_int ("errno for remainder(INF, 1) = EDOM ", errno, EDOM, 0, 0, 0);
+  errno = 0;
   TEST_ff_f (remainder, minus_infty, 1, nan_value, INVALID_EXCEPTION);
+  check_int ("errno for remainder(-INF, 1) = EDOM ", errno, EDOM, 0, 0, 0);
+  errno = 0;
   TEST_ff_f (remainder, nan_value, nan_value, nan_value);
+  check_int ("errno for remainder(NAN, NAN) unchanged", errno, 0, 0, 0, 0);
+  errno = 0;
+  TEST_ff_f (remainder, 0, nan_value, nan_value);
+  check_int ("errno for remainder(0, NAN) unchanged", errno, 0, 0, 0, 0);
+  errno = 0;
+  TEST_ff_f (remainder, nan_value, 0, nan_value);
+  check_int ("errno for remainder(NaN, 0) unchanged", errno, 0, 0, 0, 0);
 
   TEST_ff_f (remainder, 1.625, 1.0, -0.375);
   TEST_ff_f (remainder, -1.625, 1.0, 0.375);

Modified: fsf/trunk/libc/math/multc3.c
==============================================================================
--- fsf/trunk/libc/math/multc3.c (original)
+++ fsf/trunk/libc/math/multc3.c Mon Oct 10 00:01:59 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <rth@xxxxxxxxxx>, 2005.
 
@@ -39,28 +39,29 @@
     {
       /* Recover infinities that computed as NaN + iNaN.  */
       bool recalc = 0;
-      if (isinf (a) || isinf (b))
+      if (__isinf_nsl (a) || __isinf_nsl (b))
 	{
 	  /* z is infinite.  "Box" the infinity and change NaNs in
 	     the other factor to 0.  */
-	  a = __copysignl (isinf (a) ? 1 : 0, a);
-	  b = __copysignl (isinf (b) ? 1 : 0, b);
+	  a = __copysignl (__isinf_nsl (a) ? 1 : 0, a);
+	  b = __copysignl (__isinf_nsl (b) ? 1 : 0, b);
 	  if (isnan (c)) c = __copysignl (0, c);
 	  if (isnan (d)) d = __copysignl (0, d);
 	  recalc = 1;
 	}
-     if (isinf (c) || isinf (d))
+     if (__isinf_nsl (c) || __isinf_nsl (d))
 	{
 	  /* w is infinite.  "Box" the infinity and change NaNs in
 	     the other factor to 0.  */
-	  c = __copysignl (isinf (c) ? 1 : 0, c);
-	  d = __copysignl (isinf (d) ? 1 : 0, d);
+	  c = __copysignl (__isinf_nsl (c) ? 1 : 0, c);
+	  d = __copysignl (__isinf_nsl (d) ? 1 : 0, d);
 	  if (isnan (a)) a = __copysignl (0, a);
 	  if (isnan (b)) b = __copysignl (0, b);
 	  recalc = 1;
 	}
      if (!recalc
-	  && (isinf (ac) || isinf (bd) || isinf (ad) || isinf (bc)))
+	  && (__isinf_nsl (ac) || __isinf_nsl (bd)
+	      || __isinf_nsl (ad) || __isinf_nsl (bc)))
 	{
 	  /* Recover infinities from overflow by changing NaNs to 0.  */
 	  if (isnan (a)) a = __copysignl (0, a);

Modified: fsf/trunk/libc/math/s_cacoshf.c
==============================================================================
--- fsf/trunk/libc/math/s_cacoshf.c (original)
+++ fsf/trunk/libc/math/s_cacoshf.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 __complex__ float
 __cacoshf (__complex__ float x)

Modified: fsf/trunk/libc/math/s_casin.c
==============================================================================
--- fsf/trunk/libc/math/s_casin.c (original)
+++ fsf/trunk/libc/math/s_casin.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return arc sine of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,6 +20,7 @@
 
 #include <complex.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ double
@@ -33,7 +34,7 @@
 	{
 	  res = x;
 	}
-      else if (__isinf (__real__ x) || __isinf (__imag__ x))
+      else if (__isinf_ns (__real__ x) || __isinf_ns (__imag__ x))
 	{
 	  __real__ res = __nan ("");
 	  __imag__ res = __copysign (HUGE_VAL, __imag__ x);

Modified: fsf/trunk/libc/math/s_casinf.c
==============================================================================
--- fsf/trunk/libc/math/s_casinf.c (original)
+++ fsf/trunk/libc/math/s_casinf.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return arc sine of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,6 +20,7 @@
 
 #include <complex.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ float
@@ -33,7 +34,7 @@
 	{
 	  res = x;
 	}
-      else if (__isinff (__real__ x) || __isinff (__imag__ x))
+      else if (__isinf_nsf (__real__ x) || __isinf_nsf (__imag__ x))
 	{
 	  __real__ res = __nanf ("");
 	  __imag__ res = __copysignf (HUGE_VALF, __imag__ x);

Modified: fsf/trunk/libc/math/s_casinl.c
==============================================================================
--- fsf/trunk/libc/math/s_casinl.c (original)
+++ fsf/trunk/libc/math/s_casinl.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return arc sine of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -20,6 +20,7 @@
 
 #include <complex.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ long double
@@ -33,7 +34,7 @@
 	{
 	  res = x;
 	}
-      else if (__isinfl (__real__ x) || __isinfl (__imag__ x))
+      else if (__isinf_nsl (__real__ x) || __isinf_nsl (__imag__ x))
 	{
 	  __real__ res = __nanl ("");
 	  __imag__ res = __copysignl (HUGE_VALL, __imag__ x);

Modified: fsf/trunk/libc/math/s_catan.c
==============================================================================
--- fsf/trunk/libc/math/s_catan.c (original)
+++ fsf/trunk/libc/math/s_catan.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_catanf.c
==============================================================================
--- fsf/trunk/libc/math/s_catanf.c (original)
+++ fsf/trunk/libc/math/s_catanf.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_catanh.c
==============================================================================
--- fsf/trunk/libc/math/s_catanh.c (original)
+++ fsf/trunk/libc/math/s_catanh.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_catanhf.c
==============================================================================
--- fsf/trunk/libc/math/s_catanhf.c (original)
+++ fsf/trunk/libc/math/s_catanhf.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_catanhl.c
==============================================================================
--- fsf/trunk/libc/math/s_catanhl.c (original)
+++ fsf/trunk/libc/math/s_catanhl.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_catanl.c
==============================================================================
--- fsf/trunk/libc/math/s_catanl.c (original)
+++ fsf/trunk/libc/math/s_catanl.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_ccos.c
==============================================================================
--- fsf/trunk/libc/math/s_ccos.c (original)
+++ fsf/trunk/libc/math/s_ccos.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return cosine of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -21,6 +21,7 @@
 #include <complex.h>
 #include <fenv.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ double
@@ -36,17 +37,17 @@
 	  __imag__ res = 0.0;
 
 #ifdef FE_INVALID
-	  if (__isinf (__real__ x))
+	  if (__isinf_ns (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}
-      else if (__isinf (__imag__ x))
+      else if (__isinf_ns (__imag__ x))
 	{
 	  __real__ res = HUGE_VAL;
 	  __imag__ res = __nan ("");
 
 #ifdef FE_INVALID
-	  if (__isinf (__real__ x))
+	  if (__isinf_ns (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ccosf.c
==============================================================================
--- fsf/trunk/libc/math/s_ccosf.c (original)
+++ fsf/trunk/libc/math/s_ccosf.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return cosine of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -21,6 +21,7 @@
 #include <complex.h>
 #include <fenv.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ float
@@ -36,17 +37,17 @@
 	  __imag__ res = 0.0;
 
 #ifdef FE_INVALID
-	  if (__isinff (__real__ x))
+	  if (__isinf_nsf (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}
-      else if (__isinff (__imag__ x))
+      else if (__isinf_nsf (__imag__ x))
 	{
 	  __real__ res = HUGE_VALF;
 	  __imag__ res = __nanf ("");
 
 #ifdef FE_INVALID
-	  if (__isinff (__real__ x))
+	  if (__isinf_nsf (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ccosh.c
==============================================================================
--- fsf/trunk/libc/math/s_ccosh.c (original)
+++ fsf/trunk/libc/math/s_ccosh.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_ccoshf.c
==============================================================================
--- fsf/trunk/libc/math/s_ccoshf.c (original)
+++ fsf/trunk/libc/math/s_ccoshf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_ccoshl.c
==============================================================================
--- fsf/trunk/libc/math/s_ccoshl.c (original)
+++ fsf/trunk/libc/math/s_ccoshl.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_ccosl.c
==============================================================================
--- fsf/trunk/libc/math/s_ccosl.c (original)
+++ fsf/trunk/libc/math/s_ccosl.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Return cosine of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -21,6 +21,7 @@
 #include <complex.h>
 #include <fenv.h>
 #include <math.h>
+#include <math_private.h>
 
 
 __complex__ long double
@@ -36,17 +37,17 @@
 	  __imag__ res = 0.0;
 
 #ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
+	  if (__isinf_nsl (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}
-      else if (__isinfl (__imag__ x))
+      else if (__isinf_nsl (__imag__ x))
 	{
 	  __real__ res = HUGE_VALL;
 	  __imag__ res = __nanl ("");
 
 #ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
+	  if (__isinf_nsl (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_cexp.c
==============================================================================
--- fsf/trunk/libc/math/s_cexp.c (original)
+++ fsf/trunk/libc/math/s_cexp.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_cexpf.c
==============================================================================
--- fsf/trunk/libc/math/s_cexpf.c (original)
+++ fsf/trunk/libc/math/s_cexpf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_cexpl.c
==============================================================================
--- fsf/trunk/libc/math/s_cexpl.c (original)
+++ fsf/trunk/libc/math/s_cexpl.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_clog.c
==============================================================================
--- fsf/trunk/libc/math/s_clog.c (original)
+++ fsf/trunk/libc/math/s_clog.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_clog10.c
==============================================================================
--- fsf/trunk/libc/math/s_clog10.c (original)
+++ fsf/trunk/libc/math/s_clog10.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_clog10f.c
==============================================================================
--- fsf/trunk/libc/math/s_clog10f.c (original)
+++ fsf/trunk/libc/math/s_clog10f.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_clog10l.c
==============================================================================
--- fsf/trunk/libc/math/s_clog10l.c (original)
+++ fsf/trunk/libc/math/s_clog10l.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_clogf.c
==============================================================================
--- fsf/trunk/libc/math/s_clogf.c (original)
+++ fsf/trunk/libc/math/s_clogf.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_clogl.c
==============================================================================
--- fsf/trunk/libc/math/s_clogl.c (original)
+++ fsf/trunk/libc/math/s_clogl.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_csin.c
==============================================================================
--- fsf/trunk/libc/math/s_csin.c (original)
+++ fsf/trunk/libc/math/s_csin.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_csinf.c
==============================================================================
--- fsf/trunk/libc/math/s_csinf.c (original)
+++ fsf/trunk/libc/math/s_csinf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_csinh.c
==============================================================================
--- fsf/trunk/libc/math/s_csinh.c (original)
+++ fsf/trunk/libc/math/s_csinh.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_csinhf.c
==============================================================================
--- fsf/trunk/libc/math/s_csinhf.c (original)
+++ fsf/trunk/libc/math/s_csinhf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_csinhl.c
==============================================================================
--- fsf/trunk/libc/math/s_csinhl.c (original)
+++ fsf/trunk/libc/math/s_csinhl.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_csinl.c
==============================================================================
--- fsf/trunk/libc/math/s_csinl.c (original)
+++ fsf/trunk/libc/math/s_csinl.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_csqrt.c
==============================================================================
--- fsf/trunk/libc/math/s_csqrt.c (original)
+++ fsf/trunk/libc/math/s_csqrt.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double

Modified: fsf/trunk/libc/math/s_csqrtf.c
==============================================================================
--- fsf/trunk/libc/math/s_csqrtf.c (original)
+++ fsf/trunk/libc/math/s_csqrtf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float

Modified: fsf/trunk/libc/math/s_csqrtl.c
==============================================================================
--- fsf/trunk/libc/math/s_csqrtl.c (original)
+++ fsf/trunk/libc/math/s_csqrtl.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double

Modified: fsf/trunk/libc/math/s_ctan.c
==============================================================================
--- fsf/trunk/libc/math/s_ctan.c (original)
+++ fsf/trunk/libc/math/s_ctan.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex tangent function for double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinf (__imag__ x))
+      if (__isinf_ns (__imag__ x))
 	{
 	  __real__ res = __copysign (0.0, __real__ x);
 	  __imag__ res = __copysign (1.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nan ("");
 
 #ifdef FE_INVALID
-	  if (__isinf (__real__ x))
+	  if (__isinf_ns (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ctanf.c
==============================================================================
--- fsf/trunk/libc/math/s_ctanf.c (original)
+++ fsf/trunk/libc/math/s_ctanf.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex tangent function for float.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinff (__imag__ x))
+      if (__isinf_nsf (__imag__ x))
 	{
 	  __real__ res = __copysignf (0.0, __real__ x);
 	  __imag__ res = __copysignf (1.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nanf ("");
 
 #ifdef FE_INVALID
-	  if (__isinff (__real__ x))
+	  if (__isinf_nsf (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ctanh.c
==============================================================================
--- fsf/trunk/libc/math/s_ctanh.c (original)
+++ fsf/trunk/libc/math/s_ctanh.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex hyperbole tangent for double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ double
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinf (__real__ x))
+      if (__isinf_ns (__real__ x))
 	{
 	  __real__ res = __copysign (1.0, __real__ x);
 	  __imag__ res = __copysign (0.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nan ("");
 
 #ifdef FE_INVALID
-	  if (__isinf (__imag__ x))
+	  if (__isinf_ns (__imag__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ctanhf.c
==============================================================================
--- fsf/trunk/libc/math/s_ctanhf.c (original)
+++ fsf/trunk/libc/math/s_ctanhf.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex hyperbole tangent for float.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ float
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinff (__real__ x))
+      if (__isinf_nsf (__real__ x))
 	{
 	  __real__ res = __copysignf (1.0, __real__ x);
 	  __imag__ res = __copysignf (0.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nanf ("");
 
 #ifdef FE_INVALID
-	  if (__isinff (__imag__ x))
+	  if (__isinf_nsf (__imag__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ctanhl.c
==============================================================================
--- fsf/trunk/libc/math/s_ctanhl.c (original)
+++ fsf/trunk/libc/math/s_ctanhl.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex hyperbole tangent for long double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinfl (__real__ x))
+      if (__isinf_nsl (__real__ x))
 	{
 	  __real__ res = __copysignl (1.0, __real__ x);
 	  __imag__ res = __copysignl (0.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nanl ("");
 
 #ifdef FE_INVALID
-	  if (__isinfl (__imag__ x))
+	  if (__isinf_nsl (__imag__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ctanl.c
==============================================================================
--- fsf/trunk/libc/math/s_ctanl.c (original)
+++ fsf/trunk/libc/math/s_ctanl.c Mon Oct 10 00:01:59 2011
@@ -1,5 +1,5 @@
 /* Complex tangent function for long double.
-   Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -22,7 +22,7 @@
 #include <fenv.h>
 #include <math.h>
 
-#include "math_private.h"
+#include <math_private.h>
 
 
 __complex__ long double
@@ -32,7 +32,7 @@
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinfl (__imag__ x))
+      if (__isinf_nsl (__imag__ x))
 	{
 	  __real__ res = __copysignl (0.0, __real__ x);
 	  __imag__ res = __copysignl (1.0, __imag__ x);
@@ -47,7 +47,7 @@
 	  __imag__ res = __nanl ("");
 
 #ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
+	  if (__isinf_nsl (__real__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}

Modified: fsf/trunk/libc/math/s_ldexp.c
==============================================================================
--- fsf/trunk/libc/math/s_ldexp.c (original)
+++ fsf/trunk/libc/math/s_ldexp.c Mon Oct 10 00:01:59 2011
@@ -15,7 +15,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 #include <errno.h>
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/s_ldexpf.c
==============================================================================
--- fsf/trunk/libc/math/s_ldexpf.c (original)
+++ fsf/trunk/libc/math/s_ldexpf.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 #include <errno.h>
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/s_ldexpl.c
==============================================================================
--- fsf/trunk/libc/math/s_ldexpl.c (original)
+++ fsf/trunk/libc/math/s_ldexpl.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 #include <errno.h>
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/s_significand.c
==============================================================================
--- fsf/trunk/libc/math/s_significand.c (original)
+++ fsf/trunk/libc/math/s_significand.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __significand(double x)

Modified: fsf/trunk/libc/math/s_significandf.c
==============================================================================
--- fsf/trunk/libc/math/s_significandf.c (original)
+++ fsf/trunk/libc/math/s_significandf.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float __significandf(float x)

Modified: fsf/trunk/libc/math/s_significandl.c
==============================================================================
--- fsf/trunk/libc/math/s_significandl.c (original)
+++ fsf/trunk/libc/math/s_significandl.c Mon Oct 10 00:01:59 2011
@@ -25,7 +25,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __significandl(long double x)

Modified: fsf/trunk/libc/math/w_acos.c
==============================================================================
--- fsf/trunk/libc/math/w_acos.c (original)
+++ fsf/trunk/libc/math/w_acos.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_acosf.c
==============================================================================
--- fsf/trunk/libc/math/w_acosf.c (original)
+++ fsf/trunk/libc/math/w_acosf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_acosh.c
==============================================================================
--- fsf/trunk/libc/math/w_acosh.c (original)
+++ fsf/trunk/libc/math/w_acosh.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __acosh(double x)		/* wrapper acosh */

Modified: fsf/trunk/libc/math/w_acoshf.c
==============================================================================
--- fsf/trunk/libc/math/w_acoshf.c (original)
+++ fsf/trunk/libc/math/w_acoshf.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float __acoshf(float x)		/* wrapper acoshf */

Modified: fsf/trunk/libc/math/w_acoshl.c
==============================================================================
--- fsf/trunk/libc/math/w_acoshl.c (original)
+++ fsf/trunk/libc/math/w_acoshl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __acoshl(long double x)	/* wrapper acosh */

Modified: fsf/trunk/libc/math/w_acosl.c
==============================================================================
--- fsf/trunk/libc/math/w_acosl.c (original)
+++ fsf/trunk/libc/math/w_acosl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_asin.c
==============================================================================
--- fsf/trunk/libc/math/w_asin.c (original)
+++ fsf/trunk/libc/math/w_asin.c Mon Oct 10 00:01:59 2011
@@ -20,7 +20,7 @@
 
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_asinf.c
==============================================================================
--- fsf/trunk/libc/math/w_asinf.c (original)
+++ fsf/trunk/libc/math/w_asinf.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
 
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_asinl.c
==============================================================================
--- fsf/trunk/libc/math/w_asinl.c (original)
+++ fsf/trunk/libc/math/w_asinl.c Mon Oct 10 00:01:59 2011
@@ -24,7 +24,7 @@
 
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atan2.c
==============================================================================
--- fsf/trunk/libc/math/w_atan2.c (original)
+++ fsf/trunk/libc/math/w_atan2.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atan2f.c
==============================================================================
--- fsf/trunk/libc/math/w_atan2f.c (original)
+++ fsf/trunk/libc/math/w_atan2f.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atan2l.c
==============================================================================
--- fsf/trunk/libc/math/w_atan2l.c (original)
+++ fsf/trunk/libc/math/w_atan2l.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atanh.c
==============================================================================
--- fsf/trunk/libc/math/w_atanh.c (original)
+++ fsf/trunk/libc/math/w_atanh.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atanhf.c
==============================================================================
--- fsf/trunk/libc/math/w_atanhf.c (original)
+++ fsf/trunk/libc/math/w_atanhf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_atanhl.c
==============================================================================
--- fsf/trunk/libc/math/w_atanhl.c (original)
+++ fsf/trunk/libc/math/w_atanhl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_cosh.c
==============================================================================
--- fsf/trunk/libc/math/w_cosh.c (original)
+++ fsf/trunk/libc/math/w_cosh.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __cosh(double x)		/* wrapper cosh */

Modified: fsf/trunk/libc/math/w_coshf.c
==============================================================================
--- fsf/trunk/libc/math/w_coshf.c (original)
+++ fsf/trunk/libc/math/w_coshf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float __coshf(float x)		/* wrapper coshf */

Modified: fsf/trunk/libc/math/w_coshl.c
==============================================================================
--- fsf/trunk/libc/math/w_coshl.c (original)
+++ fsf/trunk/libc/math/w_coshl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __coshl(long double x)	/* wrapper coshl */

Modified: fsf/trunk/libc/math/w_dremf.c
==============================================================================
--- fsf/trunk/libc/math/w_dremf.c (original)
+++ fsf/trunk/libc/math/w_dremf.c Mon Oct 10 00:01:59 2011
@@ -6,7 +6,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 float
 __dremf(x, y)

Modified: fsf/trunk/libc/math/w_exp10.c
==============================================================================
--- fsf/trunk/libc/math/w_exp10.c (original)
+++ fsf/trunk/libc/math/w_exp10.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __exp10(double x)		/* wrapper exp10 */

Modified: fsf/trunk/libc/math/w_exp10f.c
==============================================================================
--- fsf/trunk/libc/math/w_exp10f.c (original)
+++ fsf/trunk/libc/math/w_exp10f.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float __exp10f(float x)		/* wrapper exp10f */

Modified: fsf/trunk/libc/math/w_exp10l.c
==============================================================================
--- fsf/trunk/libc/math/w_exp10l.c (original)
+++ fsf/trunk/libc/math/w_exp10l.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __exp10l(long double x)	/* wrapper exp10 */

Modified: fsf/trunk/libc/math/w_exp2.c
==============================================================================
--- fsf/trunk/libc/math/w_exp2.c (original)
+++ fsf/trunk/libc/math/w_exp2.c Mon Oct 10 00:01:59 2011
@@ -4,7 +4,7 @@
 
 #include <float.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 static const double o_threshold= (double) DBL_MAX_EXP;
 static const double u_threshold= (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);

Modified: fsf/trunk/libc/math/w_exp2f.c
==============================================================================
--- fsf/trunk/libc/math/w_exp2f.c (original)
+++ fsf/trunk/libc/math/w_exp2f.c Mon Oct 10 00:01:59 2011
@@ -4,7 +4,7 @@
 
 #include <float.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 static const float o_threshold= (float) FLT_MAX_EXP;
 static const float u_threshold= (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);

Modified: fsf/trunk/libc/math/w_exp2l.c
==============================================================================
--- fsf/trunk/libc/math/w_exp2l.c (original)
+++ fsf/trunk/libc/math/w_exp2l.c Mon Oct 10 00:01:59 2011
@@ -4,7 +4,7 @@
 
 #include <float.h>
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 static const long double o_threshold = (long double) LDBL_MAX_EXP;
 static const long double u_threshold

Modified: fsf/trunk/libc/math/w_fmod.c
==============================================================================
--- fsf/trunk/libc/math/w_fmod.c (original)
+++ fsf/trunk/libc/math/w_fmod.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__
@@ -35,9 +35,9 @@
 	double z;
 	z = __ieee754_fmod(x,y);
 	if(_LIB_VERSION == _IEEE_ ||__isnan(y)||__isnan(x)) return z;
-	if(__isinf(x)||y==0.0) {
+	if(__isinf_ns(x)||y==0.0) {
 		/* fmod(+-Inf,y) or fmod(x,0) */
-	        return __kernel_standard(x,y,27);
+		return __kernel_standard(x,y,27);
 	} else
 	    return z;
 #endif

Modified: fsf/trunk/libc/math/w_fmodf.c
==============================================================================
--- fsf/trunk/libc/math/w_fmodf.c (original)
+++ fsf/trunk/libc/math/w_fmodf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__
@@ -38,9 +38,9 @@
 	float z;
 	z = __ieee754_fmodf(x,y);
 	if(_LIB_VERSION == _IEEE_ ||__isnanf(y)||__isnanf(x)) return z;
-	if(__isinff(x)||y==(float)0.0) {
+	if(__isinf_nsf(x)||y==(float)0.0) {
 		/* fmodf(+-Inf,y) or fmodf(x,0) */
-	        return (float)__kernel_standard((double)x,(double)y,127);
+		return (float)__kernel_standard((double)x,(double)y,127);
 	} else
 	    return z;
 #endif

Modified: fsf/trunk/libc/math/w_fmodl.c
==============================================================================
--- fsf/trunk/libc/math/w_fmodl.c (original)
+++ fsf/trunk/libc/math/w_fmodl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__
@@ -39,9 +39,9 @@
 	long double z;
 	z = __ieee754_fmodl(x,y);
 	if(_LIB_VERSION == _IEEE_ ||__isnanl(y)||__isnanl(x)) return z;
-	if(__isinfl(x)||y==0.0) {
+	if(__isinf_nsl(x)||y==0.0) {
 		/* fmodl(+-Inf,y) or fmodl(x,0) */
-	        return __kernel_standard(x,y,227);
+		return __kernel_standard(x,y,227);
 	} else
 	    return z;
 #endif

Modified: fsf/trunk/libc/math/w_hypot.c
==============================================================================
--- fsf/trunk/libc/math/w_hypot.c (original)
+++ fsf/trunk/libc/math/w_hypot.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_hypotf.c
==============================================================================
--- fsf/trunk/libc/math/w_hypotf.c (original)
+++ fsf/trunk/libc/math/w_hypotf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_hypotl.c
==============================================================================
--- fsf/trunk/libc/math/w_hypotl.c (original)
+++ fsf/trunk/libc/math/w_hypotl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_j0.c
==============================================================================
--- fsf/trunk/libc/math/w_j0.c (original)
+++ fsf/trunk/libc/math/w_j0.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double j0(double x)		/* wrapper j0 */

Modified: fsf/trunk/libc/math/w_j0f.c
==============================================================================
--- fsf/trunk/libc/math/w_j0f.c (original)
+++ fsf/trunk/libc/math/w_j0f.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float j0f(float x)		/* wrapper j0f */

Modified: fsf/trunk/libc/math/w_j0l.c
==============================================================================
--- fsf/trunk/libc/math/w_j0l.c (original)
+++ fsf/trunk/libc/math/w_j0l.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __j0l(long double x)		/* wrapper j0l */

Modified: fsf/trunk/libc/math/w_j1.c
==============================================================================
--- fsf/trunk/libc/math/w_j1.c (original)
+++ fsf/trunk/libc/math/w_j1.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double j1(double x)		/* wrapper j1 */

Modified: fsf/trunk/libc/math/w_j1f.c
==============================================================================
--- fsf/trunk/libc/math/w_j1f.c (original)
+++ fsf/trunk/libc/math/w_j1f.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float j1f(float x)		/* wrapper j1f */

Modified: fsf/trunk/libc/math/w_j1l.c
==============================================================================
--- fsf/trunk/libc/math/w_j1l.c (original)
+++ fsf/trunk/libc/math/w_j1l.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __j1l(long double x)	/* wrapper j1l */

Modified: fsf/trunk/libc/math/w_jn.c
==============================================================================
--- fsf/trunk/libc/math/w_jn.c (original)
+++ fsf/trunk/libc/math/w_jn.c Mon Oct 10 00:01:59 2011
@@ -41,7 +41,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double jn(int n, double x)	/* wrapper jn */

Modified: fsf/trunk/libc/math/w_jnf.c
==============================================================================
--- fsf/trunk/libc/math/w_jnf.c (original)
+++ fsf/trunk/libc/math/w_jnf.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float jnf(int n, float x)	/* wrapper jnf */

Modified: fsf/trunk/libc/math/w_jnl.c
==============================================================================
--- fsf/trunk/libc/math/w_jnl.c (original)
+++ fsf/trunk/libc/math/w_jnl.c Mon Oct 10 00:01:59 2011
@@ -45,7 +45,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __jnl(int n, long double x)	/* wrapper jnl */

Modified: fsf/trunk/libc/math/w_lgamma.c
==============================================================================
--- fsf/trunk/libc/math/w_lgamma.c (original)
+++ fsf/trunk/libc/math/w_lgamma.c Mon Oct 10 00:01:59 2011
@@ -21,7 +21,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __lgamma(double x)

Modified: fsf/trunk/libc/math/w_lgamma_r.c
==============================================================================
--- fsf/trunk/libc/math/w_lgamma_r.c (original)
+++ fsf/trunk/libc/math/w_lgamma_r.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_lgammaf.c
==============================================================================
--- fsf/trunk/libc/math/w_lgammaf.c (original)
+++ fsf/trunk/libc/math/w_lgammaf.c Mon Oct 10 00:01:59 2011
@@ -18,7 +18,7 @@
 #endif
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	float __lgammaf(float x)

Modified: fsf/trunk/libc/math/w_lgammaf_r.c
==============================================================================
--- fsf/trunk/libc/math/w_lgammaf_r.c (original)
+++ fsf/trunk/libc/math/w_lgammaf_r.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_lgammal.c
==============================================================================
--- fsf/trunk/libc/math/w_lgammal.c (original)
+++ fsf/trunk/libc/math/w_lgammal.c Mon Oct 10 00:01:59 2011
@@ -25,7 +25,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __lgammal(long double x)

Modified: fsf/trunk/libc/math/w_lgammal_r.c
==============================================================================
--- fsf/trunk/libc/math/w_lgammal_r.c (original)
+++ fsf/trunk/libc/math/w_lgammal_r.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_log.c
==============================================================================
--- fsf/trunk/libc/math/w_log.c (original)
+++ fsf/trunk/libc/math/w_log.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_log10.c
==============================================================================
--- fsf/trunk/libc/math/w_log10.c (original)
+++ fsf/trunk/libc/math/w_log10.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_log10f.c
==============================================================================
--- fsf/trunk/libc/math/w_log10f.c (original)
+++ fsf/trunk/libc/math/w_log10f.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_log10l.c
==============================================================================
--- fsf/trunk/libc/math/w_log10l.c (original)
+++ fsf/trunk/libc/math/w_log10l.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_log2.c
==============================================================================
--- fsf/trunk/libc/math/w_log2.c (original)
+++ fsf/trunk/libc/math/w_log2.c Mon Oct 10 00:01:59 2011
@@ -3,7 +3,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 double
 __log2 (double x)	/* wrapper log2 */

Modified: fsf/trunk/libc/math/w_log2f.c
==============================================================================
--- fsf/trunk/libc/math/w_log2f.c (original)
+++ fsf/trunk/libc/math/w_log2f.c Mon Oct 10 00:01:59 2011
@@ -3,7 +3,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 float
 __log2f (float x)	/* wrapper log2f */

Modified: fsf/trunk/libc/math/w_log2l.c
==============================================================================
--- fsf/trunk/libc/math/w_log2l.c (original)
+++ fsf/trunk/libc/math/w_log2l.c Mon Oct 10 00:01:59 2011
@@ -3,7 +3,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 long double
 __log2l (long double x)	/* wrapper log2l */

Modified: fsf/trunk/libc/math/w_logf.c
==============================================================================
--- fsf/trunk/libc/math/w_logf.c (original)
+++ fsf/trunk/libc/math/w_logf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_logl.c
==============================================================================
--- fsf/trunk/libc/math/w_logl.c (original)
+++ fsf/trunk/libc/math/w_logl.c Mon Oct 10 00:01:59 2011
@@ -23,7 +23,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_pow.c
==============================================================================
--- fsf/trunk/libc/math/w_pow.c (original)
+++ fsf/trunk/libc/math/w_pow.c Mon Oct 10 00:01:59 2011
@@ -17,7 +17,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_powf.c
==============================================================================
--- fsf/trunk/libc/math/w_powf.c (original)
+++ fsf/trunk/libc/math/w_powf.c Mon Oct 10 00:01:59 2011
@@ -22,7 +22,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_powl.c
==============================================================================
--- fsf/trunk/libc/math/w_powl.c (original)
+++ fsf/trunk/libc/math/w_powl.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 
 #ifdef __STDC__

Modified: fsf/trunk/libc/math/w_remainder.c
==============================================================================
--- fsf/trunk/libc/math/w_remainder.c (original)
+++ fsf/trunk/libc/math/w_remainder.c Mon Oct 10 00:01:59 2011
@@ -19,7 +19,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	double __remainder(double x, double y)	/* wrapper remainder */
@@ -33,8 +33,8 @@
 #else
 	double z;
 	z = __ieee754_remainder(x,y);
-	if(_LIB_VERSION == _IEEE_ || __isnan(y)) return z;
-	if(y==0.0)
+	if(_LIB_VERSION == _IEEE_ || __isnan(y) || __isnan(x)) return z;
+	if(y==0.0 || __isinf_ns(x))
 	    return __kernel_standard(x,y,28); /* remainder(x,0) */
 	else
 	    return z;

Modified: fsf/trunk/libc/math/w_remainderf.c
==============================================================================

[... 9453 lines stripped ...]