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

[Commits] r20392 - in /trunk: ./ libc/ libc/bits/ libc/csu/ libc/elf/ libc/grp/ libc/gshadow/ libc/include/ libc/include/sys/ libc/ine...



Author: joseph
Date: Tue Aug 28 14:14:43 2012
New Revision: 20392

Log:
Merge changes between r20213 and r20391 from /fsf/trunk.

Added:
    trunk/libc/bits/param.h
      - copied unchanged from r20391, fsf/trunk/libc/bits/param.h
    trunk/libc/include/sys/param.h
      - copied unchanged from r20391, fsf/trunk/libc/include/sys/param.h
    trunk/libc/misc/sys/param.h
      - copied unchanged from r20391, fsf/trunk/libc/misc/sys/param.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fdatasync.c
      - copied unchanged from r20391, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fdatasync.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c
      - copied unchanged from r20391, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c
      - copied unchanged from r20391, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
      - copied unchanged from r20391, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
    trunk/libc/stdlib/gen-fpioconst.c
      - copied unchanged from r20391, fsf/trunk/libc/stdlib/gen-fpioconst.c
    trunk/libc/stdlib/gen-tst-strtod-round.c
      - copied unchanged from r20391, fsf/trunk/libc/stdlib/gen-tst-strtod-round.c
    trunk/libc/stdlib/tst-strtod-overflow.c
      - copied unchanged from r20391, fsf/trunk/libc/stdlib/tst-strtod-overflow.c
    trunk/libc/stdlib/tst-strtod-round-data
      - copied unchanged from r20391, fsf/trunk/libc/stdlib/tst-strtod-round-data
    trunk/libc/stdlib/tst-strtod-round.c
      - copied unchanged from r20391, fsf/trunk/libc/stdlib/tst-strtod-round.c
    trunk/libc/string/bug-strcasestr1.c
      - copied unchanged from r20391, fsf/trunk/libc/string/bug-strcasestr1.c
    trunk/libc/sysdeps/mach/hurd/bits/param.h
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/mach/hurd/bits/param.h
    trunk/libc/sysdeps/posix/alarm.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/alarm.c
    trunk/libc/sysdeps/posix/mkfifo.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/mkfifo.c
    trunk/libc/sysdeps/posix/mkfifoat.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/mkfifoat.c
    trunk/libc/sysdeps/posix/nice.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/nice.c
    trunk/libc/sysdeps/posix/time.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/time.c
    trunk/libc/sysdeps/posix/utime.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/posix/utime.c
    trunk/libc/sysdeps/powerpc/powerpc32/power6/wcschr.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/wcschr.c
    trunk/libc/sysdeps/powerpc/powerpc32/power6/wcscpy.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/wcscpy.c
    trunk/libc/sysdeps/powerpc/powerpc32/power6/wcsrchr.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/wcsrchr.c
    trunk/libc/sysdeps/powerpc/powerpc64/power6/wcschr.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc64/power6/wcschr.c
    trunk/libc/sysdeps/powerpc/powerpc64/power6/wcscpy.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc64/power6/wcscpy.c
    trunk/libc/sysdeps/powerpc/powerpc64/power6/wcsrchr.c
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/powerpc/powerpc64/power6/wcsrchr.c
    trunk/libc/sysdeps/unix/sysv/linux/bits/param.h
      - copied unchanged from r20391, fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/param.h
Removed:
    trunk/libc/intl/tst-codeset.sh
    trunk/libc/intl/tst-gettext3.sh
    trunk/libc/intl/tst-gettext5.sh
    trunk/libc/sysdeps/generic/sys/param.h
    trunk/libc/sysdeps/mach/hurd/sys/
    trunk/libc/sysdeps/unix/alarm.c
    trunk/libc/sysdeps/unix/inet/syscalls.list
    trunk/libc/sysdeps/unix/mkfifo.c
    trunk/libc/sysdeps/unix/mkfifoat.c
    trunk/libc/sysdeps/unix/nice.c
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c
    trunk/libc/sysdeps/unix/sysv/linux/sys/param.h
    trunk/libc/sysdeps/unix/time.c
    trunk/libc/sysdeps/unix/utime.c
    trunk/ports/.gitignore
    trunk/ports/Banner
    trunk/ports/ChangeLog
    trunk/ports/ChangeLog.aix
    trunk/ports/ChangeLog.alpha
    trunk/ports/ChangeLog.am33
    trunk/ports/ChangeLog.arm
    trunk/ports/ChangeLog.cris
    trunk/ports/ChangeLog.eglibc
    trunk/ports/ChangeLog.hppa
    trunk/ports/ChangeLog.ia64
    trunk/ports/ChangeLog.linux-generic
    trunk/ports/ChangeLog.m68k
    trunk/ports/ChangeLog.mips
    trunk/ports/ChangeLog.powerpc
    trunk/ports/ChangeLog.tile
    trunk/ports/Makefile
    trunk/ports/README
    trunk/ports/data/
    trunk/ports/sysdeps/
Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/Makerules
    trunk/libc/NEWS
    trunk/libc/config.h.in
    trunk/libc/config.make.in
    trunk/libc/configure
    trunk/libc/configure.in
    trunk/libc/csu/elf-init.c
    trunk/libc/csu/libc-start.c
    trunk/libc/elf/dl-close.c
    trunk/libc/elf/dl-iteratephdr.c
    trunk/libc/elf/dl-sysdep.c
    trunk/libc/elf/elf.h
    trunk/libc/grp/Makefile
    trunk/libc/gshadow/getsgent.c
    trunk/libc/gshadow/getsgent_r.c
    trunk/libc/gshadow/getsgnam.c
    trunk/libc/gshadow/getsgnam_r.c
    trunk/libc/include/sys/socket.h
    trunk/libc/include/unistd.h
    trunk/libc/inet/Makefile
    trunk/libc/inet/getaliasent.c
    trunk/libc/inet/getaliasent_r.c
    trunk/libc/inet/getaliasname.c
    trunk/libc/inet/getaliasname_r.c
    trunk/libc/inet/getnetbyad.c
    trunk/libc/inet/getnetbyad_r.c
    trunk/libc/inet/getnetbynm.c
    trunk/libc/inet/getnetbynm_r.c
    trunk/libc/inet/getnetent.c
    trunk/libc/inet/getnetent_r.c
    trunk/libc/inet/getnetgrent_r.c
    trunk/libc/inet/getproto.c
    trunk/libc/inet/getproto_r.c
    trunk/libc/inet/getprtent.c
    trunk/libc/inet/getprtent_r.c
    trunk/libc/inet/getprtname.c
    trunk/libc/inet/getprtname_r.c
    trunk/libc/inet/getrpcbyname.c
    trunk/libc/inet/getrpcbyname_r.c
    trunk/libc/inet/getrpcbynumber.c
    trunk/libc/inet/getrpcbynumber_r.c
    trunk/libc/inet/getrpcent.c
    trunk/libc/inet/getrpcent_r.c
    trunk/libc/intl/Makefile
    trunk/libc/malloc/arena.c
    trunk/libc/malloc/malloc.c
    trunk/libc/manual/syslog.texi
    trunk/libc/misc/Makefile
    trunk/libc/nscd/Makefile
    trunk/libc/nscd/gai.c
    trunk/libc/nscd/getgrgid_r.c
    trunk/libc/nscd/getgrnam_r.c
    trunk/libc/nscd/gethstbyad_r.c
    trunk/libc/nscd/gethstbynm3_r.c
    trunk/libc/nscd/getpwnam_r.c
    trunk/libc/nscd/getpwuid_r.c
    trunk/libc/nscd/getsrvbynm_r.c
    trunk/libc/nscd/getsrvbypt_r.c
    trunk/libc/nscd/nscd.c
    trunk/libc/nss/nss_db/db-init.c
    trunk/libc/nss/nss_files/files-init.c
    trunk/libc/nss/nsswitch.c
    trunk/libc/ports/ChangeLog.alpha
    trunk/libc/ports/ChangeLog.arm
    trunk/libc/ports/ChangeLog.hppa
    trunk/libc/ports/ChangeLog.m68k
    trunk/libc/ports/ChangeLog.mips
    trunk/libc/ports/ChangeLog.tile
    trunk/libc/ports/sysdeps/mips/fpu_control.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/Makefile
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data   (props changed)
    trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
    trunk/libc/posix/Makefile
    trunk/libc/posix/tst-rfc3484-2.c
    trunk/libc/posix/tst-rfc3484-3.c
    trunk/libc/posix/tst-rfc3484.c
    trunk/libc/pwd/Makefile
    trunk/libc/shadow/getspent.c
    trunk/libc/shadow/getspent_r.c
    trunk/libc/shadow/getspnam.c
    trunk/libc/shadow/getspnam_r.c
    trunk/libc/socket/have_sock_cloexec.c
    trunk/libc/stdio-common/_itoa.c
    trunk/libc/stdlib/Makefile
    trunk/libc/stdlib/fpioconst.c
    trunk/libc/stdlib/fpioconst.h
    trunk/libc/stdlib/strtod_l.c
    trunk/libc/string/Makefile
    trunk/libc/string/str-two-way.h
    trunk/libc/string/strcasestr.c
    trunk/libc/string/strstr.c
    trunk/libc/sysdeps/generic/malloc-machine.h
    trunk/libc/sysdeps/ieee754/ldbl-96/s_sincosl.c
    trunk/libc/sysdeps/posix/getaddrinfo.c
    trunk/libc/sysdeps/powerpc/powerpc32/power7/memchr.S
    trunk/libc/sysdeps/powerpc/powerpc64/power7/memchr.S
    trunk/libc/sysdeps/unix/syscalls.list
    trunk/libc/sysdeps/unix/sysv/linux/check_pf.c
    trunk/libc/sysdeps/unix/sysv/linux/dl-fxstatat64.c
    trunk/libc/sysdeps/unix/sysv/linux/fxstat64.c
    trunk/libc/sysdeps/unix/sysv/linux/fxstatat64.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/fxstat.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/fxstatat.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/lxstat.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/mmap.S
    trunk/libc/sysdeps/unix/sysv/linux/i386/mmap64.S
    trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
    trunk/libc/sysdeps/unix/sysv/linux/i386/xstat.c
    trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
    trunk/libc/sysdeps/unix/sysv/linux/lxstat64.c
    trunk/libc/sysdeps/unix/sysv/linux/mmap64.c
    trunk/libc/sysdeps/unix/sysv/linux/nice.c
    trunk/libc/sysdeps/unix/sysv/linux/posix_fadvise64.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/mmap.S
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S
    trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c
    trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/time.c
    trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
    trunk/libc/sysdeps/unix/sysv/linux/time.c
    trunk/libc/sysdeps/unix/sysv/linux/xstat64.c
    trunk/libc/sysdeps/unix/sysv/linux/xstatconv.c
    trunk/libc/time/time.h

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 28 14:14:43 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-20213
+/fsf/trunk:15224-20391

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Aug 28 14:14:43 2012
@@ -1,4 +1,468 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove all definitions.
+	* sysdeps/unix/sysv/linux/fxstat64.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/fxstatat64.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/i386/fxstat.c
+	[!__ASSUME_STAT64_SYSCALL]: Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/i386/fxstatat.c
+	[!__ASSUME_STAT64_SYSCALL]: Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/i386/lxstat.c
+	[!__ASSUME_STAT64_SYSCALL]: Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/i386/xstat.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/lxstat64.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c: Do not include
+	<kernel-features.h>.
+	[__NR_stat64 && !__ASSUME_STAT64_SYSCALL] (__have_no_stat64):
+	Remove.
+	* sysdeps/unix/sysv/linux/xstat64.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional code.
+	[__ASSUME_STAT64_SYSCALL]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/xstatconv.c [!__ASSUME_STAT64_SYSCALL]:
+	Remove conditional.
+
+2012-08-27  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[BZ #5400]
+	* NEWS: Add fixed bug number.
+
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14519]
+	* stdlib/strtod_l.c (round_and_return): Return -0.0 for
+	underflowing exponent in case of negative sign.
+	* stdlib/tst-strtod-round-data: Add more tests.
+	* stdlib/tst-strtod-round.c (tests): Regenerated.
+
+	[BZ #3479]
+	* stdlib/strtod_l.c (NDIG): Remove.
+	(HEXNDIG): Likewise.
+	(MPNSIZE): Increase to represent 10^n where 2^-n is 1/4 ulp of the
+	smallest representable value.
+	(____STRTOF_INTERNAL): Use all fractional decimal digits that may
+	lie within an exact representation of 1/2 ulp of the result.
+	* stdlib/fpioconst.c (__tens): Include 10^2^9 and 10^2^10
+	unconditionally.
+	(TENS_P9_IDX): Define unconditionally.
+	(TENS_P9_SIZE): Likewise.
+	(TENS_P10_IDX): Likewise.
+	(TENS_P10_SIZE): Likewise.
+	[BITS_PER_MP_LIMB == 32]: Change condition for larger powers of 10
+	to !defined __NO_LONG_DOUBLE_MATH && __LDBL_MAX_EXP__ > 1024.
+	[!__NO_LONG_DOUBLE_MATH && __LDBL_MAX_EXP__ > 1024] (__tens): Add
+	entries for 10^2^13 and 10^2^14.
+	[!__NO_LONG_DOUBLE_MATH && __LDBL_MAX_EXP__ > 1024]
+	(TENS_P13_IDX): Define.
+	(TENS_P13_SIZE): Likewise.
+	(TENS_P14_IDX): Likewise.
+	(TENS_P14_SIZE): Likewise.
+	(_fpioconst_pow10): Change array size to
+	FPIOCONST_POW10_ARRAY_SIZE.  Make entries for 10^2^9 and 10^2^10
+	unconditional.
+	(_fpioconst_pow10) [!__NO_LONG_DOUBLE_MATH && __LDBL_MAX_EXP__ >
+	1024]: Add entries for 10^2^13 and 10^2^14.
+	[LAST_POW10 > _LAST_POW10]: Remove #error.
+	* stdlib/fpioconst.h (FPIOCONST_POW10_ARRAY_SIZE): Define.
+	(_fpioconst_pow10): Change array size to
+	FPIOCONST_POW10_ARRAY_SIZE.
+	* stdlib/gen-fpioconst.c: New file.
+	* stdlib/gen-tst-strtod-round.c: Likewise.
+	* stdlib/tst-strtod-round-data: Likewise.
+	* stdlib/tst-strtod-round.c: Likewise.
+	* stdlib/Makefile (tests): Add tst-strtod-round.
+
+	[BZ #14459]
+	* stdlib/strtod_l.c: Include <stdint.h>.
+	(NDEBUG): Do not define.
+	(round_and_return): Change EXPONENT parameter to type intmax_t.
+	Rearrange calculations to avoid internal overflow possibilities.
+	(str_to_mpn): Change EXPONENT parameter to type intmax_t *.
+	Rearrange calculations to avoid internal overflow possibilities.
+	Assert that number fits inside MPNSIZE limbs.
+	(____STRTOF_INTERNAL): Change EXPONENT variable to type intmax_t.
+	Change DIG_NO, INT_NO and LEAD_ZERO to type size_t.  Rearrange
+	calculations and add assertions to avoid internal overflow
+	possibilities.  Add casts to avoid signed/unsigned operations.
+	* stdlib/tst-strtod-overflow.c: New file.
+	* stdlib/Makefile (tests): Add tst-strtod-overflow.
+
+2012-08-25  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* time/time.h: Fix some typos in comments.
+
+2012-08-23  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* posix/tst-rfc3484.c: #undef USE_NSCD before including getaddrinfo.c.
+	* posix/tst-rfc3484-2.c: Likewise.
+	* posix/tst-rfc3484-3.c: Likewise.
+
+2012-08-23  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
+
+	* elf/elf.h (EF_ARM_ABI_FLOAT_SOFT): New macro.
+	(EF_ARM_ABI_FLOAT_HARD): Likewise.
+
+2012-08-23  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/dl-fxstatat64.c: Use <> instead of "" in
+	#include of fxstatat64.c.
+
+2012-08-22  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* shadow/getspent.c: #undef USE_NSCD before #include that gets the code.
+	* shadow/getspent_r.c: Likewise.
+	* shadow/getspnam.c: Likewise.
+	* shadow/getspnam_r.c: Likewise.
+	* gshadow/getsgent.c: Likewise.
+	* gshadow/getsgent_r.c: Likewise.
+	* gshadow/getsgnam.c: Likewise.
+	* gshadow/getsgnam_r.c: Likewise.
+	* inet/getnetbyad.c: Likewise.
+	* inet/getnetbyad_r.c: Likewise.
+	* inet/getnetbynm.c: Likewise.
+	* inet/getnetbynm_r.c: Likewise.
+	* inet/getnetent.c: Likewise.
+	* inet/getnetent_r.c: Likewise.
+	* inet/getproto.c: Likewise.
+	* inet/getproto_r.c: Likewise.
+	* inet/getprtent.c: Likewise.
+	* inet/getprtent_r.c: Likewise.
+	* inet/getprtname.c: Likewise.
+	* inet/getprtname_r.c: Likewise.
+	* inet/getrpcbyname.c: Likewise.
+	* inet/getrpcbyname_r.c: Likewise.
+	* inet/getrpcbynumber.c: Likewise.
+	* inet/getrpcbynumber_r.c: Likewise.
+	* inet/getrpcent.c: Likewise.
+	* inet/getrpcent_r.c: Likewise.
+	* inet/getaliasent.c: Likewise.
+	* inet/getaliasent_r.c: Likewise.
+	* inet/getaliasname.c: Likewise.
+	* inet/getaliasname_r.c: Likewise.
+	* nscd/getgrgid_r.c: Likewise.
+	* nscd/getgrnam_r.c: Likewise.
+	* nscd/gethstbyad_r.c: Likewise.
+	* nscd/gethstbynm3_r.c: Likewise.
+	* nscd/getpwnam_r.c: Likewise.
+	* nscd/getpwuid_r.c: Likewise.
+	* nscd/getsrvbynm_r.c: Likewise.
+	* nscd/getsrvbypt_r.c: Likewise.
+	* nscd/gai.c: Likewise.
+
+	* configure.in (build_nscd): New substituted variable, set
+	by --disable-build-nscd and defaults to $use_nscd.
+	* configure: Regenerated.
+	* config.make.in (build-nscd): New substituted variable.
+	* nscd/Makefile (others, others-pie, install-sbin, extra-objs):
+	Change conditional to require [$(build-nscd) = yes] as well.
+	* NEWS: Mention --disable-build-nscd in the --disable-nscd item.
+
+	[BZ# 13696]
+	* configure.in (use_nscd): New substituted variable, set by
+	--disable-nscd.  If enabled, define USE_NSCD.
+	* configure: Regenerated.
+	* config.h.in: Add USE_NSCD.
+	* config.make.in (use-nscd): New substituted variable.
+	* inet/Makefile (CFLAGS-gethstbyad_r.c): Likewise.
+	(CFLAGS-gethstbynm_r.c, CFLAGS-gethstbynm2_r.c): Likewise.
+	(CFLAGS-getsrvbynm_r.c, CFLAGS-getsrvbypt_r.c): Variables removed.
+	* grp/Makefile (CFLAGS-getgrgid_r.c): Remove -DUSE_NSCD.
+	(CFLAGS-getgrnam_r.c): Likewise.
+	(CFLAGS-initgroups.c): Likewise.
+	* posix/Makefile (CFLAGS-getaddrinfo.c): Remove -DUSE_NSCD.
+	* pwd/Makefile (CFLAGS-getpwuid_r.c, CFLAGS-getpwnam_r.c):
+	Variables removed.
+	* inet/getnetgrent_r.c
+	(nscd_setnetgrent): New function, broken out of ...
+	(setnetgrent): ... here.  Call it.
+	(innetgr): Conditionalize nscd bits on [USE_NSCD].
+	(nscd_getnetgrent): Conditionalize on [USE_NSCD].
+	(__internal_getnetgrent_r): Conditionalize its use on [USE_NSCD].
+	* nscd/Makefile (routines, aux): Move definitions after include of
+	Makeconfig.  Conditionalize on [$(use-nscd) != no].
+	* nss/nsswitch.c (nss_load_all_libraries, __nss_disable_nscd):
+	Conditionalize on [USE_NSCD].
+	(is_nscd, nscd_init_cb): Likewise.
+	(nss_load_library): Conditionalize init callback on [USE_NSCD].
+	* nss/nss_files/files-init.c: Conditionalize body on [USE_NSCD].
+	* nss/nss_db/db-init.c: Likewise.
+	* nscd/nscd.c (main): Conditionalize __nss_disable_nscd call on
+	[USE_NSCD].
+	* sysdeps/unix/sysv/linux/check_pf.c (get_nl_timestamp): New function.
+	(make_request): Use it.
+	(cache_valid_p): New function.
+	(__check_pf): Use it.
+	* NEWS: Add item for --disable-nscd.
+
+2012-08-22  Dmitry V. Levin  <ldv@xxxxxxxxxxxx>
+
+	* configure.in (SED): Update AC_CHECK_PROG_VER's version extract regexp
+	to support sed >= 4.2.1-20-ga9bf076.
+	* configure: Regenerated.
+
+2012-08-22  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* csu/libc-start.c (apply_irel): Move extern declarations inside here.
+	Conditionalize whole body on [IREL].
+
+2012-08-22  Jeff Law <law@xxxxxxxxxx>
+
+	[BZ #14505]
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Only use gethostbyname4_r
+	if the family is PF_UNSPEC.
+
+2012-08-22  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* Makerules (lib-version): Rename from V.
+	(install-lib-nosubdir): Change V to lib-version.
+
+2012-08-22  Will Schmidt  <will_schmidt@xxxxxxxxxxxx>
+
+	[BZ #14252]
+	* powerpc32/power6/wcschr.c: New file.
+	* powerpc32/power6/wcscpy.c: New file.
+	* powerpc32/power6/wcsrchr.c: New file.
+	* powerpc64/power6/wcschr.c: New file.
+	* powerpc64/power6/wcscpy.c: New file.
+	* powerpc64/power6/wcsrchr.c: New file.
+
+2012-08-21  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	* string/str-two-way.h (AVAILABLE1_USES_J): New macro, define default.
+	(two_way_short_needle): Use it.
+	* string/strstr.c (AVAILABLE1_USES_J): Define.
+	* string/strcasestr.c: Likewise.
+
+	* string/str-two-way.h (two_way_short_needle): Use pointers instead of
+	array references.
+	* string/strcasestr.c (TOLOWER): Make side-effect safe.
+
+	[BZ #11607]
+	* NEWS: Add an entry.
+	* string/str-two-way.h (AVAILABLE1, AVAILABLE2, RET0_IF_0): New macros,
+	define their defaults.
+	(two_way_short_needle): Detect end-of-string on-the-fly.
+	* string/strcasestr.c, string/strstr.c (AVAILABLE): Update.
+	(AVAILABLE1, AVAILABLE2, RET0_IF_0, AVAILABLE_USES_J): Define.
+	* string/bug-strcasestr1.c: New test.
+	* string/Makefile: Run it.
+
+2012-08-21  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	[BZ #11607]
+	* string/str-two-way.h (two_way_short_needle): Optimize matching of
+	the first character.
+
+2012-08-21  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* csu/elf-init.c (__libc_csu_irel): Function removed.
+	* csu/libc-start.c (apply_irel): New function.
+	(LIBC_START_MAIN): Call it instead of __libc_csu_irel.
+
+2012-08-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_FADVISE64_64_SYSCALL): Remove.
+	* sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Do not include
+	<kernel-features.h>.
+	[__NR_fadvise64_64]: Make code unconditional.
+	[!__ASSUME_FADVISE64_64_SYSCALL]: Remove conditional code.
+	[__NR_fadvise64 && (!__ASSUME_FADVISE64_64_SYSCALL ||
+	!__NR_fadvise64_64)]: Likewise.
+	[!(__NR_fadvise64 && (!__ASSUME_FADVISE64_64_SYSCALL ||
+	!__NR_fadvise64_64))]: Likewise.
+	[__NR_fadvise64]: Make code unconditional.
+	[!__NR_fadvise64]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/posix_fadvise64.c: Do not include
+	<kernel-features.h>.
+	(__posix_fadvise64_l64) [__NR_fadvise64_64]: Make code
+	unconditional.
+	(_posix_fadvise64_l64) [!__ASSUME_FADVISE64_64_SYSCALL]: Remove
+	conditional code.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c: Do
+	not include <kernel-features.h>.
+	(__posix_fadvise64_l64) [__NR_fadvise64_64]: Make code
+	unconditional.
+	(_posix_fadvise64_l64) [!__ASSUME_FADVISE64_64_SYSCALL]: Remove
+	conditional code.
+	* sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c: Do not
+	include <kernel-features.h>.
+	(__posix_fadvise64_l64) [__NR_fadvise64_64]: Make code
+	unconditional.
+	(_posix_fadvise64_l64) [!__ASSUME_FADVISE64_64_SYSCALL]: Remove
+	conditional code.
+
+2012-08-21  Will Schmidt  <will_schmidt@xxxxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc64/power7/memchr.S: Unrolled short loop and
+	slight instruction rearrangements per scrollpipe analysis.
+	* sysdeps/powerpc/powerpc64/power7/memchr.S: Likewise.
+
+2012-08-20  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* manual/syslog.texi (syslog; vsyslog, closelog):
+	Fix typo repeated twice: @file{dev/log} -> @file{/dev/log}.
+	Reported by Ricardo Catalinas JimÃÂnez <jimenezrick@xxxxxxxxx>.
+
+	* elf/dl-sysdep.c (_dl_important_hwcaps): Fix conditional on using
+	DSOCAPS to match condition on defining it.
+
+2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_SWAPCONTEXT_SYSCALL): Remove.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
+	[__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+	[!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+	[__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+	[!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
+	[__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+	[!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+
+	* sysdeps/unix/sysv/linux/kernel-features.h [__s390__ &&
+	__LINUX_KERNEL_VERSION >= 0x020616] (__ASSUME_UTIMES): Define.
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_MMAP2_SYSCALL): Remove all definitions.
+	* sysdeps/unix/sysv/linux/mmap64.c [__NR_mmap2]: Make code
+	unconditional.
+	[!__ASSUME_MMAP2_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/i386/mmap.S (__mmap)
+	[__ASSUME_MMAP2_SYSCALL]: Make code unconditional.
+	(__mmap) [!__ASSUME_MMAP2_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/i386/mmap64.S (__mmap64) [__NR_mmap2]:
+	Make code unconditional.
+	(__mmap64) [!__ASSUME_MMAP2_SYSCALL]: Remove conditional code.
+	(__mmap64) [!__NR_mmap2]: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/mmap.S (__mmap)
+	[__ASSUME_MMAP2_SYSCALL]: Make code unconditional.
+	(__mmap) [!__ASSUME_MMAP2_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S (__mmap64)
+	[__NR_mmap2]: Make code unconditional.
+	(__mmap64) [!__ASSUME_MMAP2_SYSCALL]: Remove conditional code.
+	(__mmap64) [!__NR_mmap2]: Likewise.
+
+2012-08-20  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c: Remove.
+
+2012-08-18  Andreas Jaeger  <aj@xxxxxxx>
+
+	* stdio-common/_itoa.c (_itoa): Add missing DUMMY variable.
+
+2012-08-18  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* include/sys/socket.h (__have_sock_cloexec): Add attribute_hidden.
+	* include/unistd.h (__have_sock_cloexec): Likewise.
+	(__have_pipe2): Likewise.
+	(__have_dup3): Likewise.
+
+2012-08-18  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[BZ #9685]
+	* include/unistd.h (__have_pipe2): Change define into an extern int.
+	(__have_dup3): Likewise.
+	* socket/have_sock_cloexec.c: Include fcntl.h.
+	(__have_pipe2): New variable.
+	(__have_dup3): Likewise.
+
+2012-08-17  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/nice.c: Adjust #include.
+
+2012-08-17  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* sysdeps/ieee754/ldbl-96/s_sincosl.c (__sincosl): Use __attribute__
+	((unused)) on I1, which is set by GET_LDOUBLE_WORDS but never used.
+
 2012-08-17  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* configure.in: Add AC_SUBST for sysheaders.
+	* configure: Regenerated.
+	* config.make.in (sysheaders): New substituted variable.
+
+	* sysdeps/unix/mkfifo.c: Moved ...
+	* sysdeps/posix/mkfifo.c: ... here.
+	* sysdeps/unix/mkfifoat.c: Moved ...
+	* sysdeps/posix/mkfifoat.c: ... here.
+
+	* sysdeps/unix/utime.c: Moved ...
+	* sysdeps/posix/utime.c: ... here.
+
+	* sysdeps/unix/time.c: Moved ...
+	* sysdeps/posix/time.c: ... here.
+	* sysdeps/unix/sysv/linux/time.c: Adjust #include.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/time.c: Likewise.
+
+	* sysdeps/unix/nice.c: Moved ...
+	* sysdeps/posix/nice.c: ... here.
+
+	* sysdeps/unix/alarm.c: Moved ...
+	* sysdeps/posix/alarm.c: ... here.
+
+	* intl/Makefile ($(codeset_mo)): Depend on the input file.
+
+2012-08-17  Jeff Law <law@xxxxxxxxxx>
+
+	* intl/Makefile (codeset_mo): New variable.
+	($(codeset_mo)): New target.
+	(tst-codeset.out): Depend on that.  Remove explicit rule.
+	(tst-gettext3.out, tst-gettext5.out): Likewise.
+	(LOCPATH-ENV, tst-codeset-ENV): New variables.
+	(tst-gettext3-ENV, tst-gettext5-ENV): Likewise.
+	* intl/tst-codeset.sh: Remove.
+	* intl/tst-gettext3.sh: Likewise.
+	* intl/tst-gettext5.sh: Likewise.
+
+2012-08-17  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/inet/syscalls.list: File removed.  Move contents into ...
+	* sysdeps/unix/syscalls.list: ... here.
+
+	* sysdeps/posix/getaddrinfo.c
+	(save_gaiconf_mtime, check_gaiconf_mtime): New functions.
+	(gaiconf_init, gaiconf_reload): Use them.
+	[!_STATBUF_ST_NSEC]
+	(gaiconf_mtime, save_gaiconf_mtime, check_gaiconf_mtime):
+	Define using time_t rather than struct timespec.
+
+	* sysdeps/generic/malloc-machine.h (MUTEX_INITIALIZER): New macro.
+	(atomic_full_barrier, atomic_read_barrier, atomic_write_barrier):
+	Macros removed.
+	* malloc/arena.c (save_malloc_hook, save_free_hook): Conditionalize on
+	[!NO_THREADS].
+	(malloc_atfork, free_atfork, atfork_recursive_cntr): Likewise.
+	(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2):
+	Likewise.
+
+	* elf/dl-iteratephdr.c (__dl_iterate_phdr): Use NULL rather than 0 for
+	__libc_cleanup_push argument.
+
+	* bits/param.h: New file.
+	* misc/sys/param.h: New file.
+	* include/sys/param.h: New file.
+	* misc/Makefile (headers): Add bits/param.h.
+	* sysdeps/generic/sys/param.h: File removed.
+	* sysdeps/unix/sysv/linux/bits/param.h: New file.
+	* sysdeps/unix/sysv/linux/sys/param.h: File removed.
+	* sysdeps/mach/hurd/bits/param.h: New file.
+	* sysdeps/mach/hurd/sys/param.h: New file.
+
+	* elf/dl-close.c (_dl_close_worker): Add a cast and a comment to the
+	last change.
 
 	* libio/genops.c (_IO_unbuffer_write): Conditionalize locking code on
 	[_IO_MTSAFE_IO].
@@ -134,8 +598,8 @@
 2012-08-15  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
 
 	[BZ #14195]
-        * sysdeps/i386/i686/multiarch/strcmp-sssse3.S: Fix
-        segmentation fault for a case of two empty input strings.
+	* sysdeps/i386/i686/multiarch/strcmp-sssse3.S: Fix
+	segmentation fault for a case of two empty input strings.
 	* string/test-strncasecmp.c (check1): Renamed to...
 	(bz12205): ...this.
 	(bz14195): Add new testcase for two empty input strings and N > 0.
@@ -575,7 +1039,7 @@
 
 2012-08-02  Marek Polacek  <polacek@xxxxxxxxxx>
 
-	[BZ#14150]
+	[BZ# 14150]
 	* configure.in (libc_cv_asm_type_prefix): Remove test.  Replace
 	libc_cv_asm_type_prefix with %.
 	* configure: Regenerated.

Modified: trunk/libc/Makerules
==============================================================================
--- trunk/libc/Makerules (original)
+++ trunk/libc/Makerules Tue Aug 28 14:14:43 2012
@@ -890,11 +890,11 @@
 #	$(inst_libdir)/libfoo.so	-- for linking, symlink or ld script
 #	$(inst_slibdir)/libfoo.so.NN	-- for loading by SONAME, symlink
 #	$(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file
-V := $(firstword $($(subdir)-version) $(version))
+lib-version := $(firstword $($(subdir)-version) $(version))
 install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \
 		      $(foreach L,$(install-lib.so-versioned),\
 				$(inst_libdir)/$L \
-				$(inst_slibdir)/$(L:.so=)-$V.so \
+				$(inst_slibdir)/$(L:.so=)-$(lib-version).so \
 				$(inst_slibdir)/$L$($L-version))
 
 # Install all the unversioned shared libraries.

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Tue Aug 28 14:14:43 2012
@@ -9,9 +9,10 @@
 
 * The following bugs are resolved with this release:
 
-  6778, 6808, 13717, 13939, 14042, 14090, 14166, 14150, 14151, 14154, 14157,
-  14166, 14173, 14195, 14283, 14298, 14303, 14307, 14328, 14331, 14336,
-  14337, 14347, 14349
+  3479, 5400, 6778, 6808, 9685, 11607, 13717, 13696, 13939, 14042, 14090,
+  14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 14252, 14283,
+  14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459,
+  14505, 14519
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
@@ -25,8 +26,19 @@
 * SystemTap static probes have been added into the dynamic linker.
   Implemented by Gary Benson.
 
+* Optimizations of string functions strstr, strcasestr and memmem.
+  Implemented by Maxim Kuvyrkov.
+
 * The minimum Linux kernel version that this version of the GNU C Library
   can be used with is 2.6.16.
+
+* Optimizations of string functions memchr, wcschr, wcscpy, and wcsrchr for
+  powerpc POWER7.  Implemented by Will Schmidt.
+
+* New configure option --disable-nscd builds the C library such that it
+  never attempts to contact the Name Service Caching Daemon (nscd).
+  New configure option --disable-build-nscd avoids building nscd itself;
+  this is the default if --disable-nscd is used.
 
 
 Version 2.16

Modified: trunk/libc/config.h.in
==============================================================================
--- trunk/libc/config.h.in (original)
+++ trunk/libc/config.h.in Tue Aug 28 14:14:43 2012
@@ -179,6 +179,9 @@
 
 /* Define if Systemtap <sys/sdt.h> probes should be defined.  */
 #undef USE_STAP_PROBE
+
+/* Define if library functions should try to contact the nscd daemon.  */
+#undef USE_NSCD
 
 /*
  */

Modified: trunk/libc/config.make.in
==============================================================================
--- trunk/libc/config.make.in (original)
+++ trunk/libc/config.make.in Tue Aug 28 14:14:43 2012
@@ -44,6 +44,7 @@
 config-asflags-i686 = @libc_cv_as_i686@
 
 defines = @DEFINES@
+sysheaders = @sysheaders@
 sysincludes = @SYSINCLUDES@
 c++-sysincludes = @CXX_SYSINCLUDES@
 all-warnings = @all_warnings@
@@ -99,6 +100,8 @@
 cross-compiling = @cross_compiling@
 force-install = @force_install@
 link-obsolete-rpc = @link_obsolete_rpc@
+build-nscd = @build_nscd@
+use-nscd = @use_nscd@
 
 # Build tools.
 CC = @CC@

Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Tue Aug 28 14:14:43 2012
@@ -597,6 +597,7 @@
 libc_cv_localedir
 libc_cv_slibdir
 old_glibc_headers
+use_nscd
 libc_cv_gcc_unwind_find_fde
 libc_extra_cflags
 CPPUNDEFS
@@ -654,6 +655,7 @@
 base_machine
 add_on_subdirs
 add_ons
+build_nscd
 link_obsolete_rpc
 libc_cv_nss_crypt
 REPORT_BUGS_TEXI
@@ -665,6 +667,7 @@
 bindnow
 oldest_abi
 use_default_link
+sysheaders
 with_fp
 ac_ct_CXX
 CXXFLAGS
@@ -755,6 +758,8 @@
 enable_nss_crypt
 enable_obsolete_rpc
 enable_systemtap
+enable_build_nscd
+enable_nscd
 with_cpu
 '
       ac_precious_vars='build_alias
@@ -1413,6 +1418,8 @@
   --enable-obsolete-rpc   build and install the obsolete RPC code for
                           link-time usage
   --enable-systemtap      enable systemtap static probe points [default=no]
+  --disable-build-nscd    disable building and installing the nscd daemon
+  --disable-nscd          library functions will not contact the nscd daemon
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3486,6 +3493,7 @@
 
 
 
+
 # Check whether --with-default-link was given.
 if test "${with_default_link+set}" = set; then :
   withval=$with_default_link; use_default_link=$withval
@@ -3816,6 +3824,24 @@
 See \`config.log' for more details" "$LINENO" 5; }
   fi
 fi
+
+# Check whether --enable-build-nscd was given.
+if test "${enable_build_nscd+set}" = set; then :
+  enableval=$enable_build_nscd; build_nscd=$enableval
+else
+  build_nscd=default
+fi
+
+
+
+# Note the use of $use_nscd is near the bottom of the file.
+# Check whether --enable-nscd was given.
+if test "${enable_nscd+set}" = set; then :
+  enableval=$enable_nscd; use_nscd=$enableval
+else
+  use_nscd=yes
+fi
+
 
 # The way shlib-versions is used to generate soversions.mk uses a
 # fairly simplistic model for name recognition that can't distinguish
@@ -5052,7 +5078,7 @@
   # Found it, now check the version.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
 $as_echo_n "checking version of $SED... " >&6; }
-  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
     3.0[2-9]*|3.[1-9]*|[4-9]*)
@@ -7496,6 +7522,17 @@
 
 fi
 
+
+# This is far from the AC_ARG_ENABLE that sets it so that a sysdeps
+# configure fragment can override the value to prevent this AC_DEFINE.
+
+if test "x$use_nscd" != xno; then
+  $as_echo "#define USE_NSCD 1" >>confdefs.h
+
+fi
+if test "x$build_nscd" = xdefault; then
+  build_nscd=$use_nscd
+fi
 
 # Test for old glibc 2.0.x headers so that they can be removed properly
 # Search only in includedir.

Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Tue Aug 28 14:14:43 2012
@@ -95,6 +95,7 @@
 			    @<:@default=compiler default@:>@]),
 	    [sysheaders=$withval],
 	    [sysheaders=''])
+AC_SUBST(sysheaders)
 
 AC_SUBST(use_default_link)
 AC_ARG_WITH([default-link],
@@ -296,6 +297,20 @@
     AC_MSG_FAILURE([systemtap support needs sys/sdt.h with asm support])
   fi
 fi
+
+AC_ARG_ENABLE([build-nscd],
+	      [AS_HELP_STRING([--disable-build-nscd],
+	       [disable building and installing the nscd daemon])],
+	      [build_nscd=$enableval],
+	      [build_nscd=default])
+AC_SUBST(build_nscd)
+
+# Note the use of $use_nscd is near the bottom of the file.
+AC_ARG_ENABLE([nscd],
+	      [AS_HELP_STRING([--disable-nscd],
+	       [library functions will not contact the nscd daemon])],
+	      [use_nscd=$enableval],
+	      [use_nscd=yes])
 
 # The way shlib-versions is used to generate soversions.mk uses a
 # fairly simplistic model for name recognition that can't distinguish
@@ -936,7 +951,7 @@
   [4.[5-9]*|4.[1-9][0-9]*|[5-9].*],
   MAKEINFO=: aux_missing="$aux_missing makeinfo")
 AC_CHECK_PROG_VER(SED, sed, --version,
-  [GNU sed version \([0-9]*\.[0-9.]*\)],
+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
   [3.0[2-9]*|3.[1-9]*|[4-9]*],
   SED=: aux_missing="$aux_missing sed")
 
@@ -2131,6 +2146,16 @@
 fi
 AC_SUBST(libc_cv_gcc_unwind_find_fde)
 
+# This is far from the AC_ARG_ENABLE that sets it so that a sysdeps
+# configure fragment can override the value to prevent this AC_DEFINE.
+AC_SUBST(use_nscd)
+if test "x$use_nscd" != xno; then
+  AC_DEFINE([USE_NSCD])
+fi
+if test "x$build_nscd" = xdefault; then
+  build_nscd=$use_nscd
+fi
+
 # Test for old glibc 2.0.x headers so that they can be removed properly
 # Search only in includedir.
 AC_MSG_CHECKING(for old glibc 2.0.x headers)

Modified: trunk/libc/csu/elf-init.c
==============================================================================
--- trunk/libc/csu/elf-init.c (original)
+++ trunk/libc/csu/elf-init.c Tue Aug 28 14:14:43 2012
@@ -1,6 +1,5 @@
 /* Startup support for ELF initializers/finalizers in the main executable.
-   Copyright (C) 2002,2003,2004,2005,2009,2011
-	Free Software Foundation, Inc.
+   Copyright (C) 2002-2012 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
@@ -36,20 +35,6 @@
 
 #include <stddef.h>
 
-#if defined USE_MULTIARCH && !defined LIBC_NONSHARED
-# include <link.h>
-# include <dl-irel.h>
-
-# ifdef ELF_MACHINE_IRELA
-extern const ElfW(Rela) __rela_iplt_start [];
-extern const ElfW(Rela) __rela_iplt_end [];
-# endif
-
-# ifdef ELF_MACHINE_IREL
-extern const ElfW(Rel) __rel_iplt_start [];
-extern const ElfW(Rel) __rel_iplt_end [];
-# endif
-#endif	/* LIBC_NONSHARED */
 
 /* These magic symbols are provided by the linker.  */
 extern void (*__preinit_array_start []) (int, char **, char **)
@@ -72,33 +57,7 @@
 /* These functions are passed to __libc_start_main by the startup code.
    These get statically linked into each program.  For dynamically linked
    programs, this module will come from libc_nonshared.a and differs from
-   the libc.a module in that it doesn't call the preinit array and performs
-   explicit IREL{,A} relocations.  */
-
-
-#ifndef LIBC_NONSHARED
-void
-__libc_csu_irel (void)
-{
-# ifdef USE_MULTIARCH
-#  ifdef ELF_MACHINE_IRELA
-  {
-    const size_t size = __rela_iplt_end - __rela_iplt_start;
-    for (size_t i = 0; i < size; i++)
-      elf_irela (&__rela_iplt_start [i]);
-  }
-#  endif
-
-#  ifdef ELF_MACHINE_IREL
-  {
-    const size_t size = __rel_iplt_end - __rel_iplt_start;
-    for (size_t i = 0; i < size; i++)
-      elf_irel (&__rel_iplt_start [i]);
-  }
-#  endif
-# endif
-}
-#endif
+   the libc.a module in that it doesn't call the preinit array.  */
 
 
 void

Modified: trunk/libc/csu/libc-start.c
==============================================================================
--- trunk/libc/csu/libc-start.c (original)
+++ trunk/libc/csu/libc-start.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2012 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
@@ -43,6 +43,39 @@
 #ifdef HAVE_PTR_NTHREADS
 /* We need atomic operations.  */
 # include <atomic.h>
+#endif
+
+
+#ifndef SHARED
+# include <link.h>
+# include <dl-irel.h>
+
+# ifdef ELF_MACHINE_IRELA
+#  define IREL_T	ElfW(Rela)
+#  define IPLT_START	__rela_iplt_start
+#  define IPLT_END	__rela_iplt_end
+#  define IREL		elf_irela
+# elif defined ELF_MACHINE_IREL
+#  define IREL_T	ElfW(Rel)
+#  define IPLT_START	__rel_iplt_start
+#  define IPLT_END	__rel_iplt_end
+#  define IREL		elf_irel
+# endif
+
+static void
+apply_irel (void)
+{
+# ifdef IREL
+  /* We use weak references for these so that we'll still work with a linker
+     that doesn't define them.  Such a linker doesn't support IFUNC at all
+     and so uses won't work, but a statically-linked program that doesn't
+     use any IFUNC symbols won't have a problem.  */
+  extern const IREL_T IPLT_START[] __attribute__ ((weak));
+  extern const IREL_T IPLT_END[] __attribute__ ((weak));
+  for (const IREL_T *ipltent = IPLT_START; ipltent < IPLT_END; ++ipltent)
+    IREL (ipltent);
+# endif
+}
 #endif
 
 
@@ -136,8 +169,8 @@
     }
 # endif
 
-  /* Performe IREL{,A} relocations.  */
-  __libc_csu_irel ();
+  /* Perform IREL{,A} relocations.  */
+  apply_irel ();
 
   /* Initialize the thread library at least a bit since the libgcc
      functions are using thread functions if these are available and

Modified: trunk/libc/elf/dl-close.c
==============================================================================
--- trunk/libc/elf/dl-close.c (original)
+++ trunk/libc/elf/dl-close.c Tue Aug 28 14:14:43 2012
@@ -486,7 +486,7 @@
 	/* Speed up removing most recently added objects.  */
 	j = cnt;
       else
- 	for (i = 0; i < cnt; i++)
+	for (i = 0; i < cnt; i++)
 	  if (ns_msl->r_list[i]->l_removed == 0)
 	    {
 	      if (i != j)
@@ -641,7 +641,11 @@
 #ifdef SHARED
 	      assert (nsid != LM_ID_BASE);
 #endif
-	      r->r_map = ns->_ns_loaded = imap->l_next;
+	      ns->_ns_loaded = imap->l_next;
+
+	      /* Update the pointer to the head of the list
+		 we leave for debuggers to examine.  */
+	      r->r_map = (void *) ns->_ns_loaded;
 	    }
 
 	  --ns->_ns_nloaded;

Modified: trunk/libc/elf/dl-iteratephdr.c
==============================================================================
--- trunk/libc/elf/dl-iteratephdr.c (original)
+++ trunk/libc/elf/dl-iteratephdr.c Tue Aug 28 14:14:43 2012
@@ -1,5 +1,5 @@
 /* Get loaded objects program headers.
-   Copyright (C) 2001-2004, 2006-2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2001.
 
@@ -39,7 +39,7 @@
 
   /* Make sure nobody modifies the list of loaded objects.  */
   __rtld_lock_lock_recursive (GL(dl_load_write_lock));
-  __libc_cleanup_push (cancel_handler, 0);
+  __libc_cleanup_push (cancel_handler, NULL);
 
   /* We have to determine the namespace of the caller since this determines
      which namespace is reported.  */

Modified: trunk/libc/elf/dl-sysdep.c
==============================================================================
--- trunk/libc/elf/dl-sysdep.c (original)
+++ trunk/libc/elf/dl-sysdep.c Tue Aug 28 14:14:43 2012
@@ -420,7 +420,7 @@
   /* Create temporary data structure to generate result table.  */
   temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
   m = 0;
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED
   if (dsocaps != NULL)
     {
       const ElfW(Word) mask = ((const ElfW(Word) *) dsocaps)[-1];

Modified: trunk/libc/elf/elf.h
==============================================================================
--- trunk/libc/elf/elf.h (original)
+++ trunk/libc/elf/elf.h Tue Aug 28 14:14:43 2012
@@ -2250,6 +2250,9 @@
 #define EF_ARM_VFP_FLOAT	0x400
 #define EF_ARM_MAVERICK_FLOAT	0x800
 
+#define EF_ARM_ABI_FLOAT_SOFT	0x200   /* NB conflicts with EF_ARM_SOFT_FLOAT */
+#define EF_ARM_ABI_FLOAT_HARD	0x400   /* NB conflicts with EF_ARM_VFP_FLOAT */
+
 
 /* Other constants defined in the ARM ELF spec. version B-01.  */
 /* NB. These conflict with values defined above.  */

Modified: trunk/libc/grp/Makefile
==============================================================================
--- trunk/libc/grp/Makefile (original)
+++ trunk/libc/grp/Makefile Tue Aug 28 14:14:43 2012
@@ -43,16 +43,14 @@
 
 ifeq ($(have-thread-library),yes)
 
-OPTION_EGLIBC_INET-CFLAGS-$(OPTION_EGLIBC_INET) = -DUSE_NSCD=1
-
-CFLAGS-getgrgid_r.c = $(OPTION_EGLIBC_INET-CFLAGS-y) -fexceptions
-CFLAGS-getgrnam_r.c = $(OPTION_EGLIBC_INET-CFLAGS-y) -fexceptions
+CFLAGS-getgrgid_r.c = -fexceptions
+CFLAGS-getgrnam_r.c = -fexceptions
 CFLAGS-getgrent_r.c = -fexceptions
 CFLAGS-getgrent.c = -fexceptions
 CFLAGS-fgetgrent.c = -fexceptions
 CFLAGS-fgetgrent_r.c = -fexceptions $(libio-mtsafe)
 CFLAGS-putgrent.c = -fexceptions $(libio-mtsafe)
-CFLAGS-initgroups.c = $(OPTION_EGLIBC_INET-CFLAGS-y) -fexceptions
+CFLAGS-initgroups.c = -fexceptions
 CFLAGS-getgrgid.c = -fexceptions
 
 endif

Modified: trunk/libc/gshadow/getsgent.c
==============================================================================
--- trunk/libc/gshadow/getsgent.c (original)
+++ trunk/libc/gshadow/getsgent.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2009.
 
@@ -26,4 +26,7 @@
 #define DATABASE_NAME	gshadow
 #define BUFLEN		1024
 
+/* There is no nscd support for the shadow file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent.c"

Modified: trunk/libc/gshadow/getsgent_r.c
==============================================================================
--- trunk/libc/gshadow/getsgent_r.c (original)
+++ trunk/libc/gshadow/getsgent_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2009.
 
@@ -27,4 +27,7 @@
 #define BUFLEN			1024
 #define NO_COMPAT_NEEDED	1
 
+/* There is no nscd support for the shadow file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent_r.c"

Modified: trunk/libc/gshadow/getsgnam.c
==============================================================================
--- trunk/libc/gshadow/getsgnam.c (original)
+++ trunk/libc/gshadow/getsgnam.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2009.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		1024
 
+/* There is no nscd support for the shadow file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/gshadow/getsgnam_r.c
==============================================================================
--- trunk/libc/gshadow/getsgnam_r.c (original)
+++ trunk/libc/gshadow/getsgnam_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2009.
 
@@ -27,4 +27,7 @@
 #define BUFLEN			1024
 #define NO_COMPAT_NEEDED	1
 
+/* There is no nscd support for the shadow file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/include/sys/socket.h
==============================================================================
--- trunk/libc/include/sys/socket.h (original)
+++ trunk/libc/include/sys/socket.h Tue Aug 28 14:14:43 2012
@@ -148,7 +148,7 @@
 #endif
 
 #ifdef SOCK_CLOEXEC
-extern int __have_sock_cloexec;
+extern int __have_sock_cloexec attribute_hidden;
 /* At lot of other functionality became available at the same time as
    SOCK_CLOEXEC.  Avoid defining separate variables for all of them
    unless it is really necessary.  */

Modified: trunk/libc/include/unistd.h
==============================================================================
--- trunk/libc/include/unistd.h (original)
+++ trunk/libc/include/unistd.h Tue Aug 28 14:14:43 2012
@@ -173,12 +173,9 @@
 /* Not cancelable variant.  */
 extern int __pause_nocancel (void) attribute_hidden;
 
-extern int __have_sock_cloexec;
-/* At lot of other functionality became available at the same time as
-   SOCK_CLOEXEC.  Avoid defining separate variables for all of them
-   unless it is really necessary.  */
-#define __have_pipe2 __have_sock_cloexec
-#define __have_dup3 __have_sock_cloexec
+extern int __have_sock_cloexec attribute_hidden;
+extern int __have_pipe2 attribute_hidden;
+extern int __have_dup3 attribute_hidden;
 
 extern int __getlogin_r_loginuid (char *name, size_t namesize)
      attribute_hidden;

Modified: trunk/libc/inet/Makefile
==============================================================================
--- trunk/libc/inet/Makefile (original)
+++ trunk/libc/inet/Makefile Tue Aug 28 14:14:43 2012
@@ -64,11 +64,11 @@
 
 ifeq ($(have-thread-library),yes)
 
-CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
+CFLAGS-gethstbyad_r.c = -fexceptions
 CFLAGS-gethstbyad.c = -fexceptions
-CFLAGS-gethstbynm_r.c = -DUSE_NSCD=1 -fexceptions
+CFLAGS-gethstbynm_r.c = -fexceptions
 CFLAGS-gethstbynm.c = -fexceptions
-CFLAGS-gethstbynm2_r.c = -DUSE_NSCD=1 -fexceptions
+CFLAGS-gethstbynm2_r.c = -fexceptions
 CFLAGS-gethstbynm2.c = -fexceptions
 CFLAGS-gethstent_r.c = -fexceptions
 CFLAGS-gethstent.c = -fexceptions
@@ -85,8 +85,6 @@
 CFLAGS-getrpcent.c = -fexceptions
 CFLAGS-getservent_r.c = -fexceptions
 CFLAGS-getservent.c = -fexceptions
-CFLAGS-getsrvbynm_r.c = -DUSE_NSCD=1
-CFLAGS-getsrvbypt_r.c = -DUSE_NSCD=1
 CFLAGS-getprtent_r.c = -fexceptions
 CFLAGS-getprtent.c = -fexceptions
 CFLAGS-either_ntoh.c = -fexceptions

Modified: trunk/libc/inet/getaliasent.c
==============================================================================
--- trunk/libc/inet/getaliasent.c (original)
+++ trunk/libc/inet/getaliasent.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -22,4 +22,7 @@
 #define	GETFUNC_NAME	getaliasent
 #define BUFLEN		1024
 
+/* There is no nscd support for the aliases file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent.c"

Modified: trunk/libc/inet/getaliasent_r.c
==============================================================================
--- trunk/libc/inet/getaliasent_r.c (original)
+++ trunk/libc/inet/getaliasent_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define	ENDFUNC_NAME		endaliasent
 #define DATABASE_NAME		aliases
 
+/* There is no nscd support for the aliases file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent_r.c"

Modified: trunk/libc/inet/getaliasname.c
==============================================================================
--- trunk/libc/inet/getaliasname.c (original)
+++ trunk/libc/inet/getaliasname.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		1024
 
+/* There is no nscd support for the aliases file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getaliasname_r.c
==============================================================================
--- trunk/libc/inet/getaliasname_r.c (original)
+++ trunk/libc/inet/getaliasname_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_PARAMS		const char *name
 #define ADD_VARIABLES		name
 
+/* There is no nscd support for the aliases file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getnetbyad.c
==============================================================================
--- trunk/libc/inet/getnetbyad.c (original)
+++ trunk/libc/inet/getnetbyad.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -28,4 +28,7 @@
 #define BUFLEN		1024
 #define NEED_H_ERRNO	1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getnetbyad_r.c
==============================================================================
--- trunk/libc/inet/getnetbyad_r.c (original)
+++ trunk/libc/inet/getnetbyad_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -28,4 +28,7 @@
 #define NEED__RES		1
 #define NEED_H_ERRNO		1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getnetbynm.c
==============================================================================
--- trunk/libc/inet/getnetbynm.c (original)
+++ trunk/libc/inet/getnetbynm.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -27,4 +27,7 @@
 #define BUFLEN		1024
 #define NEED_H_ERRNO	1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getnetbynm_r.c
==============================================================================
--- trunk/libc/inet/getnetbynm_r.c (original)
+++ trunk/libc/inet/getnetbynm_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -27,4 +27,7 @@
 #define NEED__RES		1
 #define NEED_H_ERRNO		1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getnetent.c
==============================================================================
--- trunk/libc/inet/getnetent.c (original)
+++ trunk/libc/inet/getnetent.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -23,4 +23,7 @@
 #define BUFLEN		1024
 #define NEED_H_ERRNO	1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent.c"

Modified: trunk/libc/inet/getnetent_r.c
==============================================================================
--- trunk/libc/inet/getnetent_r.c (original)
+++ trunk/libc/inet/getnetent_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -28,4 +28,7 @@
 #define NEED__RES		1
 #define NEED_H_ERRNO		1
 
+/* There is no nscd support for the networks file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent_r.c"

Modified: trunk/libc/inet/getnetgrent_r.c
==============================================================================
--- trunk/libc/inet/getnetgrent_r.c (original)
+++ trunk/libc/inet/getnetgrent_r.c Tue Aug 28 14:14:43 2012
@@ -182,28 +182,32 @@
 }
 libc_hidden_def (__internal_setnetgrent)
 
-int
-setnetgrent (const char *group)
-{
-  int result;
-
-  __libc_lock_lock (lock);
-
+static int
+nscd_setnetgrent (const char *group)
+{
+#ifdef USE_NSCD
   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:
+    return __nscd_setnetgrent (group, &dataset);
+#endif
+  return -1;
+}
+
+int
+setnetgrent (const char *group)
+{
+  int result;
+
+  __libc_lock_lock (lock);
+
+  result = nscd_setnetgrent (group);
+  if (result < 0)
+    result = __internal_setnetgrent (group, &dataset);
+
   __libc_lock_unlock (lock);
 
   return result;
@@ -230,7 +234,7 @@
   __libc_lock_unlock (lock);
 }
 
-
+#ifdef USE_NSCD
 static enum nss_status
 nscd_getnetgrent (struct __netgrent *datap, char *buffer, size_t buflen,
 		  int *errnop)
@@ -248,7 +252,7 @@
 
   return NSS_STATUS_SUCCESS;
 }
-
+#endif
 
 int
 internal_function
@@ -267,9 +271,14 @@
   int no_more = datap->nip == NULL;
   if (! no_more)
     {
+#ifdef USE_NSCD
+      /* This bogus function pointer is a special marker left by
+         __nscd_setnetgrent to tell us to use the data it left
+         before considering any modules.  */
       if (datap->nip == (service_user *) -1l)
 	fct = nscd_getnetgrent;
       else
+#endif
 	{
 	  fct = __nss_lookup_function (datap->nip, "getnetgrent_r");
 	  no_more = fct == NULL;
@@ -375,6 +384,7 @@
 innetgr (const char *netgroup, const char *host, const char *user,
 	 const char *domain)
 {
+#ifdef USE_NSCD
   if (__nss_not_use_nscd_netgroup > 0
       && ++__nss_not_use_nscd_netgroup > NSS_NSCD_RETRY)
     __nss_not_use_nscd_netgroup = 0;
@@ -386,6 +396,7 @@
       if (result >= 0)
 	return result;
     }
+#endif
 
   union
   {

Modified: trunk/libc/inet/getproto.c
==============================================================================
--- trunk/libc/inet/getproto.c (original)
+++ trunk/libc/inet/getproto.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	proto
 #define BUFLEN		1024
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getproto_r.c
==============================================================================
--- trunk/libc/inet/getproto_r.c (original)
+++ trunk/libc/inet/getproto_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_PARAMS		int proto
 #define ADD_VARIABLES		proto
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getprtent.c
==============================================================================
--- trunk/libc/inet/getprtent.c (original)
+++ trunk/libc/inet/getprtent.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -22,4 +22,7 @@
 #define	GETFUNC_NAME	getprotoent
 #define BUFLEN		1024
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent.c"

Modified: trunk/libc/inet/getprtent_r.c
==============================================================================
--- trunk/libc/inet/getprtent_r.c (original)
+++ trunk/libc/inet/getprtent_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -26,4 +26,7 @@
 #define STAYOPEN		int stayopen
 #define STAYOPEN_VAR		stayopen
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent_r.c"

Modified: trunk/libc/inet/getprtname.c
==============================================================================
--- trunk/libc/inet/getprtname.c (original)
+++ trunk/libc/inet/getprtname.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		1024
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getprtname_r.c
==============================================================================
--- trunk/libc/inet/getprtname_r.c (original)
+++ trunk/libc/inet/getprtname_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_PARAMS		const char *name
 #define ADD_VARIABLES		name
 
+/* There is no nscd support for the protocols file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getrpcbyname.c
==============================================================================
--- trunk/libc/inet/getrpcbyname.c (original)
+++ trunk/libc/inet/getrpcbyname.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		1024
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getrpcbyname_r.c
==============================================================================
--- trunk/libc/inet/getrpcbyname_r.c (original)
+++ trunk/libc/inet/getrpcbyname_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_PARAMS		const char *name
 #define ADD_VARIABLES		name
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getrpcbynumber.c
==============================================================================
--- trunk/libc/inet/getrpcbynumber.c (original)
+++ trunk/libc/inet/getrpcbynumber.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -26,4 +26,7 @@
 #define ADD_VARIABLES	number
 #define BUFLEN		1024
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY.c"

Modified: trunk/libc/inet/getrpcbynumber_r.c
==============================================================================
--- trunk/libc/inet/getrpcbynumber_r.c (original)
+++ trunk/libc/inet/getrpcbynumber_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_PARAMS		int number
 #define ADD_VARIABLES		number
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/inet/getrpcent.c
==============================================================================
--- trunk/libc/inet/getrpcent.c (original)
+++ trunk/libc/inet/getrpcent.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -22,4 +22,7 @@
 #define	GETFUNC_NAME	getrpcent
 #define BUFLEN		1024
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent.c"

Modified: trunk/libc/inet/getrpcent_r.c
==============================================================================
--- trunk/libc/inet/getrpcent_r.c (original)
+++ trunk/libc/inet/getrpcent_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -26,4 +26,7 @@
 #define STAYOPEN		int stayopen
 #define STAYOPEN_VAR		stayopen
 
+/* There is no nscd support for the rpc file.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXent_r.c"

Modified: trunk/libc/intl/Makefile
==============================================================================
--- trunk/libc/intl/Makefile (original)
+++ trunk/libc/intl/Makefile Tue Aug 28 14:14:43 2012
@@ -62,6 +62,16 @@
 tests: $(objpfx)mtrace-tst-gettext
 endif
 endif
+
+# Multiple tests use this data.  Create it once to avoid racing and
+# spurious test failures.
+codeset_mo = $(objpfx)domaindir/de_DE/LC_MESSAGES/codeset.mo
+
+$(codeset_mo): tstcodeset.po
+	$(make-target-directory)
+	msgfmt -o $@T $<
+	mv -f $@T $@
+
 $(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
 $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
@@ -73,18 +83,14 @@
 $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
 	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
 	'$(cross-test-wrapper)'
-$(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
-	'$(cross-test-wrapper)'
-$(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
-	'$(cross-test-wrapper)'
 $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
-$(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5
 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
 $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
+
+$(objpfx)tst-codeset.out: $(codeset_mo)
+$(objpfx)tst-gettext3.out: $(codeset_mo)
+$(objpfx)tst-gettext5.out: $(codeset_mo)
 endif
 # eglibc: endif
 
@@ -100,6 +106,11 @@
 CFLAGS-tst-gettext4.c = -DOBJPFX=\"$(objpfx)\"
 CFLAGS-tst-gettext5.c = -DOBJPFX=\"$(objpfx)\"
 CFLAGS-tst-gettext6.c = -DOBJPFX=\"$(objpfx)\"
+
+LOCPATH-ENV = LOCPATH=$(common-objpfx)localedata
+tst-codeset-ENV = $(LOCPATH-ENV)
+tst-gettext3-ENV = $(LOCPATH-ENV)
+tst-gettext5-ENV = $(LOCPATH-ENV)
 
 ifeq ($(have-thread-library),yes)
 ifeq (yes,$(build-shared))

Removed: trunk/libc/intl/tst-codeset.sh
==============================================================================
--- trunk/libc/intl/tst-codeset.sh (original)
+++ trunk/libc/intl/tst-codeset.sh (removed)
@@ -1,44 +1,0 @@
-#! /bin/sh
-# Test of bind_textdomain_codeset.
-# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-#
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
-
-common_objpfx=$1
-objpfx=$2
-cross_test_wrapper=$3
-
-LC_ALL=C
-export LC_ALL
-
-# Generate the test data.
-msgfmt -o ${objpfx}codeset.mo.$$ tstcodeset.po || exit
-# Create the domain directories.
-mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
-# Populate them.
-mv -f ${objpfx}codeset.mo.$$ ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo
-
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
-
-${cross_test_wrapper} \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
-${objpfx}tst-codeset > ${objpfx}tst-codeset.out
-
-exit $?

Removed: trunk/libc/intl/tst-gettext3.sh
==============================================================================
--- trunk/libc/intl/tst-gettext3.sh (original)
+++ trunk/libc/intl/tst-gettext3.sh (removed)
@@ -1,45 +1,0 @@
-#! /bin/sh
-# Test that the gettext() results come out in the correct encoding for
-# locales that differ only in their encoding.
-# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-#
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
-
-common_objpfx=$1
-objpfx=$2
-cross_test_wrapper=$3
-
-LC_ALL=C
-export LC_ALL
-
-# Generate the test data.
-msgfmt -o ${objpfx}codeset.mo.$$ tstcodeset.po || exit
-# Create the domain directories.
-mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
-# Populate them.
-mv -f ${objpfx}codeset.mo.$$ ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo
-
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
-
-${cross_test_wrapper} \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
-${objpfx}tst-gettext3 > ${objpfx}tst-gettext3.out
-
-exit $?

Removed: trunk/libc/intl/tst-gettext5.sh
==============================================================================
--- trunk/libc/intl/tst-gettext5.sh (original)
+++ trunk/libc/intl/tst-gettext5.sh (removed)
@@ -1,42 +1,0 @@
-#! /bin/sh
-# Test that gettext() in multithreaded applications works correctly if
-# different threads operate in different locales referring to the same
-# catalog file but with different encodings.
-# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-#
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, see
-# <http://www.gnu.org/licenses/>.
-
-common_objpfx=$1
-run_program_prefix=$2
-objpfx=$3
-
-LC_ALL=C
-export LC_ALL
-
-# Create the domain directories.
-mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
-# Populate them.
-msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo tstcodeset.po
-
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
-
-${run_program_prefix} ${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out
-
-exit $?

Modified: trunk/libc/malloc/arena.c
==============================================================================
--- trunk/libc/malloc/arena.c (original)
+++ trunk/libc/malloc/arena.c Tue Aug 28 14:14:43 2012
@@ -141,6 +141,8 @@
 
 /**************************************************************************/
 
+#ifndef NO_THREADS
+
 /* atfork support.  */
 
 static __malloc_ptr_t (*save_malloc_hook) (size_t __size,
@@ -276,7 +278,7 @@
   (void)mutex_unlock(&list_lock);
 }
 
-#ifdef __linux__
+# ifdef __linux__
 
 /* In NPTL, unlocking a mutex in the child process after a
    fork() is currently unsafe, whereas re-initializing it is safe and
@@ -311,11 +313,13 @@
   atfork_recursive_cntr = 0;
 }
 
-#else
-
-#define ptmalloc_unlock_all2 ptmalloc_unlock_all
-
-#endif
+# else
+
+#  define ptmalloc_unlock_all2 ptmalloc_unlock_all
+
+# endif
+
+#endif  /* !NO_THREADS */
 
 /* Initialization routine. */
 #include <string.h>

Modified: trunk/libc/malloc/malloc.c
==============================================================================
--- trunk/libc/malloc/malloc.c (original)
+++ trunk/libc/malloc/malloc.c Tue Aug 28 14:14:43 2012
@@ -1075,9 +1075,10 @@
 			       const void *caller);
 static void*   memalign_check(size_t alignment, size_t bytes,
 				const void *caller);
-/* These routines are never needed in this configuration.  */
+#ifndef NO_THREADS
 static void*   malloc_atfork(size_t sz, const void *caller);
 static void      free_atfork(void* mem, const void *caller);
+#endif
 
 
 /* ------------- Optional versions of memcopy ---------------- */

Modified: trunk/libc/manual/syslog.texi
==============================================================================
--- trunk/libc/manual/syslog.texi (original)
+++ trunk/libc/manual/syslog.texi Tue Aug 28 14:14:43 2012
@@ -379,7 +379,7 @@
 connection options in @var{options} is as if those bits were off.
 @code{syslog} leaves the Syslog connection open.
 
-If the @file{dev/log} socket is not open and connected, @code{syslog}
+If the @file{/dev/log} socket is not open and connected, @code{syslog}
 opens and connects it, the same as @code{openlog} with the
 @code{LOG_NDELAY} option would.
 
@@ -422,7 +422,7 @@
 @deftypefun void closelog (void)
 
 @code{closelog} closes the current Syslog connection, if there is one.
-This includes closing the @file{dev/log} socket, if it is open.
+This includes closing the @file{/dev/log} socket, if it is open.
 @code{closelog} also sets the identification string for Syslog messages
 back to the default, if @code{openlog} was called with a non-NULL argument
 to @var{ident}.  The default identification string is the program name

Modified: trunk/libc/misc/Makefile
==============================================================================
--- trunk/libc/misc/Makefile (original)
+++ trunk/libc/misc/Makefile Tue Aug 28 14:14:43 2012
@@ -29,7 +29,8 @@
 	   sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
 	   ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
 	   ttyent.h paths.h sys/reboot.h \
-	   sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h \
+	   sys/mman.h sys/param.h bits/param.h \
+	   fstab.h mntent.h search.h err.h error.h \
 	   sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
 	   sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
 	   regexp.h bits/select.h bits/mman.h sys/xattr.h \

Modified: trunk/libc/nscd/Makefile
==============================================================================
--- trunk/libc/nscd/Makefile (original)
+++ trunk/libc/nscd/Makefile Tue Aug 28 14:14:43 2012
@@ -22,12 +22,14 @@
 
 subdir	:= nscd
 
+include ../Makeconfig
+
+ifneq ($(use-nscd),no)
 routines-$(OPTION_EGLIBC_INET) += \
 	     nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
 	    nscd_initgroups nscd_getserv_r nscd_netgroup
 aux-$(OPTION_EGLIBC_INET) += nscd_helper
-
-include ../Makeconfig
+endif
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
@@ -43,7 +45,7 @@
 # own copy of nis_hash.
 nscd-modules += nis_hash
 endif
-ifeq ($(have-thread-library),yes)
+ifeq ($(build-nscd)$(have-thread-library),yesyes)
 
 others-$(OPTION_EGLIBC_INET) += nscd
 others-pie-$(OPTION_EGLIBC_INET) += nscd

Modified: trunk/libc/nscd/gai.c
==============================================================================
--- trunk/libc/nscd/gai.c (original)
+++ trunk/libc/nscd/gai.c Tue Aug 28 14:14:43 2012
@@ -32,6 +32,9 @@
 /* nscd uses 1MB or 2MB thread stacks.  */
 #define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef  USE_NSCD
+
 #include <getaddrinfo.c>
 
 /* Support code.  */

Modified: trunk/libc/nscd/getgrgid_r.c
==============================================================================
--- trunk/libc/nscd/getgrgid_r.c (original)
+++ trunk/libc/nscd/getgrgid_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	gid
 #define BUFLEN		NSS_BUFLEN_GROUP
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>

Modified: trunk/libc/nscd/getgrnam_r.c
==============================================================================
--- trunk/libc/nscd/getgrnam_r.c (original)
+++ trunk/libc/nscd/getgrnam_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS	const char *name
 #define ADD_VARIABLES	name
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>

Modified: trunk/libc/nscd/gethstbyad_r.c
==============================================================================
--- trunk/libc/nscd/gethstbyad_r.c (original)
+++ trunk/libc/nscd/gethstbyad_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -30,6 +30,9 @@
 #define NEED__RES	1
 #define NEED__RES_HCONF 1
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
 
 

Modified: trunk/libc/nscd/gethstbynm3_r.c
==============================================================================
--- trunk/libc/nscd/gethstbynm3_r.c (original)
+++ trunk/libc/nscd/gethstbynm3_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1998, 2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -40,6 +40,9 @@
 
 #define __inet_aton inet_aton
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
 
 

Modified: trunk/libc/nscd/getpwnam_r.c
==============================================================================
--- trunk/libc/nscd/getpwnam_r.c (original)
+++ trunk/libc/nscd/getpwnam_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		NSS_BUFLEN_PASSWD
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>

Modified: trunk/libc/nscd/getpwuid_r.c
==============================================================================
--- trunk/libc/nscd/getpwuid_r.c (original)
+++ trunk/libc/nscd/getpwuid_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	uid
 #define BUFLEN		NSS_BUFLEN_PASSWD
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>

Modified: trunk/libc/nscd/getsrvbynm_r.c
==============================================================================
--- trunk/libc/nscd/getsrvbynm_r.c (original)
+++ trunk/libc/nscd/getsrvbynm_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS		const char *name, const char *proto
 #define ADD_VARIABLES		name, proto
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/nscd/getsrvbypt_r.c
==============================================================================
--- trunk/libc/nscd/getsrvbypt_r.c (original)
+++ trunk/libc/nscd/getsrvbypt_r.c Tue Aug 28 14:14:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS		int port, const char *proto
 #define ADD_VARIABLES		port, proto
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"

Modified: trunk/libc/nscd/nscd.c
==============================================================================
--- trunk/libc/nscd/nscd.c (original)
+++ trunk/libc/nscd/nscd.c Tue Aug 28 14:14:43 2012
@@ -305,8 +305,10 @@
 # endif
 #endif
 
+#ifdef USE_NSCD
   /* Make sure we do not get recursive calls.  */
   __nss_disable_nscd (register_traced_file);
+#endif
 
   /* Init databases.  */
   nscd_init ();

Modified: trunk/libc/nss/nss_db/db-init.c
==============================================================================
--- trunk/libc/nss/nss_db/db-init.c (original)
+++ trunk/libc/nss/nss_db/db-init.c Tue Aug 28 14:14:43 2012
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
+
+#ifdef USE_NSCD
 
 #include <paths.h>
 #include <nscd/nscd.h>
@@ -51,3 +53,5 @@
   strcpy (serv_traced_file.file.fname, _PATH_VARDB "services.db");
   cb (servdb, &serv_traced_file.file);
 }
+
+#endif

Modified: trunk/libc/nss/nss_files/files-init.c
==============================================================================
--- trunk/libc/nss/nss_files/files-init.c (original)
+++ trunk/libc/nss/nss_files/files-init.c Tue Aug 28 14:14:43 2012
@@ -1,5 +1,5 @@
 /* Initialization in nss_files module.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
+
+#ifdef USE_NSCD
 
 #include <nscd/nscd.h>
 
@@ -55,3 +57,5 @@
 
   cb (netgrdb, &netgr_traced_file.file);
 }
+
+#endif

Modified: trunk/libc/nss/nsswitch.c
==============================================================================
--- trunk/libc/nss/nsswitch.c (original)
+++ trunk/libc/nss/nsswitch.c Tue Aug 28 14:14:43 2012
@@ -119,10 +119,12 @@
 #endif /* __OPTION_EGLIBC_NSSWITCH */
 
 
+#ifdef USE_NSCD
 /* Nonzero if this is the nscd process.  */
 static bool is_nscd;
 /* The callback passed to the init functions when nscd is used.  */
 static void (*nscd_init_cb) (size_t, struct traced_file *);
+#endif
 
 
 /* -1 == database not found
@@ -399,6 +401,7 @@
 	  ni->library->lib_handle = (void *) -1l;
 	  __set_errno (saved_errno);
 	}
+# ifdef USE_NSCD
       else if (is_nscd)
 	{
 	  /* Call the init function when nscd is used.  */
@@ -418,12 +421,13 @@
 	  if (ifct != NULL)
 	    {
 	      void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
-# ifdef PTR_DEMANGLE
+#  ifdef PTR_DEMANGLE
 	      PTR_DEMANGLE (cb);
-# endif
+#  endif
 	      ifct (cb);
 	    }
 	}
+# endif
     }
 
   return 0;
@@ -883,7 +887,7 @@
 #endif /* __OPTION_EGLIBC_NSSWITCH */
 
 
-#ifdef SHARED
+#if defined SHARED && defined USE_NSCD
 /* Load all libraries for the service.  */
 static void
 nss_load_all_libraries (const char *service, const char *def)

Modified: trunk/libc/ports/ChangeLog.alpha
==============================================================================
--- trunk/libc/ports/ChangeLog.alpha (original)
+++ trunk/libc/ports/ChangeLog.alpha Tue Aug 28 14:14:43 2012
@@ -1,3 +1,11 @@
+2012-08-27  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[BZ #5400]
+	* sysdeps/unix/sysv/linux/alpha/Makefile (CFLAGS-fdatasync.c): Define.
+	* sysdeps/unix/sysv/linux/alpha/fdatasync.c: New file
+	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
+	(__ASSUME_FDATASYNC): Define.
+
 2012-08-16  Carlos O'Donell  <carlos_odonell@xxxxxxxxxx>
 
 	* sysdeps/alpha/ldsodefs.h (ARCH_PLTENTER_MEMBERS)

Modified: trunk/libc/ports/ChangeLog.arm
==============================================================================
--- trunk/libc/ports/ChangeLog.arm (original)
+++ trunk/libc/ports/ChangeLog.arm Tue Aug 28 14:14:43 2012
@@ -1,3 +1,19 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove.
+
+2012-08-23  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/ldsodefs.h (VALID_FLOAT_ABI): Define
+	depending on __ARM_PCS_VFP.
+	(VALID_ELF_HEADER): Also check VALID_FLOAT_ABI.
+
+2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/kernel-features.h
+	(__ASSUME_MMAP2_SYSCALL): Remove.
+
 2012-08-15  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/arm/nptl/pthread_spin_lock.c: Use generic code.

Modified: trunk/libc/ports/ChangeLog.hppa
==============================================================================
--- trunk/libc/ports/ChangeLog.hppa (original)
+++ trunk/libc/ports/ChangeLog.hppa Tue Aug 28 14:14:43 2012
@@ -1,3 +1,13 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove.
+
+2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
+	(__ASSUME_MMAP2_SYSCALL): Remove.
+
 2012-08-15  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/hppa/nptl/pthread_spin_lock.c: Use generic code.

Modified: trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- trunk/libc/ports/ChangeLog.m68k (original)
+++ trunk/libc/ports/ChangeLog.m68k Tue Aug 28 14:14:43 2012
@@ -1,3 +1,18 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove.
+
+2012-08-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
+	(__ASSUME_FADVISE64_64_SYSCALL): Remove.
+
+2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
+	(__ASSUME_MMAP2_SYSCALL): Remove.
+
 2012-08-15  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/nptl/pthread_spin_lock.c: Use generic code.

Modified: trunk/libc/ports/ChangeLog.mips
==============================================================================
--- trunk/libc/ports/ChangeLog.mips (original)
+++ trunk/libc/ports/ChangeLog.mips Tue Aug 28 14:14:43 2012
@@ -1,3 +1,21 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove.
+
+2012-08-27  Guido Guenther  <agx@xxxxxxxxxxx>
+
+	* sysdeps/mips/fpu_control.h (_FPU_RESERVED): Set bit 23.
+
+2012-08-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/kernel-features.h [_MIPS_SIM ==
+	_ABIO32] (__ASSUME_STAT64_SYSCALL): Define.
+	* sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c: New file.  Based
+	on version from ../sysdeps/unix/sysv/linux/.
+	* sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips64/xstat64.c: Likewise.
+
 2012-08-16  Carlos O'Donell  <carlos_odonell@xxxxxxxxxx>
 
 	* sysdeps/mips/ldsodefs.h (ARCH_PLTENTER_MEMBERS)

Modified: trunk/libc/ports/ChangeLog.tile
==============================================================================
--- trunk/libc/ports/ChangeLog.tile (original)
+++ trunk/libc/ports/ChangeLog.tile Tue Aug 28 14:14:43 2012
@@ -1,3 +1,18 @@
+2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_STAT64_SYSCALL): Remove.
+
+2012-08-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_FADVISE64_64_SYSCALL): Remove.
+
+2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/kernel-features.h
+	(__ASSUME_MMAP2_SYSCALL): Remove.
+
 2012-08-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/kernel-features.h

Modified: trunk/libc/ports/sysdeps/mips/fpu_control.h
==============================================================================
--- trunk/libc/ports/sysdeps/mips/fpu_control.h (original)
+++ trunk/libc/ports/sysdeps/mips/fpu_control.h Tue Aug 28 14:14:43 2012
@@ -85,7 +85,7 @@
 #define _FPU_RC_UP      0x2
 #define _FPU_RC_DOWN    0x3
 
-#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
 
 
 /* The fdlibm code requires strict IEEE double precision arithmetic,

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/Makefile
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/Makefile (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/Makefile Tue Aug 28 14:14:43 2012
@@ -20,6 +20,7 @@
 # Support old ipc control
 sysdep_routines += oldmsgctl oldsemctl oldshmctl
 
+CFLAGS-fdatasync.c = -fexceptions
 CFLAGS-ioperm.c = -Wa,-mev6
 endif
 

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h Tue Aug 28 14:14:43 2012
@@ -82,4 +82,9 @@
 #undef __ASSUME_STATFS64
 #define __ASSUME_STATFS64 0
 
+/* Support for fsyncdata was added for alpha after 2.6.21.  */
+#if __LINUX_KERNEL_VERSION >= 0x020616
+# define __ASSUME_FDATASYNC	1
+#endif
+
 #endif /* _KERNEL_FEATURES_H */

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h Tue Aug 28 14:14:43 2012
@@ -19,11 +19,6 @@
 
 /* The utimes syscall was added before 2.6.1.  */
 #define __ASSUME_UTIMES	1
-
-/* On ARM the mmap2/stat64/lstat64/fstat64 syscalls were introduced in
-   2.3.35.  */
-#define __ASSUME_MMAP2_SYSCALL		1
-#define __ASSUME_STAT64_SYSCALL	1
 
 /* The signal frame layout changed in 2.6.18.  */
 #if __LINUX_KERNEL_VERSION >= 132626

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h Tue Aug 28 14:14:43 2012
@@ -27,10 +27,22 @@
 
 #define EXTRA_OSABI ELFOSABI_ARM_AEABI
 
+#ifdef __ARM_PCS_VFP
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)	\
+   || !((x) & EF_ARM_ABI_FLOAT_SOFT))
+#else
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)	\
+   || !((x) & EF_ARM_ABI_FLOAT_HARD))
+#endif
+
+#undef VALID_ELF_HEADER
 #define VALID_ELF_HEADER(hdr,exp,size)		\
-  (memcmp (hdr, exp, size) == 0			\
-   || memcmp (hdr, expected2, size) == 0	\
-   || memcmp (hdr, expected3, size) == 0)
+  ((memcmp (hdr, exp, size) == 0		\
+    || memcmp (hdr, expected2, size) == 0	\
+    || memcmp (hdr, expected3, size) == 0)	\
+   && VALID_FLOAT_ABI (ehdr->e_flags))
 #define VALID_ELF_OSABI(osabi)		(osabi == ELFOSABI_SYSV		\
 					 || osabi == EXTRA_OSABI	\
 					 || osabi == ELFOSABI_LINUX)

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h Tue Aug 28 14:14:43 2012
@@ -23,8 +23,6 @@
    and expect the final version here.  */
 #define __ASSUME_32BITUIDS		1
 #define __ASSUME_TRUNCATE64_SYSCALL	1
-#define __ASSUME_MMAP2_SYSCALL		1
-#define __ASSUME_STAT64_SYSCALL		1
 #define __ASSUME_IPC64			1
 #define __ASSUME_ST_INO_64_BIT		1
 #define __ASSUME_GETDENTS64_SYSCALL	1

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
==============================================================================
--- trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h (original)
+++ trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h Tue Aug 28 14:14:43 2012
@@ -17,13 +17,8 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* These features were surely available with 2.4.12.  */
-#define __ASSUME_MMAP2_SYSCALL		1
-#define __ASSUME_STAT64_SYSCALL	1
-
 /* Many syscalls were added in 2.6.10 for m68k.  */
 #define __ASSUME_UTIMES	1
-#define __ASSUME_FADVISE64_64_SYSCALL	1
 
 #include_next <kernel-features.h>
 

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 28 14:14:43 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-20213
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-20391

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 28 14:14:43 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-20213
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-20391

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 28 14:14:43 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-20213
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-20391

Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 28 14:14:43 2012
@@ -1,2 +1,2 @@
 /fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-20213
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-20391

Modified: trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h

[... 13406 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits