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

[Commits] r20214 - in /trunk: ./ libc/ libc/bits/ libc/crypt/ libc/debug/ libc/dirent/ libc/elf/ libc/grp/ libc/gshadow/ libc/hurd/ li...



Author: joseph
Date: Fri Aug 17 19:39:53 2012
New Revision: 20214

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

Added:
    trunk/libc/crypt/md5test-giant.c
      - copied unchanged from r20213, fsf/trunk/libc/crypt/md5test-giant.c
    trunk/libc/io/lseek.c
      - copied unchanged from r20213, fsf/trunk/libc/io/lseek.c
    trunk/libc/nptl/pthread_spin_lock.c
      - copied unchanged from r20213, fsf/trunk/libc/nptl/pthread_spin_lock.c
    trunk/libc/nptl/pthread_spin_trylock.c
      - copied unchanged from r20213, fsf/trunk/libc/nptl/pthread_spin_trylock.c
    trunk/libc/ports/sysdeps/arm/arm-features.h
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/arm/arm-features.h
    trunk/libc/ports/sysdeps/arm/bits/atomic.h
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/arm/bits/atomic.h
    trunk/libc/ports/sysdeps/arm/sotruss-lib.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/arm/sotruss-lib.c
    trunk/libc/ports/sysdeps/m68k/coldfire/fpu/bits/
      - copied from r20213, fsf/trunk/libc/ports/sysdeps/m68k/coldfire/fpu/bits/
    trunk/libc/ports/sysdeps/mips/nptl/pthread_spin_lock.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/mips/nptl/pthread_spin_lock.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/arm-features.h
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/arm-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/atomic.h
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/atomic.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips32/fcntl.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips32/fcntl.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips32/lockf64.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips32/lockf64.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/fcntl.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/fcntl.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/lockf64.c
      - copied unchanged from r20213, fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/lockf64.c
    trunk/libc/sysdeps/generic/eloop-threshold.h
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/generic/eloop-threshold.h
    trunk/libc/sysdeps/mach/hurd/eloop-threshold.h
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/mach/hurd/eloop-threshold.h
    trunk/libc/sysdeps/mach/hurd/renameat.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/mach/hurd/renameat.c
    trunk/libc/sysdeps/mach/hurd/sysconf.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/mach/hurd/sysconf.c
    trunk/libc/sysdeps/posix/closedir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/closedir.c
    trunk/libc/sysdeps/posix/dirfd.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/dirfd.c
    trunk/libc/sysdeps/posix/dirstream.h
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/dirstream.h
    trunk/libc/sysdeps/posix/fdopendir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/fdopendir.c
    trunk/libc/sysdeps/posix/opendir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/opendir.c
    trunk/libc/sysdeps/posix/readdir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/readdir.c
    trunk/libc/sysdeps/posix/readdir_r.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/readdir_r.c
    trunk/libc/sysdeps/posix/rewinddir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/rewinddir.c
    trunk/libc/sysdeps/posix/seekdir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/seekdir.c
    trunk/libc/sysdeps/posix/telldir.c
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/posix/telldir.c
    trunk/libc/sysdeps/pthread/Makeconfig
      - copied unchanged from r20213, fsf/trunk/libc/sysdeps/pthread/Makeconfig
Removed:
    trunk/libc/misc/lseek.c
    trunk/libc/ports/sysdeps/arm/nptl/pthread_spin_trylock.c
    trunk/libc/ports/sysdeps/hppa/nptl/pthread_spin_trylock.c
    trunk/libc/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c
    trunk/libc/ports/sysdeps/mips/nptl/pthread_spin_lock.S
    trunk/libc/ports/sysdeps/mips/nptl/pthread_spin_trylock.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/nptl/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/nptl/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/fcntl.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/lockf64.c
    trunk/libc/sysdeps/pthread/configure
    trunk/libc/sysdeps/unix/bsd/bsd4.4/bits/dirent.h
    trunk/libc/sysdeps/unix/bsd/bsd4.4/bits/fcntl.h
    trunk/libc/sysdeps/unix/closedir.c
    trunk/libc/sysdeps/unix/dirfd.c
    trunk/libc/sysdeps/unix/dirstream.h
    trunk/libc/sysdeps/unix/fdopendir.c
    trunk/libc/sysdeps/unix/opendir.c
    trunk/libc/sysdeps/unix/readdir.c
    trunk/libc/sysdeps/unix/readdir_r.c
    trunk/libc/sysdeps/unix/rewinddir.c
    trunk/libc/sysdeps/unix/seekdir.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
    trunk/libc/sysdeps/unix/sysv/linux/sh/getrlimit.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c
    trunk/libc/sysdeps/unix/telldir.c
    trunk/libc/sysdeps/wordsize-64/alphasort.c
    trunk/libc/sysdeps/wordsize-64/alphasort64.c
    trunk/libc/sysdeps/wordsize-64/fseeko.c
    trunk/libc/sysdeps/wordsize-64/fseeko64.c
    trunk/libc/sysdeps/wordsize-64/ftello.c
    trunk/libc/sysdeps/wordsize-64/ftello64.c
    trunk/libc/sysdeps/wordsize-64/iofgetpos.c
    trunk/libc/sysdeps/wordsize-64/iofgetpos64.c
    trunk/libc/sysdeps/wordsize-64/iofopen.c
    trunk/libc/sysdeps/wordsize-64/iofopen64.c
    trunk/libc/sysdeps/wordsize-64/iofsetpos.c
    trunk/libc/sysdeps/wordsize-64/iofsetpos64.c
    trunk/libc/sysdeps/wordsize-64/lockf.c
    trunk/libc/sysdeps/wordsize-64/lockf64.c
    trunk/libc/sysdeps/wordsize-64/mkostemp.c
    trunk/libc/sysdeps/wordsize-64/mkostemp64.c
    trunk/libc/sysdeps/wordsize-64/mkstemp.c
    trunk/libc/sysdeps/wordsize-64/mkstemp64.c
    trunk/libc/sysdeps/wordsize-64/scandir.c
    trunk/libc/sysdeps/wordsize-64/scandir64.c
    trunk/libc/sysdeps/wordsize-64/scandirat.c
    trunk/libc/sysdeps/wordsize-64/scandirat64.c
    trunk/libc/sysdeps/wordsize-64/versionsort.c
    trunk/libc/sysdeps/wordsize-64/versionsort64.c
Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/Makeconfig
    trunk/libc/NEWS
    trunk/libc/README
    trunk/libc/WUR-REPORT
    trunk/libc/bits/dirent.h
    trunk/libc/bits/fcntl.h
    trunk/libc/bits/libc-lock.h
    trunk/libc/bits/typesizes.h
    trunk/libc/config.h.in
    trunk/libc/configure
    trunk/libc/configure.in
    trunk/libc/crypt/Makefile
    trunk/libc/crypt/md5.c
    trunk/libc/crypt/sha512.c
    trunk/libc/debug/Makefile
    trunk/libc/dirent/alphasort.c
    trunk/libc/dirent/alphasort64.c
    trunk/libc/dirent/scandir.c
    trunk/libc/dirent/scandir64.c
    trunk/libc/dirent/scandirat.c
    trunk/libc/dirent/scandirat64.c
    trunk/libc/dirent/versionsort.c
    trunk/libc/dirent/versionsort64.c
    trunk/libc/elf/chroot_canon.c
    trunk/libc/elf/dl-close.c
    trunk/libc/elf/dl-load.c
    trunk/libc/elf/dl-lookup.c
    trunk/libc/elf/dl-open.c
    trunk/libc/elf/dl-sym.c
    trunk/libc/elf/elf.h
    trunk/libc/elf/tst-unique1mod1.c
    trunk/libc/elf/tst-unique1mod2.c
    trunk/libc/elf/tst-unique2mod1.c
    trunk/libc/elf/tst-unique2mod2.c
    trunk/libc/grp/Makefile
    trunk/libc/gshadow/Makefile
    trunk/libc/hurd/lookup-retry.c
    trunk/libc/include/atomic.h
    trunk/libc/include/dirent.h
    trunk/libc/include/libc-symbols.h
    trunk/libc/include/sys/socket.h
    trunk/libc/inet/getnetgrent_r.c
    trunk/libc/inet/netgroup.h
    trunk/libc/io/lockf.c
    trunk/libc/io/lockf64.c
    trunk/libc/libio/Makefile
    trunk/libc/libio/fseeko.c
    trunk/libc/libio/fseeko64.c
    trunk/libc/libio/ftello.c
    trunk/libc/libio/ftello64.c
    trunk/libc/libio/genops.c
    trunk/libc/libio/iofgetpos.c
    trunk/libc/libio/iofgetpos64.c
    trunk/libc/libio/iofopen.c
    trunk/libc/libio/iofopen64.c
    trunk/libc/libio/iofsetpos.c
    trunk/libc/libio/iofsetpos64.c
    trunk/libc/libio/libioP.h
    trunk/libc/malloc/arena.c
    trunk/libc/malloc/malloc.c
    trunk/libc/manual/stdio.texi
    trunk/libc/math/libm-test.inc
    trunk/libc/math/s_clog.c
    trunk/libc/math/s_clog10.c
    trunk/libc/math/s_clog10f.c
    trunk/libc/math/s_clog10l.c
    trunk/libc/math/s_clogf.c
    trunk/libc/math/s_clogl.c
    trunk/libc/misc/Makefile
    trunk/libc/misc/mkostemp.c
    trunk/libc/misc/mkostemp64.c
    trunk/libc/misc/mkostemps.c
    trunk/libc/misc/mkostemps64.c
    trunk/libc/misc/mkstemp.c
    trunk/libc/misc/mkstemp64.c
    trunk/libc/misc/mkstemps.c
    trunk/libc/misc/mkstemps64.c
    trunk/libc/nptl/ChangeLog
    trunk/libc/nptl/Makefile
    trunk/libc/nptl/allocatestack.c
    trunk/libc/nptl/nptl-init.c
    trunk/libc/nptl/pthread_cancel.c
    trunk/libc/nptl/pthread_cond_timedwait.c
    trunk/libc/nptl/pthread_condattr_setclock.c
    trunk/libc/nptl/sysdeps/pthread/bits/libc-lockP.h
    trunk/libc/nptl/sysdeps/pthread/createthread.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/Makefile
    trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/pt-raise.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/raise.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_create.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_delete.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_routines.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/timer_settime.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
    trunk/libc/nss/getXXbyYY_r.c
    trunk/libc/ports/ChangeLog.alpha
    trunk/libc/ports/ChangeLog.am33
    trunk/libc/ports/ChangeLog.arm
    trunk/libc/ports/ChangeLog.hppa
    trunk/libc/ports/ChangeLog.ia64
    trunk/libc/ports/ChangeLog.linux-generic
    trunk/libc/ports/ChangeLog.m68k
    trunk/libc/ports/ChangeLog.mips
    trunk/libc/ports/ChangeLog.tile
    trunk/libc/ports/sysdeps/alpha/configure
    trunk/libc/ports/sysdeps/alpha/configure.in
    trunk/libc/ports/sysdeps/alpha/fpu/s_nearbyint.c
    trunk/libc/ports/sysdeps/alpha/ldsodefs.h
    trunk/libc/ports/sysdeps/arm/__longjmp.S
    trunk/libc/ports/sysdeps/arm/dl-irel.h
    trunk/libc/ports/sysdeps/arm/dl-machine.h
    trunk/libc/ports/sysdeps/arm/fclrexcpt.c
    trunk/libc/ports/sysdeps/arm/fedisblxcpt.c
    trunk/libc/ports/sysdeps/arm/feenablxcpt.c
    trunk/libc/ports/sysdeps/arm/fegetenv.c
    trunk/libc/ports/sysdeps/arm/fegetexcept.c
    trunk/libc/ports/sysdeps/arm/fegetround.c
    trunk/libc/ports/sysdeps/arm/feholdexcpt.c
    trunk/libc/ports/sysdeps/arm/fesetenv.c
    trunk/libc/ports/sysdeps/arm/fesetround.c
    trunk/libc/ports/sysdeps/arm/feupdateenv.c
    trunk/libc/ports/sysdeps/arm/fgetexcptflg.c
    trunk/libc/ports/sysdeps/arm/fraiseexcpt.c
    trunk/libc/ports/sysdeps/arm/fsetexcptflg.c
    trunk/libc/ports/sysdeps/arm/ftestexcept.c
    trunk/libc/ports/sysdeps/arm/ldsodefs.h
    trunk/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c
    trunk/libc/ports/sysdeps/arm/setfpucw.c
    trunk/libc/ports/sysdeps/arm/setjmp.S
    trunk/libc/ports/sysdeps/arm/sysdep.h
    trunk/libc/ports/sysdeps/hppa/nptl/pthread_spin_lock.c
    trunk/libc/ports/sysdeps/ia64/bits/byteswap-16.h
    trunk/libc/ports/sysdeps/ia64/bits/byteswap.h
    trunk/libc/ports/sysdeps/ia64/configure
    trunk/libc/ports/sysdeps/ia64/configure.in
    trunk/libc/ports/sysdeps/ia64/fpu/libm-symbols.h
    trunk/libc/ports/sysdeps/ia64/fpu/libm_tan.S
    trunk/libc/ports/sysdeps/ia64/ldsodefs.h
    trunk/libc/ports/sysdeps/m68k/asm-syntax.h
    trunk/libc/ports/sysdeps/m68k/ldsodefs.h
    trunk/libc/ports/sysdeps/m68k/m680x0/fpu/libm-test-ulps
    trunk/libc/ports/sysdeps/m68k/nptl/pthread_spin_lock.c
    trunk/libc/ports/sysdeps/m68k/sysdep.h
    trunk/libc/ports/sysdeps/mips/bits/atomic.h
    trunk/libc/ports/sysdeps/mips/dl-lookup.c
    trunk/libc/ports/sysdeps/mips/ldsodefs.h
    trunk/libc/ports/sysdeps/mips/sys/asm.h
    trunk/libc/ports/sysdeps/tile/sysdep.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fxstat.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/fxstatat.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/lxstat.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstat.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/am33/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/am33/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getcontext.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/arm/setcontext.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/Versions
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list
    trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/system.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/configure
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/configure.in
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.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/regcomp.c
    trunk/libc/posix/unistd.h
    trunk/libc/pwd/Makefile
    trunk/libc/rt/clock_nanosleep.c
    trunk/libc/shadow/Makefile
    trunk/libc/socket/accept4.c
    trunk/libc/stdio-common/Makefile
    trunk/libc/stdio-common/_itoa.c
    trunk/libc/stdio-common/_itowa.c
    trunk/libc/stdio-common/isoc99_scanf.c
    trunk/libc/stdlib/Makefile
    trunk/libc/stdlib/canonicalize.c
    trunk/libc/stdlib/divmod_1.c
    trunk/libc/stdlib/gmp-impl.h
    trunk/libc/stdlib/longlong.h
    trunk/libc/stdlib/mod_1.c
    trunk/libc/stdlib/secure-getenv.c
    trunk/libc/stdlib/tst-secure-getenv.c
    trunk/libc/string/str-two-way.h
    trunk/libc/string/test-strncasecmp.c
    trunk/libc/sunrpc/rpc_main.c
    trunk/libc/sysdeps/generic/siglist.h
    trunk/libc/sysdeps/generic/sys/param.h
    trunk/libc/sysdeps/i386/configure
    trunk/libc/sysdeps/i386/configure.in
    trunk/libc/sysdeps/i386/fpu/e_acosh.S
    trunk/libc/sysdeps/i386/fpu/e_acoshf.S
    trunk/libc/sysdeps/i386/fpu/e_acoshl.S
    trunk/libc/sysdeps/i386/fpu/e_atanh.S
    trunk/libc/sysdeps/i386/fpu/e_atanhf.S
    trunk/libc/sysdeps/i386/fpu/e_atanhl.S
    trunk/libc/sysdeps/i386/fpu/e_expl.S
    trunk/libc/sysdeps/i386/fpu/e_log.S
    trunk/libc/sysdeps/i386/fpu/e_log10.S
    trunk/libc/sysdeps/i386/fpu/e_log10f.S
    trunk/libc/sysdeps/i386/fpu/e_log10l.S
    trunk/libc/sysdeps/i386/fpu/e_log2.S
    trunk/libc/sysdeps/i386/fpu/e_log2f.S
    trunk/libc/sysdeps/i386/fpu/e_log2l.S
    trunk/libc/sysdeps/i386/fpu/e_logf.S
    trunk/libc/sysdeps/i386/fpu/e_logl.S
    trunk/libc/sysdeps/i386/fpu/e_pow.S
    trunk/libc/sysdeps/i386/fpu/e_powf.S
    trunk/libc/sysdeps/i386/fpu/e_powl.S
    trunk/libc/sysdeps/i386/fpu/e_scalb.S
    trunk/libc/sysdeps/i386/fpu/e_scalbf.S
    trunk/libc/sysdeps/i386/fpu/e_scalbl.S
    trunk/libc/sysdeps/i386/fpu/libm-test-ulps
    trunk/libc/sysdeps/i386/fpu/s_asinh.S
    trunk/libc/sysdeps/i386/fpu/s_asinhf.S
    trunk/libc/sysdeps/i386/fpu/s_asinhl.S
    trunk/libc/sysdeps/i386/fpu/s_cbrt.S
    trunk/libc/sysdeps/i386/fpu/s_cbrtf.S
    trunk/libc/sysdeps/i386/fpu/s_cbrtl.S
    trunk/libc/sysdeps/i386/fpu/s_expm1.S
    trunk/libc/sysdeps/i386/fpu/s_expm1f.S
    trunk/libc/sysdeps/i386/fpu/s_frexp.S
    trunk/libc/sysdeps/i386/fpu/s_frexpf.S
    trunk/libc/sysdeps/i386/fpu/s_frexpl.S
    trunk/libc/sysdeps/i386/i386-mcount.S
    trunk/libc/sysdeps/i386/i686/fpu/e_logl.S
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S
    trunk/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
    trunk/libc/sysdeps/i386/i686/multiarch/strstr-c.c
    trunk/libc/sysdeps/i386/i686/strtok.S
    trunk/libc/sysdeps/i386/strtok.S
    trunk/libc/sysdeps/i386/sysdep.h
    trunk/libc/sysdeps/mach/hurd/Makeconfig
    trunk/libc/sysdeps/mach/hurd/bits/local_lim.h
    trunk/libc/sysdeps/mach/hurd/configure.in
    trunk/libc/sysdeps/mach/hurd/sys/param.h
    trunk/libc/sysdeps/posix/system.c
    trunk/libc/sysdeps/powerpc/powerpc32/sysdep.h
    trunk/libc/sysdeps/powerpc/sysdep.h
    trunk/libc/sysdeps/s390/s390-32/s390-mcount.S
    trunk/libc/sysdeps/s390/s390-32/sysdep.h
    trunk/libc/sysdeps/s390/s390-64/s390x-mcount.S
    trunk/libc/sysdeps/s390/s390-64/sysdep.h
    trunk/libc/sysdeps/sh/_mcount.S
    trunk/libc/sysdeps/sh/ldsodefs.h
    trunk/libc/sysdeps/sh/sysdep.h
    trunk/libc/sysdeps/sparc/fpu/libm-test-ulps
    trunk/libc/sysdeps/sparc/ldsodefs.h
    trunk/libc/sysdeps/unix/Makefile
    trunk/libc/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
    trunk/libc/sysdeps/unix/make-syscalls.sh
    trunk/libc/sysdeps/unix/sysv/linux/bits/dirent.h
    trunk/libc/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
    trunk/libc/sysdeps/unix/sysv/linux/clock_getres.c
    trunk/libc/sysdeps/unix/sysv/linux/clock_gettime.c
    trunk/libc/sysdeps/unix/sysv/linux/clock_nanosleep.c
    trunk/libc/sysdeps/unix/sysv/linux/clock_settime.c
    trunk/libc/sysdeps/unix/sysv/linux/configure
    trunk/libc/sysdeps/unix/sysv/linux/configure.in
    trunk/libc/sysdeps/unix/sysv/linux/dl-execstack.c
    trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c
    trunk/libc/sysdeps/unix/sysv/linux/getdents.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/fcntl.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/lockf64.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/readdir64.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/readdir64_r.c
    trunk/libc/sysdeps/unix/sysv/linux/i386/vfork.S
    trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
    trunk/libc/sysdeps/unix/sysv/linux/ldsodefs.h
    trunk/libc/sysdeps/unix/sysv/linux/opendir.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
    trunk/libc/sysdeps/unix/sysv/linux/readdir64.c
    trunk/libc/sysdeps/unix/sysv/linux/readdir64_r.c
    trunk/libc/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
    trunk/libc/sysdeps/unix/sysv/linux/s390/system.c
    trunk/libc/sysdeps/unix/sysv/linux/shm_open.c
    trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
    trunk/libc/sysdeps/unix/sysv/linux/sparc/system.c
    trunk/libc/sysdeps/unix/sysv/linux/sys/fsuid.h
    trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
    trunk/libc/sysdeps/unix/sysv/linux/sysconf.c
    trunk/libc/sysdeps/unix/sysv/linux/system.c
    trunk/libc/sysdeps/unix/sysv/linux/waitid.c
    trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/readdir.c
    trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
    trunk/libc/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/time.c
    trunk/libc/sysdeps/x86_64/_mcount.S
    trunk/libc/sysdeps/x86_64/configure
    trunk/libc/sysdeps/x86_64/configure.in
    trunk/libc/sysdeps/x86_64/fpu/e_expf.S
    trunk/libc/sysdeps/x86_64/fpu/e_expl.S
    trunk/libc/sysdeps/x86_64/fpu/e_log10l.S
    trunk/libc/sysdeps/x86_64/fpu/e_log2l.S
    trunk/libc/sysdeps/x86_64/fpu/e_logl.S
    trunk/libc/sysdeps/x86_64/fpu/e_powl.S
    trunk/libc/sysdeps/x86_64/fpu/e_scalbl.S
    trunk/libc/sysdeps/x86_64/fpu/libm-test-ulps
    trunk/libc/sysdeps/x86_64/fpu/s_copysign.S
    trunk/libc/sysdeps/x86_64/fpu/s_copysignf.S
    trunk/libc/sysdeps/x86_64/multiarch/memmove.c
    trunk/libc/sysdeps/x86_64/multiarch/strstr-c.c
    trunk/libc/sysdeps/x86_64/strtok.S
    trunk/libc/sysdeps/x86_64/sysdep.h
    trunk/libc/wcsmbs/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 17 19:39:53 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-19920
+/fsf/trunk:15224-20213

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Fri Aug 17 19:39:53 2012
@@ -1,3 +1,803 @@
+2012-08-17  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* libio/genops.c (_IO_unbuffer_write): Conditionalize locking code on
+	[_IO_MTSAFE_IO].
+	* libio/libioP.h [!_IO_MTSAFE_IO && !NOT_IN_libc]
+	(_IO_acquire_lock, _IO_acquire_lock_clear_flags2, _IO_release_lock):
+	New macros.
+
+	* Makeconfig [$(libc-reentrant) = yes] (libio-mtsafe): New variable.
+	* libio/Makefile (CPPFLAGS): Append $(libio-mtsafe) unconditionally
+	rather than -D_IO_MTSAFE_IO conditionally.
+	* stdio-common/Makefile (CPPFLAGS): Likewise.
+	* wcsmbs/Makefile (CPPFLAGS): Likewise.
+	* stdlib/Makefile (CFLAGS-strfmon.c, CFLAGS-strfmon_l.c):
+	Use $(libio-mtsafe).
+	* debug/Makefile (CFLAGS-sprintf_chk.c): Use $(libio-mtsafe) instead
+	of -D_IO_MTSAFE_IO.
+	(CFLAGS-snprintf_chk.c, CFLAGS-vsprintf_chk.c): Likewise.
+	(CFLAGS-vsnprintf_chk.c, CFLAGS-asprintf_chk.c): Likewise.
+	(CFLAGS-vasprintf_chk.c, CFLAGS-obprintf_chk.c): Likewise.
+	(CFLAGS-dprintf_chk.c, CFLAGS-vdprintf_chk.c): Likewise.
+	(CFLAGS-printf_chk.c, CFLAGS-fprintf_chk.c): Likewise.
+	(CFLAGS-vprintf_chk.c, CFLAGS-vfprintf_chk.c): Likewise.
+	(CFLAGS-gets_chk.c, CFLAGS-fgets_chk.c): Likewise.
+	(CFLAGS-fgets_u_chk.c, CFLAGS-fread_chk.c): Likewise.
+	(CFLAGS-fread_u_chk.c): Likewise.
+	(CFLAGS-swprintf_chk.c, CFLAGS-vswprintf_chk.c): Likewise.
+	(CFLAGS-wprintf_chk.c, CFLAGS-fwprintf_chk.c): Likewise.
+	(CFLAGS-vwprintf_chk.c, CFLAGS-vfwprintf_chk.c): Likewise.
+	(CFLAGS-fgetws_chk.c, CFLAGS-fgetws_u_chk.c): Likewise.
+	* grp/Makefile (CFLAGS-fgetgrent_r.c, CFLAGS-putgrent.c): Likewise.
+	* gshadow/Makefile (CFLAGS-fgetsgent_r.c, CFLAGS-putsgent.c): Likewise.
+	* misc/Makefile (CFLAGS-mntent_r.c): Likewise.
+	* pwd/Makefile (CFLAGS-fgetpwent_r.c): Likewise.
+	* shadow/Makefile (CFLAGS-fgetspent_r.c, CFLAGS-putspent.c): Likewise.
+
+	* libio/Makefile: Test [$(libc-reentrant) = yes]
+	instead of [$(filter %REENTRANT, $(defines)) nonempty].
+
+	* Makeconfig
+	[$(libc-reentrant) = yes] (defines): Append -D_LIBC_REENTRANT.
+	* sysdeps/pthread/configure: File removed.
+	* sysdeps/pthread/Makeconfig: New file.
+	* sysdeps/mach/hurd/Makeconfig (libc-reentrant): New variable.
+	* sysdeps/mach/hurd/configure.in: Don't touch DEFINES here.
+
+2012-08-16  Gary Benson  <gbenson@xxxxxxxxxx>
+
+	* elf/dl-close.c (_dl_close_worker): Also set r->r_map when
+	unmapping the first object in a namespace.
+
+2012-08-16  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* inet/getnetgrent_r.c (internal_setnetgrent): Renamed to ...
+	(__internal_setnetgrent): ... this.  Add internal_function to
+	definition.  Add libc_hidden_def.
+	(setnetgrent): Update caller.
+	(internal_endnetgrent): Renamed to ...
+	(__internal_endnetgrent): ... this.  Add internal_function to
+	definition.  Add libc_hidden_def.
+	(endnetgrent): Update caller.
+	(internal_getnetgrent_r): Renamed to ...
+	(__internal_getnetgrent_r): ... this.  Add internal_function to
+	definition.  Add libc_hidden_def.
+	(__getnetgrent_r): Update caller.
+	* inet/netgroup.h: Update declarations.  Add libc_hidden_proto uses.
+
+2012-08-16  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* stdlib/longlong.h: Update from GCC.
+
+2012-08-16  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* stdlib/gmp-impl.h (udiv_qrnnd_preinv): Use __attribute__ ((unused))
+	on _QL, which is set by umul_ppmm but never used.
+	* stdio-common/_itoa.c (_itoa): Use __attribute__ ((unused)) on DUMMY
+	variables, which are set by GMP macros but never used.
+	* stdio-common/_itowa.c (_itowa): Likewise.
+	* stdlib/divmod_1.c (mpn_divmod_1): Likewise.
+	* stdlib/mod_1.c (mpn_mod_1): Likewise.
+
+2012-08-16  Carlos O'Donell  <carlos_odonell@xxxxxxxxxx>
+
+	* sysdeps/sh/ldsodefs.h (ARCH_PLTENTER_MEMBERS) <sh_gnu_pltenter>:
+	struct La_sh_regs is not constant.
+	* sysdeps/sparc/ldsodefs.h (ARCH_PLTENTER_MEMBERS)
+	<sparc32_gnu_pltenter, sparc64_gnu_pltenter>: struct La_sparc32_regs
+	and struct La_sparc64_regs are not constant.
+
+2012-08-16  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_POSIX_TIMERS): Remove.
+	* sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+	[!__ASSUME_POSIX_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_getres.c [__ASSUME_POSIX_TIMERS]:
+	Make code unconditional.
+	[!__ASSUME_POSIX_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_gettime.c [__ASSUME_POSIX_TIMERS]:
+	Make code unconditional.
+	[!__ASSUME_POSIX_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_nanosleep.c
+	[__ASSUME_POSIX_TIMERS]: Make code unconditional.
+	[!__ASSUME_POSIX_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_settime.c [__ASSUME_POSIX_TIMERS]:
+	Make code unconditional.
+	[!__ASSUME_POSIX_TIMERS]: Remove conditional code.
+	[__ASSUME_POSIX_CPU_TIMERS <= 0 && __NR_clock_settime]
+	(__libc_missing_posix_timers): Remove.
+
+2012-08-15  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* elf/dl-load.c (_dl_map_object_from_fd) [SHARED]: Conditionalize
+	check of GL(dl_error_catch_tsd) on [_LIBC_REENTRANT].
+
+	* bits/libc-lock.h (__rtld_lock_initialize): New macro.
+
+	* elf/dl-sym.c: Include <stdlib.h>.
+
+	* posix/regcomp.c (init_word_char): Use temporaries to hold the 64-bit
+	constants, which avoids warnings in 32-bit builds.
+
+	* bits/fcntl.h [__USE_POSIX199309 || __USE_UNIX98]:
+	(O_DSYNC, O_RSYNC): New macros (with NetBSD values).
+
+	* misc/lseek.c: File moved to ...
+	* io/lseek.c: ... here.
+
+	* rt/clock_nanosleep.c: Include <time.h>, not <sys/time.h>.
+
+	* crypt/sha512.c (sha512_process_block) [!USE_TOTAL128]: Avoid
+	shifting LEN more than 31 bits at once.
+
+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.
+	* string/test-strncasecmp.c (check1): Renamed to...
+	(bz12205): ...this.
+	(bz14195): Add new testcase for two empty input strings and N > 0.
+	(test_main): Call new testcase, adapt for renamed function.
+
+2012-08-15  Andreas Jaeger  <aj@xxxxxxx>
+
+	[BZ #14090]
+	* crypt/md5test2.c: New test, based on test supplied by Serge
+	Belyshev <belyshev@xxxxxxxxxxxxxxxxx>.
+	* crypt/Makefile (xtests): Add md5test-giant..
+	* crypt/Makefile ($(objpfx)md5test-giant): Add.
+
+2012-08-15  Paul Eggert  <eggert@xxxxxxxxxxx>
+
+	[BZ #14090]
+	* crypt/md5.c (md5_process_block): Don't assume the buffer
+	length is less than 2**32.
+	* crypt/sha512.c (sha512_process_block): Don't assume the buffer
+	length is less than 2**64.
+
+2012-08-15  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* string/str-two-way.h: Include <sys/param.h>.
+	(MAX): Macro removed.
+
+	* sysdeps/x86_64/multiarch/strstr-c.c: Add copyright header.
+	Move #define and #undef of memmove to just before and after
+	including <string.h>.
+
+	* sysdeps/x86_64/multiarch/memmove.c: Don't include <stddef.h>.
+	[!NOT_IN_libc]: Move #define and #undef of memmove to just before
+	and after including <string.h>.  Move declarations of
+	__memmove_sse2, __memmove_ssse3, and __memmove_ssse3_back
+	to before #include "string/memmove.c".
+
+	* include/dirent.h: Declare __getdirentries.
+
+	* sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
+	using its value, to avoid warnings in the [!_LIBC_REENTRANT] case.
+
+2012-08-14  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* config.h.in (HAVE_CPP_ASM_DEBUGINFO): Delete.
+	* sysdeps/i386/configure.in: Remove assembler-with-cpp debug check.
+	* sysdeps/i386/configure: Regenerated.
+	* sysdeps/i386/sysdep.h (ENTRY): Remove calls to STABS_CURRENT_FILE1,
+	STABS_CURRENT_FILE, and STABS_FUN.
+	(END): Remove call to STABS_FUN_END.
+	(STABS_CURRENT_FILE1): Delete.
+	(STABS_CURRENT_FILE): Likewise.
+	(STABS_FUN): Likewise.
+	(STABS_FUN_END): Likewise.
+	(STABS_FUN2): Likewise.
+	* sysdeps/x86_64/configure.in: Remove assembler-with-cpp debug check.
+	* sysdeps/x86_64/configure: Regenerated.
+
+2012-08-14  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* elf/dl-open.c: Include <atomic.h>.
+	* elf/dl-lookup.c: Likewise.
+
+2012-08-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_CLONE_THREAD_FLAGS): Remove.
+	* sysdeps/unix/sysv/linux/s390/system.c (FORK): Define
+	unconditionally.
+	* sysdeps/unix/sysv/linux/sparc/system.c (FORK): Define
+	unconditionally.
+	* sysdeps/unix/sysv/linux/system.c [!FORK] (FORK): Do not
+	condition on __ASSUME_CLONE_THREAD_FLAGS.
+
+2012-08-14  Andreas Jaeger  <aj@xxxxxxx>
+
+	* sysdeps/i386/fpu/libm-test-ulps: Update.
+
+2012-08-13  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	* include/atomic.h (atomic_exchange_and_add): Split into ...
+	(atomic_exchange_and_add_acq, atomic_exchange_and_add_rel): ... these.
+	New atomic macros.
+
+2012-08-13  Markus Trippelsdorf  <markus@xxxxxxxxxxxxxxx>
+
+	* sysdeps/x86_64/fpu/libm-test-ulps: Update.
+
+2012-08-13  Jeff Law <law@xxxxxxxxxx>
+
+	* manual/stdio.texi (snprintf): Clarify handling of the trailing
+	null byte in the output string.
+
+2012-08-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL): Define.
+	[__LINUX_KERNEL_VERSION >= __LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL]
+	(__ASSUME_ARG_MAX_STACK_BASED): Define.
+	* sysdeps/unix/sysv/linux/sysconf.c (__sysconf)
+	[__LINUX_KERNEL_VERSION < 0x020617]: Change condition to
+	!__ASSUME_ARG_MAX_STACK_BASED.  Compare version with
+	__LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL.
+
+2012-08-09  Jeff Law <law@xxxxxxxxxx>
+
+	[BZ #13939]
+	* malloc.c/arena.c (reused_arena): New parameter, avoid_arena.
+	When avoid_arena is set, don't retry in the that arena.  Pick the
+	next one, whatever it might be.
+	(arena_get2): New parameter avoid_arena, pass through to reused_arena.
+	(arena_lock): Pass in new parameter to arena_get2.
+	* malloc/malloc.c (__libc_memalign): Pass in new parameter to
+	arena_get2.
+	(__libc_malloc): Unify retrying after main arena failure with
+	__libc_memalign version.
+	(__libc_valloc, __libc_pvalloc, __libc_calloc): Likewise.
+
+2012-08-09  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14166]
+	* sysdeps/i386/i686/multiarch/strstr-c.c (strstr): Redefined
+	to __redirect_strstr.
+	(__strstr_sse42): Use typeof __redirect_strstr.
+	(__strstr_ia32): Likewise.
+	(__libc_strstr): New prototype.
+	(strstr): Renamed to ...
+	(__libc_strstr): This.
+	(strstr): New strong alias of __libc_strstr.
+	* sysdeps/x86_64/multiarch/strstr-c.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/time.c (time): Redefined to
+	__redirect_time.
+	Include <time.h>.
+	(__libc_time): New prototype.
+	(time_ifunc): Replace time with __libc_time.
+	(time): New strong alias and hidden definition of __libc_time.
+	(__GI_time): Remove strong alias.
+	* sysdeps/x86_64/multiarch/memmove.c: Don't include <string.h>.
+	Include <stddef.h>.
+	(memmove): Redefined to __redirect_memmove.
+	(__memmove_sse2): Use typeof __redirect_memmove.
+	(__memmove_ssse3): Likewise.
+	(__memmove_ssse3_back): Likewise.
+	(__libc_memmove): New prototype.
+	(memmove): Renamed to ...
+	(__libc_memmove): This.
+	(memmove): New strong alias of __libc_memmove.
+
+2012-08-08  Mark Salter  <msalter@xxxxxxxxxx>
+
+	* elf/elf.h
+	(R_MN10300_TLS_GD): Define.
+	(R_MN10300_TLS_LD): Likewise.
+	(R_MN10300_TLS_LDO): Likewise.
+	(R_MN10300_TLS_GOTIE): Likewise.
+	(R_MN10300_TLS_IE): Likewise.
+	(R_MN10300_TLS_LE): Likewise.
+	(R_MN10300_TLS_DTPMOD): Likewise.
+	(R_MN10300_TLS_DTPOFF): Likewise.
+	(R_MN10300_TLS_TPOFF): Likewise.
+	(R_MN10300_SYM_DIFF): Likewise.
+	(R_MN10300_ALIGN): Likewise.
+	(R_MN10300_NUM): Update.
+
+2012-08-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_TGKILL):
+	Remove.
+
+2012-08-08  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/posix/fdopendir.c: Include <stddef.h>.
+
+	* sysdeps/unix/sysv/linux/readdir64_r.c: Update #include for
+	sysdeps/unix -> sysdeps/posix move.
+	* sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
+
+2012-08-07	Allan McRae	<allan@xxxxxxxxxxxxx>
+
+	[BZ #14303]
+	* sunrpc/rpc_main.c (SVR4_CPP): Remove.
+	(SUNOS_CPP): Likewise.
+	(find_cpp): Fall back to selecting system cpp when /lib/cpp is
+	not found.
+	(open_input): Call CPP using execvp.
+
+2012-08-07  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_PROT_GROWSUPDOWN): Remove.
+	(__ASSUME_NO_CLONE_DETACHED): Likewise.
+	(__ASSUME_GETDENTS32_D_TYPE): Likewise.
+	(__ASSUME_WAITID_SYSCALL): Likewise.
+	* sysdeps/unix/sysv/linux/dl-execstack.c
+	(_dl_make_stack_executable) [PROT_GROWSDOWN || PROT_GROWSUP]: Make
+	code unconditional.
+	(_dl_make_stack_executable) [!__ASSUME_PROT_GROWSUPDOWN]: Remove
+	conditional code.
+	* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS)
+	[__ASSUME_GETDENTS32_D_TYPE]: Make code unconditional.
+	(__GETDENTS) [!__ASSUME_GETDENTS32_D_TYPE]: Remove conditional
+	code.
+	* sysdeps/unix/sysv/linux/waitid.c [__NR_waitid]: Make code
+	unconditional.
+	[__ASSUME_WAITID_SYSCALL]: Likewise.
+	[!__ASSUME_WAITID_SYSCALL]: Remove conditional code.
+
+2012-08-07  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/closedir.c: Renamed to ...
+	* sysdeps/posix/closedir.c: ... here.
+	* sysdeps/unix/dirfd.c: Renamed to ...
+	* sysdeps/posix/dirfd.c: ... here.
+	* sysdeps/unix/dirstream.h: Renamed to ...
+	* sysdeps/posix/dirstream.h: ... here.
+	* sysdeps/unix/fdopendir.c: Renamed to ...
+	* sysdeps/posix/fdopendir.c: ... here.
+	* sysdeps/unix/opendir.c: Renamed to ...
+	* sysdeps/posix/opendir.c: ... here.
+	* sysdeps/unix/readdir.c: Renamed to ...
+	* sysdeps/posix/readdir.c: ... here.
+	* sysdeps/unix/readdir_r.c: Renamed to ...
+	* sysdeps/posix/readdir_r.c: ... here.
+	* sysdeps/unix/rewinddir.c: Renamed to ...
+	* sysdeps/posix/rewinddir.c: ... here.
+	* sysdeps/unix/seekdir.c: Renamed to ...
+	* sysdeps/posix/seekdir.c: ... here.
+	* sysdeps/unix/telldir.c: Renamed to ...
+	* sysdeps/posix/telldir.c: ... here.
+	* sysdeps/unix/sysv/linux/opendir.c: Update #include.
+	* sysdeps/unix/sysv/linux/readdir64.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise.
+	* sysdeps/unix/sysv/linux/wordsize-64/readdir.c: Likewise.
+
+	* sysdeps/unix/bsd/bsd4.4/bits/fcntl.h: Renamed to ...
+	* bits/fcntl.h: ... here.
+
+	* sysdeps/unix/bsd/bsd4.4/bits/fcntl.h (O_NOCTTY): Define to 0x8000,
+	not 0.
+	(O_ASYNC, O_FSYNC, O_SYNC): Move outside [__USE_MISC].
+	[__USE_XOPEN2K8] (O_DIRECTORY, O_NOFOLLOW, O_CLOEXEC): New macros.
+	(FCREAT, FEXCL, FTRUNC, FNOCTTY, FNONBLOCK): Macros removed.
+	(struct flock): Move l_start, l_len to the beginning.
+	Use __pid_t for l_pid.
+	[__USE_XOPEN2K] (POSIX_FADV_NORMAL, POSIX_FADV_RANDOM): New macros.
+	[__USE_XOPEN2K] (POSIX_FADV_SEQUENTIAL, POSIX_FADV_WILLNEED): Likewise.
+	[__USE_XOPEN2K] (POSIX_FADV_DONTNEED, POSIX_FADV_NOREUSE): Likewise.
+	(F_GETLK64, F_SETLK64, F_SETLKW64): New macros.
+	[__USE_XOPEN2K8] (F_DUPFD_CLOEXEC): New macro.
+	[__USE_LARGEFILE64] (struct flock64): New type.
+	(F_GETOWN, F_SETOWN): Also define for [__USE_XOPEN2K8].
+
+	* sysdeps/unix/bsd/bsd4.4/bits/dirent.h: Renamed to ...
+	* bits/dirent.h: ... here.
+
+	* sysdeps/unix/bsd/bsd4.4/bits/dirent.h
+	[__INO_T_MATCHES_INO64_T] (_DIRENT_MATCHES_DIRENT64): New macro.
+
+2012-08-07  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel):
+	Change from 2.6.0 to 2.6.16.
+	* sysdeps/unix/sysv/linux/configure: Regenerated.
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_POSIX_CPU_TIMERS): Define unconditionally.
+	(__ASSUME_TGKILL): Define conditional on architectures, not kernel
+	version.
+	(__ASSUME_UTIMES): Likewise.
+	(__ASSUME_CLONE_STOPPED): Remove.
+	(__ASSUME_FADVISE64_64_SYSCALL): Define conditional on
+	architectures, not kernel version.
+	(__ASSUME_PROT_GROWSUPDOWN): Define unconditionally.
+	(__ASSUME_NO_CLONE_DETACHED): Likewise.
+	(__ASSUME_GETDENTS32_D_TYPE): Likewise.
+	(__ASSUME_WAITID_SYSCALL): Likewise.
+	[__sparc__ && __arch64__] (__ASSUME_STAT64_SYSCALL): Do not
+	condition definition on __LINUX_KERNEL_VERSION >= 0x02060c.
+	* README: State 2.6.16 as minimum Linux kernel version.  Do not
+	refer to older versions.
+
+2012-08-06  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* dirent/alphasort.c [_DIRENT_MATCHES_DIRENT64]:
+	Define alphasort64 as an alias.
+	* dirent/versionsort.c [_DIRENT_MATCHES_DIRENT64]:
+	Define versionsort64 as an alias.
+	* dirent/scandir.c [_DIRENT_MATCHES_DIRENT64]:
+	Define scandir64 as an alias.
+	* dirent/scandirat.c [_DIRENT_MATCHES_DIRENT64]:
+	Define scandirat64 as an alias.
+	* dirent/alphasort64.c (alphasort64):
+	Conditionalize on [!_DIRENT_MATCHES_DIRENT64].
+	* dirent/versionsort64.c: Likewise.
+	* dirent/scandir64.c: Likewise.
+	* dirent/scandirat64.c: Likewise.
+	* sysdeps/wordsize-64/alphasort.c: File removed.
+	* sysdeps/wordsize-64/alphasort64.c: File removed.
+	* sysdeps/wordsize-64/scandir.c: File removed.
+	* sysdeps/wordsize-64/scandir64.c: File removed.
+	* sysdeps/wordsize-64/scandirat.c: File removed.
+	* sysdeps/wordsize-64/scandirat64.c: File removed.
+	* sysdeps/wordsize-64/versionsort.c: File removed.
+	* sysdeps/wordsize-64/versionsort64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/scandir.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c: File removed.
+
+	* bits/typesizes.h [__LP64__] (__INO_T_MATCHES_INO64_T): New macros.
+	* sysdeps/unix/sysv/linux/s390/bits/typesizes.h:
+	[__s390x__] (__INO_T_MATCHES_INO64_T): New macro.
+	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+	[defined __arch64__ || defined __sparcv9]
+	(__INO_T_MATCHES_INO64_T): New macro.
+	* sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+	[__x86_64__] (__INO_T_MATCHES_INO64_T): New macro.
+	* bits/dirent.h (_DIRENT_MATCHES_DIRENT64): New macro.
+	* sysdeps/unix/sysv/linux/bits/dirent.h
+	[defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T]
+	(_DIRENT_MATCHES_DIRENT64): New macro.
+
+	* io/lockf.c [__OFF_T_MATCHES_OFF64_T]:
+	Define lockf64 as an alias.
+	* libio/fseeko.c [__OFF_T_MATCHES_OFF64_T]:
+	Define fseeko64 as an alias.
+	* libio/ftello.c [__OFF_T_MATCHES_OFF64_T]:
+	Define ftello64 as an alias.
+	* libio/iofgetpos.c [__OFF_T_MATCHES_OFF64_T]:
+	Define _IO_fgetpos64 and fgetpos64 as aliases.
+	* libio/iofsetpos.c [__OFF_T_MATCHES_OFF64_T]:
+	Define _IO_fsetpos64 and fsetpos64 as aliases.
+	* io/lockf64.c [!__OFF_T_MATCHES_OFF64_T]:
+	Conditionalize body on this.
+	* libio/fseeko64.c: Likewise.
+	* libio/ftello64.c: Likewise.
+	* libio/iofgetpos64.c: Likewise.
+	* libio/iofsetpos64.c: Likewise.
+	* sysdeps/wordsize-64/lockf.c: File removed.
+	* sysdeps/wordsize-64/lockf64.c: File removed.
+	* sysdeps/wordsize-64/fseeko.c: File removed.
+	* sysdeps/wordsize-64/fseeko64.c: File removed.
+	* sysdeps/wordsize-64/ftello.c: File removed.
+	* sysdeps/wordsize-64/ftello64.c: File removed.
+	* sysdeps/wordsize-64/iofgetpos.c: File removed.
+	* sysdeps/wordsize-64/iofgetpos64.c: File removed.
+	* sysdeps/wordsize-64/iofsetpos.c: File removed.
+	* sysdeps/wordsize-64/iofsetpos64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/lockf.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/ftello.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c: File removed.
+
+	* bits/typesizes.h [__LP64__] (__OFF_T_MATCHES_OFF64_T): New macro.
+	* sysdeps/unix/sysv/linux/s390/bits/typesizes.h:
+	[__s390x__] (__OFF_T_MATCHES_OFF64_T): New macro.
+	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+	[defined __arch64__ || defined __sparcv9]
+	(__OFF_T_MATCHES_OFF64_T): New macro.
+	* sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+	[__x86_64__] (__OFF_T_MATCHES_OFF64_T): New macro.
+	* sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+	(__OFF_T_MATCHES_OFF64_T): New macro.
+
+2012-08-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* stdlib/secure-getenv.c (__secure_getenv): Replace
+	GLIBC_2_16 with GLIBC_2_17.
+
+2012-08-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c: Removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c: Likewise.
+
+2012-08-03  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/fpu/libm-test-ulps: Update.
+
+2012-08-03  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_AT_SECURE):
+	Remove.
+	(__ASSUME_CORRECT_SI_PID): Likewise.
+	(__ASSUME_BRK_PAGE_ROUNDED): Likewise.
+	(__ASSUME_TMPFS_NAME): Likewise.
+	* sysdeps/unix/sysv/linux/dl-sysdep.c (frob_brk)
+	[!__ASSUME_BRK_PAGE_ROUNDED]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/ldsodefs.h [__ASSUME_AT_SECURE]
+	(HAVE_AUX_SECURE): Make definition unconditional.
+	* sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs)
+	[!__ASSUME_TMPFS_NAME]: Remove conditional code.
+
+2012-08-03  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/mach/hurd/sys/param.h (MAXSYMLINKS): Macro removed.
+	* sysdeps/mach/hurd/bits/local_lim.h (SYMLOOP_MAX): Macro removed.
+	* sysdeps/mach/hurd/eloop-threshold.h: New file.
+	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Use
+	__eloop_threshold instead of SYMLOOP_MAX.
+
+	* sysdeps/generic/eloop-threshold.h: New file.
+	* stdlib/canonicalize.c (__realpath): Use __eloop_threshold instead
+	of MAXSYMLINKS.
+	* elf/chroot_canon.c (chroot_canon): Likewise.
+
+2012-08-03  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #13717]
+	* sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel):
+	Change to 2.6.0 everywhere.
+	* sysdeps/unix/sysv/linux/configure: Regenerated.
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_SET_THREAD_AREA_SYSCALL): Remove.
+	(__ASSUME_CLONE_THREAD_FLAGS): Condition on architectures, not
+	kernel versions.
+	(__ASSUME_POSIX_TIMERS): Define unconditionally.
+	(__ASSUME_FUTEX_REQUEUE): Remove.
+	(__ASSUME_STATFS64): Define unconditionally.
+	(__ASSUME_AT_SECURE): Likewise.
+	(__ASSUME_CORRECT_SI_PID): Likewise.
+	(__ASSUME_TGKILL): Define without depending on kernel version for
+	i386.
+	(__ASSUME_UTIMES): Likewise.
+	(__ASSUME_SWAPCONTEXT_SYSCALL): Condition on architecture, not
+	kernel version.
+	(__ASSUME_BRK_PAGE_ROUNDED): Define unconditionally.
+	(__ASSUME_TMPFS_NAME): Likewise.
+	* README: Update reference to Linux kernel versions.
+
+2012-08-02  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	[BZ#14150]
+	* configure.in (libc_cv_asm_type_prefix): Remove test.  Replace
+	libc_cv_asm_type_prefix with %.
+	* configure: Regenerated.
+	* include/libc-symbols.h: Remove comment about
+	ASM_TYPE_DIRECTIVE_PREFIX.  Replace ASM_TYPE_DIRECTIVE_PREFIX with %.
+	(declare_symbol_alias_1_paste) [__ASSEMBLER__]: Do not define.
+	(declare_symbol_alias_1_paste_1) [__ASSEMBLER__]: Likewise.
+	(declare_symbol_alias_1_stringify) [!__ASSEMBLER__]: Likewise.
+	(declare_symbol_alias_1_stringify_1) [!__ASSEMBLER__]: Likewise.
+	* elf/tst-unique2mod2.c: Replace ASM_TYPE_DIRECTIVE_PREFIX with %.
+	[HAVE_ASM_UNIQUE_OBJECT]: Do not define S.
+	[HAVE_ASM_UNIQUE_OBJECT]: Do not define _S.
+	* elf/tst-unique2mod1.c: Likewise.
+	* elf/tst-unique1mod2.c: Likewise.
+	* elf/tst-unique1mod1.c: Likewise.
+	* config.h.in: Do not undef ASM_TYPE_DIRECTIVE_PREFIX.
+	* sysdeps/s390/s390-32/sysdep.h: Do not define ASM_TYPE_DIRECTIVE.
+	Replace ASM_TYPE_DIRECTIVE with .type.
+	* sysdeps/s390/s390-64/sysdep.h: Likewise.
+	* sysdeps/i386/sysdep.h: Likewise.
+	* sysdeps/x86_64/sysdep.h: Likewise.
+	* sysdeps/sh/sysdep.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
+	Do not define ASM_TYPE_DIRECTIVE.
+	* sysdeps/powerpc/sysdep.h: Likewise.
+	* sysdeps/powerpc/powerpc32/sysdep.h:
+	Replace ASM_TYPE_DIRECTIVE with .type.
+	* sysdeps/s390/s390-32/s390-mcount.S: Likewise.
+	* sysdeps/s390/s390-64/s390x-mcount.S: Likewise.
+	* sysdeps/i386/fpu/e_powf.S: Likewise.
+	* sysdeps/i386/fpu/e_expl.S: Likewise.
+	* sysdeps/i386/fpu/e_atanhf.S: Likewise.
+	* sysdeps/i386/fpu/e_acosh.S: Likewise.
+	* sysdeps/i386/fpu/e_pow.S: Likewise.
+	* sysdeps/i386/fpu/s_asinhl.S: Likewise.
+	* sysdeps/i386/fpu/e_acoshl.S: Likewise.
+	* sysdeps/i386/fpu/s_expm1.S: Likewise.
+	* sysdeps/i386/fpu/s_frexpf.S: Likewise.
+	* sysdeps/i386/fpu/e_log2.S: Likewise.
+	* sysdeps/i386/fpu/e_log2l.S: Likewise.
+	* sysdeps/i386/fpu/e_scalb.S: Likewise.
+	* sysdeps/i386/fpu/e_powl.S: Likewise.
+	* sysdeps/i386/fpu/e_log10f.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrtf.S: Likewise.
+	* sysdeps/i386/fpu/e_logl.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrt.S: Likewise.
+	* sysdeps/i386/fpu/s_frexpl.S: Likewise.
+	* sysdeps/i386/fpu/s_expm1f.S: Likewise.
+	* sysdeps/i386/fpu/e_log2f.S: Likewise.
+	* sysdeps/i386/fpu/e_acoshf.S: Likewise.
+	* sysdeps/i386/fpu/e_log.S: Likewise.
+	* sysdeps/i386/fpu/e_scalbf.S: Likewise.
+	* sysdeps/i386/fpu/e_logf.S: Likewise.
+	* sysdeps/i386/fpu/e_log10l.S: Likewise.
+	* sysdeps/i386/fpu/e_atanh.S: Likewise.
+	* sysdeps/i386/fpu/s_asinhf.S: Likewise.
+	* sysdeps/i386/fpu/e_log10.S: Likewise.
+	* sysdeps/i386/fpu/s_frexp.S: Likewise.
+	* sysdeps/i386/fpu/e_atanhl.S: Likewise.
+	* sysdeps/i386/fpu/s_asinh.S: Likewise.
+	* sysdeps/i386/fpu/s_cbrtl.S: Likewise.
+	* sysdeps/i386/fpu/e_scalbl.S: Likewise.
+	* sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S: Likewise.
+	* sysdeps/i386/i686/fpu/e_logl.S: Likewise.
+	* sysdeps/i386/i686/strtok.S: Likewise.
+	* sysdeps/i386/i386-mcount.S: Likewise.
+	* sysdeps/i386/strtok.S: Likewise.
+	* sysdeps/x86_64/fpu/e_expl.S: Likewise.
+	* sysdeps/x86_64/fpu/e_log2l.S: Likewise.
+	* sysdeps/x86_64/fpu/e_powl.S: Likewise.
+	* sysdeps/x86_64/fpu/e_logl.S: Likewise.
+	* sysdeps/x86_64/fpu/e_expf.S: Likewise.
+	* sysdeps/x86_64/fpu/e_log10l.S: Likewise.
+	* sysdeps/x86_64/fpu/s_copysignf.S: Likewise.
+	* sysdeps/x86_64/fpu/s_copysign.S: Likewise.
+	* sysdeps/x86_64/fpu/e_scalbl.S: Likewise.
+	* sysdeps/x86_64/_mcount.S: Likewise.
+	* sysdeps/x86_64/strtok.S: Likewise.
+	* sysdeps/sh/_mcount.S: Likewise.
+
+2012-08-01  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* libio/iofopen.c: Include <fcntl.h>.
+	[_LIBC] [!defined O_LARGEFILE || O_LARGEFILE == 0]
+	(_IO_fopen64, fopen64): Define as aliases.
+	* libio/iofopen64.c: Include <fcntl.h>.
+	[!defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0)]:
+	Conditionalize body on this.
+	* sysdeps/wordsize-64/iofopen.c: File removed.
+	* sysdeps/wordsize-64/iofopen64.c: File removed.
+
+2012-08-01  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* libc/Makeconfig: Use elf in place of binfmt-subdir.
+	Use dlfcn directly instead of a variable.
+	(binfmt-subdir): Do not define.
+	(dlfcn): Likewise.
+
+2012-08-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):
+	Remove all definitions.
+	* sysdeps/unix/sysv/linux/i386/fcntl.c: Do not include
+	<kernel-features.h>.
+	[!__ASSUME_FCNTL64] (__have_no_fcntl64): Remove.
+	(miss_F_GETOWN_EX): Remove all definitions.
+	[NO_CANCELLATION && !__ASSUME_FCNTL64] (__fcntl_nocancel): Remove
+	macro definition.
+	[!__ASSUME_FCNTL64]: Remove conditional code.
+	[__ASSUME_FCNTL64]: Make code unconditional.
+	* sysdeps/unix/sysv/linux/i386/lockf64.c: Do not include
+	<kernel-features.h>.
+	[__NR_fcntl64 && !__ASSUME_FCNTL64] (__have_no_fcntl64): Remove.
+	(lockf64) [!__ASSUME_FCNTL64]: Remove conditional code.
+	(lockf64) [__NR_fcntl64]: Make code unconditional.
+	(lockf64) [__ASSUME_FCNTL64]: Likewise.
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_VFORK_SYSCALL): Remove all definitions.
+	* sysdeps/unix/sysv/linux/i386/vfork.S (__vfork) [__NR_vfork]:
+	Make code unconditional.
+	(__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+	(__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S (__vfork)
+	[__NR_vfork]: Make code unconditional.
+	(__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+	(__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S (__vfork)
+	[__NR_vfork]: Make code unconditional.
+	(__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+	(__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+
+2012-08-01  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/generic/sys/param.h (NGROUPS): Define only if [NGROUPS_MAX].
+	(MAXSYMLINKS): Define only if [SYMLOOP_MAX].
+
+	* misc/mkstemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+	Define mkstemp64 as an alias.
+	* misc/mkstemps.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+	Define mkstemps64 as an alias.
+	* misc/mkostemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+	Define mkostemp64 as an alias.
+	* misc/mkostemps.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+	Define mkostemps64 as an alias.
+	* misc/mkstemp64.c [defined O_LARGEFILE && O_LARGEFILE != 0]:
+	Conditionalize body on this.
+	* misc/mkostemp64.c: Likewise.
+	* misc/mkostemps64.c: Likewise.
+	* misc/mkstemps64.c: Likewise.
+	* sysdeps/wordsize-64/mkstemp64.c: File removed.
+	* sysdeps/wordsize-64/mkostemp64.c: File removed.
+	* sysdeps/wordsize-64/mkostemp.c: File removed.
+	* sysdeps/wordsize-64/mkstemp.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c: File removed.
+
+	[BZ #14138]
+	* sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
+	* sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/getrlimit.c: File removed.
+	* sysdeps/unix/sysv/linux/sh/getrlimit.c: File removed.
+
+	* sysdeps/unix/make-syscalls.sh: Emit uses of the versioned_symbol and
+	compat_symbol macros from <shlib-compat.h> rather than the underlying
+	default_symbol_version and symbol_version macros, so that DEFAULT
+	lines in shlib-versions are respected.
+	* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Likewise.
+
+2012-08-01  Florian Weimer  <fweimer@xxxxxxxxxx>
+
+	* posix/unistd.h (setuid, setreuid, seteuid, setresuid):
+	Declare with warn_unused_result.
+	(setgid, setregid, setegid, setresgid): Likewise.
+	* sysdeps/unix/sysv/linux/sys/fsuid.h (setfsuid, setfsgid):
+	Likewise.
+	* WUR-REPORT: Remove set*id functions.
+
+2012-07-31  Pino Toscano  <toscano.pino@xxxxxxxxxx>
+
+	* sysdeps/mach/hurd/renameat.c: New file, mostly copied from rename.c.
+
+2012-07-31  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* include/sys/socket.h (__libc_accept, __libc_accept4):
+	Add attribute_hidden.
+	* socket/accept4.c (__libc_accept4): Remove libc_hidden_def.
+
+	* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Conditionalize
+	use of PTR_MANGLE.
+	* inet/getnetgrent_r.c (setup): Likewise.
+
+	* sysdeps/generic/siglist.h: Put SIGWINCH under #ifdef.
+
+2012-07-31  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/fpu/libm-test-ulps: Update.
+
+2012-07-31  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #13629]
+	* math/s_clog.c (__clog): Use __log1p if larger part has absolute
+	value between 1.0 and 2.0 and smaller part has absolute value less
+	than 1.0.
+	* math/s_clog10.c (__clog10): Likewise.
+	* math/s_clog10f.c (__clog10f): Likewise.
+	* math/s_clog10l.c (__clog10l): Likewise.
+	* math/s_clogf.c (__clogf): Likewise.
+	* math/s_clogl.c (__clogl): Likewise.
+	* math/libm-test.inc (clog_test): Add more tests.
+	(clog10_test): Likewise.
+	* sysdeps/i386/fpu/libm-test-ulps: Update.
+	* sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
+
+2012-07-31  Florian Weimer  <fweimer@xxxxxxxxxx>
+
+	* stdlib/tst-secure-getenv.c: Use printf for error reporting.
+	Exit with zero in case no suitable GID is found, and write a
+	message to standard error.
+
 2012-07-30  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* sysdeps/generic/sys/param.h (MAXSYMLINKS): Define to SYMLOOP_MAX

Modified: trunk/libc/Makeconfig
==============================================================================
--- trunk/libc/Makeconfig (original)
+++ trunk/libc/Makeconfig Fri Aug 17 19:39:53 2012
@@ -88,10 +88,6 @@
 
 # What flags to give to tests which test stack alignment
 stack-align-test-flags =
-
-# We have a special subdir for each binary format.
-# For now, only ELF is fully supported.
-binfmt-subdir = elf
 
 # Complete path to sysdep dirs.
 # `configure' writes a definition of `config-sysdirs' in `config.make'.
@@ -963,7 +959,6 @@
 endif # build-shared
 
 
-dlfcn = dlfcn
 ifeq ($(build-shared),yes)
 libdl = $(common-objpfx)dlfcn/libdl.so$(libdl.so-version)
 else
@@ -1002,7 +997,7 @@
 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
 	      crypt nss localedata timezone rt conform debug		    \
-	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+	      $(add-on-subdirs) dlfcn elf
 
 ifndef avoid-generated
 all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\
@@ -1036,6 +1031,13 @@
 sysd-rules-targets := $(sort $(foreach p,$(sysd-rules-patterns),\
 					 $(firstword $(subst :, ,$p))))
 
+# A sysdeps Makeconfig fragment may set libc-reentrant to yes.
+ifeq (yes,$(libc-reentrant))
+defines += -D_LIBC_REENTRANT
+
+libio-mtsafe = -D_IO_MTSAFE_IO
+endif
+
 endif # Makeconfig not yet included
 
 # Local Variables:

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Fri Aug 17 19:39:53 2012
@@ -9,7 +9,8 @@
 
 * The following bugs are resolved with this release:
 
-  6778, 6808, 14042, 14151, 14154, 14157, 14173, 14283, 14298, 14328, 14331,
+  6778, 6808, 13717, 13939, 14042, 14090, 14166, 14150, 14151, 14154, 14157,
+  14166, 14173, 14195, 14283, 14298, 14303, 14307, 14328, 14331, 14336,
   14337, 14347, 14349
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
@@ -23,6 +24,9 @@
 
 * SystemTap static probes have been added into the dynamic linker.
   Implemented by Gary Benson.
+
+* The minimum Linux kernel version that this version of the GNU C Library
+  can be used with is 2.6.16.
 
 
 Version 2.16

Modified: trunk/libc/README
==============================================================================
--- trunk/libc/README (original)
+++ trunk/libc/README Fri Aug 17 19:39:53 2012
@@ -44,19 +44,8 @@
 GNU/Hurd support requires out-of-tree patches that will eventually be
 incorporated into an official GNU C Library release.
 
-When working with Linux kernels, the GNU C Library version from
-version 2.4 on is intended primarily for use with Linux kernel version
-2.6.0 and later.  We only support using the NPTL implementation of
-pthreads, which is now the default configuration.  The library is
-unlikely to build without NPTL, or to work on Linux kernels prior to
-2.6.  The old LinuxThreads add-on implementation of pthreads for older
-Linux kernels is no longer supported, and we are not distributing it
-with this release.
-
-All Linux kernel versions prior to 2.6.16 are known to have some bugs that
-may cause some of the tests related to pthreads in "make check" to fail.
-If you see such problems, please try the test suite on the most recent
-Linux kernel version that you can use, before pursuing those bugs further.
+When working with Linux kernels, this version of the GNU C Library
+requires Linux kernel version 2.6.16 or later.
 
 Also note that the shared version of the libgcc_s library must be
 installed for the pthread library to work correctly.
@@ -69,7 +58,7 @@
 	powerpc64-*-linux-gnu
 	s390-*-linux-gnu
 	s390x-*-linux-gnu
-	sh[34]-*-linux-gnu	Requires Linux 2.6.11 or newer
+	sh[34]-*-linux-gnu
 	sparc*-*-linux-gnu
 	sparc64*-*-linux-gnu
 
@@ -79,14 +68,14 @@
 same place where you got the main glibc distribution files.
 Currently these configurations have code in the `ports' add-on:
 
-	alpha*-*-linux-gnu	Requires Linux 2.6.9 or newer for NPTL
+	alpha*-*-linux-gnu
 	am33*-*-linux-gnu	Not currently functional
-	arm-*-linux-gnueabi	Requires Linux 2.6.16-rc1 or newer for NPTL
+	arm-*-linux-gnueabi
 	hppa-*-linux-gnu	Not currently functional without patches.
 	ia64-*-linux-gnu
 	m68k-*-linux-gnu
-	mips-*-linux-gnu	Requires Linux 2.6.12 or newer for NPTL
-	mips64-*-linux-gnu	Requires Linux 2.6.12 or newer for NPTL
+	mips-*-linux-gnu
+	mips64-*-linux-gnu
 	powerpc-*-linux-gnu	Software floating point (--without-fp)
 	tilegx-*-linux-gnu
 	tilepro-*-linux-gnu

Modified: trunk/libc/WUR-REPORT
==============================================================================
--- trunk/libc/WUR-REPORT (original)
+++ trunk/libc/WUR-REPORT Fri Aug 17 19:39:53 2012
@@ -3,17 +3,6 @@
 lssek:   Probably should be __wur but lseek(fd,SEEK_SET,0) will succeed if
          the descriptor is fine.
 lseek64: same
-
-setuid:  will always succeed given correct privileges, so there might
-         be places which don't check for it.
-setreuid: same
-seteuid: same
-setgid:  same
-setregid: same
-setegid: same
-setresuid: same
-setresgid: same
-
 
 <stdio.h>:
 

Modified: trunk/libc/bits/dirent.h
==============================================================================
--- trunk/libc/bits/dirent.h (original)
+++ trunk/libc/bits/dirent.h Fri Aug 17 19:39:53 2012
@@ -1,5 +1,5 @@
-/* Directory entry structure `struct dirent'.  Stub version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Directory entry structure `struct dirent'.  4.4BSD/Generic version.
+   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,14 +22,38 @@
 
 struct dirent
   {
-    char d_name[1];		/* Variable length.  */
-    int d_fileno;
+#ifndef __USE_FILE_OFFSET64
+    __ino_t d_ino;		/* File serial number.  */
+#else
+    __ino64_t d_ino;
+#endif
+    unsigned short int d_reclen; /* Length of the whole `struct dirent'.  */
+    unsigned char d_type;	/* File type, possibly unknown.  */
+    unsigned char d_namlen;	/* Length of the file name.  */
+
+    /* Only this member is in the POSIX standard.  */
+    char d_name[1];		/* File name (actually longer).  */
   };
 
 #ifdef __USE_LARGEFILE64
 struct dirent64
   {
-    char d_name[1];		/* Variable length.  */
-    int d_fileno;
+    __ino64_t d_ino;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    unsigned char d_namlen;
+
+    char d_name[1];
   };
 #endif
+
+#define d_fileno	d_ino	/* Backwards compatibility.  */
+
+#define _DIRENT_HAVE_D_RECLEN 1
+#define _DIRENT_HAVE_D_NAMLEN 1
+#define _DIRENT_HAVE_D_TYPE 1
+
+#ifdef __INO_T_MATCHES_INO64_T
+/* Inform libc code that these two types are effectively identical.  */
+# define _DIRENT_MATCHES_DIRENT64	1
+#endif

Modified: trunk/libc/bits/fcntl.h
==============================================================================
--- trunk/libc/bits/fcntl.h (original)
+++ trunk/libc/bits/fcntl.h Fri Aug 17 19:39:53 2012
@@ -1,5 +1,5 @@
-/* O_*, F_*, FD_* bit values for stub configuration.
-   Copyright (C) 1991, 1992, 1997, 2000, 2004 Free Software Foundation, Inc.
+/* O_*, F_*, FD_* bit values. 4.4BSD/Generic version.
+   Copyright (C) 1991-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
@@ -16,10 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* These values should be changed as appropriate for your system.  */
-
 #ifndef	_FCNTL_H
-# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
+#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
 #endif
 
 
@@ -33,7 +31,28 @@
 #define	O_CREAT		0x0200	/* Create file if it doesn't exist.  */
 #define	O_EXCL		0x0800	/* Fail if file already exists.  */
 #define	O_TRUNC		0x0400	/* Truncate file to zero length.  */
-#define	O_NOCTTY	0x0100	/* Don't assign a controlling terminal.  */
+#define	O_NOCTTY	0x8000	/* Don't assign a controlling terminal.  */
+#define	O_ASYNC		0x0040	/* Send SIGIO to owner when data is ready.  */
+#define	O_FSYNC		0x0080	/* Synchronous writes.  */
+#define	O_SYNC		O_FSYNC
+#ifdef	__USE_MISC
+#define	O_SHLOCK	0x0010	/* Open with shared file lock.  */
+#define	O_EXLOCK	0x0020	/* Open with shared exclusive lock.  */
+#endif
+#ifdef __USE_XOPEN2K8
+# define O_DIRECTORY	0x00200000	/* Must be a directory.	 */
+# define O_NOFOLLOW	0x00000100	/* Do not follow links.	 */
+# define O_CLOEXEC	0x00400000      /* Set close_on_exec.  */
+#endif
+#if defined __USE_POSIX199309 || defined __USE_UNIX98
+# define O_DSYNC	0x00010000	/* Synchronize data.  */
+# define O_RSYNC	0x00020000	/* Synchronize read operations.	 */
+#endif
+
+/* All opens support large file sizes, so there is no flag bit for this.  */
+#ifdef __USE_LARGEFILE64
+# define O_LARGEFILE	0
+#endif
 
 /* File status flags for `open' and `fcntl'.  */
 #define	O_APPEND	0x0008	/* Writes append to the file.  */
@@ -41,6 +60,22 @@
 
 #ifdef __USE_BSD
 # define O_NDELAY	O_NONBLOCK
+#endif
+
+#ifdef __USE_BSD
+/* Bits in the file status flags returned by F_GETFL.
+   These are all the O_* flags, plus FREAD and FWRITE, which are
+   independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was
+   given to `open'.  */
+# define FREAD		1
+# define FWRITE		2
+
+/* Traditional BSD names the O_* bits.  */
+# define FASYNC		O_ASYNC
+# define FFSYNC		O_FSYNC
+# define FSYNC		O_SYNC
+# define FAPPEND	O_APPEND
+# define FNDELAY	O_NDELAY
 #endif
 
 /* Mask for file access modes.  This is system-dependent in case
@@ -53,13 +88,21 @@
 #define	F_SETFD		2	/* Set file descriptor flags.  */
 #define	F_GETFL		3	/* Get file status flags.  */
 #define	F_SETFL		4	/* Set file status flags.  */
-#if defined __USE_BSD || defined __USE_UNIX98
-# define F_GETOWN	5	/* Get owner (receiver of SIGIO).  */
-# define F_SETOWN	6	/* Set owner (receiver of SIGIO).  */
+#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#define	F_GETOWN	5	/* Get owner (receiver of SIGIO).  */
+#define	F_SETOWN	6	/* Set owner (receiver of SIGIO).  */
 #endif
 #define	F_GETLK		7	/* Get record locking info.  */
-#define	F_SETLK		8	/* Set record locking info.  */
-#define	F_SETLKW	9	/* Set record locking info, wait.  */
+#define	F_SETLK		8	/* Set record locking info (non-blocking).  */
+#define	F_SETLKW	9	/* Set record locking info (blocking).  */
+/* Not necessary, we always have 64-bit offsets.  */
+#define F_GETLK64	F_GETLK	/* Get record locking info.  */
+#define F_SETLK64	F_SETLK	/* Set record locking info (non-blocking).  */
+#define F_SETLKW64	F_SETLKW/* Set record locking info (blocking).	*/
+#ifdef __USE_XOPEN2K8
+# define F_DUPFD_CLOEXEC 12	/* Duplicate file descriptor with
+				   close-on-exit set.  */
+#endif
 
 /* File descriptor flags used with F_GETFD and F_SETFD.  */
 #define	FD_CLOEXEC	1	/* Close on exec.  */
@@ -71,12 +114,24 @@
    argument to `fcntl' for the F_GETLK, F_SETLK, and F_SETLKW requests.  */
 struct flock
   {
-    short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
-    short int l_whence;	/* Where `l_start' is relative to (like `lseek').  */
     __off_t l_start;	/* Offset where the lock begins.  */
     __off_t l_len;	/* Size of the locked area; zero means until EOF.  */
     __pid_t l_pid;	/* Process holding the lock.  */
+    short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
+    short int l_whence;	/* Where `l_start' is relative to (like `lseek').  */
   };
+
+#ifdef __USE_LARGEFILE64
+/* Note this matches struct flock exactly.  */
+struct flock64
+  {
+    __off_t l_start;	/* Offset where the lock begins.  */
+    __off_t l_len;	/* Size of the locked area; zero means until EOF.  */
+    __pid_t l_pid;	/* Process holding the lock.  */
+    short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
+    short int l_whence;	/* Where `l_start' is relative to (like `lseek').  */
+  };
+#endif
 
 /* Values for the `l_type' field of a `struct flock'.  */
 #define	F_RDLCK	1	/* Read lock.  */

Modified: trunk/libc/bits/libc-lock.h
==============================================================================
--- trunk/libc/bits/libc-lock.h (original)
+++ trunk/libc/bits/libc-lock.h Fri Aug 17 19:39:53 2012
@@ -44,6 +44,7 @@
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
    state.  */
 #define __libc_lock_init(NAME)
+#define __rtld_lock_initialize(NAME)
 #define __libc_rwlock_init(NAME)
 
 /* Same as last but this time we initialize a recursive mutex.  */

Modified: trunk/libc/bits/typesizes.h
==============================================================================
--- trunk/libc/bits/typesizes.h (original)
+++ trunk/libc/bits/typesizes.h Fri Aug 17 19:39:53 2012
@@ -61,6 +61,16 @@
 #define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
+#ifdef __LP64__
+/* Tell the libc code that off_t and off64_t are actually the same type
+   for all ABI purposes, even if possibly expressed as different base types
+   for C type-checking purposes.  */
+# define __OFF_T_MATCHES_OFF64_T	1
+
+/* Same for ino_t and ino64_t.  */
+# define __INO_T_MATCHES_INO64_T	1
+#endif
+
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
 

Modified: trunk/libc/config.h.in
==============================================================================
--- trunk/libc/config.h.in (original)
+++ trunk/libc/config.h.in Fri Aug 17 19:39:53 2012
@@ -37,10 +37,6 @@
 /* Define if the assembler supports the `.set' directive.  */
 #undef	HAVE_ASM_SET_DIRECTIVE
 
-/* Define to the prefix before `object' or `function' in the
-   assembler's `.type' directive, if it has one.  */
-#undef	ASM_TYPE_DIRECTIVE_PREFIX
-
 /* Define if the assembler supports the gnu_unique_object symbol type.  */
 #undef	HAVE_ASM_UNIQUE_OBJECT
 
@@ -49,9 +45,6 @@
 
 /* On powerpc64, use overlapping .opd entries.  */
 #undef  USE_PPC64_OVERLAPPING_OPD
-
-/* Define if the assembler generates debugging information directly.  */
-#undef	HAVE_CPP_ASM_DEBUGINFO
 
 /* Define if _Unwind_Find_FDE should be exported from glibc.  */
 #undef  EXPORT_UNWIND_FIND_FDE

Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Fri Aug 17 19:39:53 2012
@@ -4142,43 +4142,7 @@
 $as_echo "yes" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .type directive prefix" >&5
-$as_echo_n "checking for assembler .type directive prefix... " >&6; }
-if ${libc_cv_asm_type_prefix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  libc_cv_asm_type_prefix=no
-for ac_try_prefix in '@' '%' '#'; do
-  cat > conftest.s <<EOF
-	${libc_cv_dot_text}
-	.globl foo
-	.type foo, ${ac_try_prefix}object
-	.size foo, 1
-foo:
-	.byte 1
-EOF
-  if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    libc_cv_asm_type_prefix=${ac_try_prefix}
-  fi
-  rm -f conftest*
-  test "x$libc_cv_asm_type_prefix" != xno && break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_type_prefix" >&5
-$as_echo "$libc_cv_asm_type_prefix" >&6; }
-if test "x$libc_cv_asm_type_prefix" != xno; then
-  cat >>confdefs.h <<_ACEOF
-#define ASM_TYPE_DIRECTIVE_PREFIX ${libc_cv_asm_type_prefix}
-_ACEOF
-
-fi
-
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes; then
   if test x"$multi_arch" = xyes; then
     as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
   else
@@ -5823,7 +5787,7 @@
   cat > conftest.s <<EOF
 ${libc_cv_dot_text}
 _sym:
-.type _sym, ${libc_cv_asm_type_prefix}gnu_unique_object
+.type _sym, %gnu_unique_object
 EOF
 if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5; then
   libc_cv_asm_unique_object=yes

Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Fri Aug 17 19:39:53 2012
@@ -586,29 +586,7 @@
   AC_MSG_RESULT(yes)
 fi
 
-AC_CACHE_CHECK(for assembler .type directive prefix,
-	       libc_cv_asm_type_prefix, [dnl
-libc_cv_asm_type_prefix=no
-for ac_try_prefix in '@' '%' '#'; do
-  cat > conftest.s <<EOF
-	${libc_cv_dot_text}
-	.globl foo
-	.type foo, ${ac_try_prefix}object
-	.size foo, 1
-foo:
-	.byte 1
-EOF
-  if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
-    libc_cv_asm_type_prefix=${ac_try_prefix}
-  fi
-  rm -f conftest*
-  test "x$libc_cv_asm_type_prefix" != xno && break
-done])
-if test "x$libc_cv_asm_type_prefix" != xno; then
-  AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
-fi
-
-if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes; then
   if test x"$multi_arch" = xyes; then
     AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
   else
@@ -1158,7 +1136,7 @@
 cat > conftest.s <<EOF
 ${libc_cv_dot_text}
 _sym:
-.type _sym, ${libc_cv_asm_type_prefix}gnu_unique_object
+.type _sym, %gnu_unique_object
 EOF
 if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
   libc_cv_asm_unique_object=yes

Modified: trunk/libc/crypt/Makefile
==============================================================================
--- trunk/libc/crypt/Makefile (original)
+++ trunk/libc/crypt/Makefile Fri Aug 17 19:39:53 2012
@@ -50,7 +50,12 @@
 
 tests-$(OPTION_EGLIBC_CRYPT) += md5test sha256test sha512test
 
+# The test md5test-giant uses up to 400 MB of RSS and runs on a fast
+# machine over a minute.
+xtests = md5test-giant
+
 $(objpfx)md5test: $(objpfx)md5.o
+$(objpfx)md5test-giant: $(objpfx)md5.o
 $(objpfx)sha256test: $(objpfx)sha256.o
 $(objpfx)sha512test: $(objpfx)sha512.o
 endif

Modified: trunk/libc/crypt/md5.c
==============================================================================
--- trunk/libc/crypt/md5.c (original)
+++ trunk/libc/crypt/md5.c Fri Aug 17 19:39:53 2012
@@ -1,7 +1,6 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2011
-	Free Software Foundation, Inc.
+   Copyright (C) 1995-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
@@ -312,13 +311,13 @@
   md5_uint32 B = ctx->B;
   md5_uint32 C = ctx->C;
   md5_uint32 D = ctx->D;
+  md5_uint32 lolen = len;
 
   /* First increment the byte count.  RFC 1321 specifies the possible
      length of the file up to 2^64 bits.  Here we only compute the
      number of bytes.  Do a double word increment.  */
-  ctx->total[0] += len;
-  if (ctx->total[0] < len)
-    ++ctx->total[1];
+  ctx->total[0] += lolen;
+  ctx->total[1] += (len >> 31 >> 1) + (ctx->total[0] < lolen);
 
   /* Process all bytes in the buffer with 64 bytes in each round of
      the loop.  */

Modified: trunk/libc/crypt/sha512.c
==============================================================================
--- trunk/libc/crypt/sha512.c (original)
+++ trunk/libc/crypt/sha512.c Fri Aug 17 19:39:53 2012
@@ -1,6 +1,6 @@
 /* Functions to compute SHA512 message digest of files or memory blocks.
    according to the definition of SHA512 in FIPS 180-2.
-   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -123,9 +123,10 @@
 #ifdef USE_TOTAL128
   ctx->total128 += len;
 #else
-  ctx->total[TOTAL128_low] += len;
-  if (ctx->total[TOTAL128_low] < len)
-    ++ctx->total[TOTAL128_high];
+  uint64_t lolen = len;
+  ctx->total[TOTAL128_low] += lolen;
+  ctx->total[TOTAL128_high] += ((len >> 31 >> 31 >> 2)
+				+ (ctx->total[TOTAL128_low] < lolen));
 #endif
 
   /* Process all bytes in the buffer with 128 bytes in each round of

Modified: trunk/libc/debug/Makefile
==============================================================================
--- trunk/libc/debug/Makefile (original)
+++ trunk/libc/debug/Makefile Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2001,2004-2008, 2009, 2011, 2012 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
@@ -58,32 +58,32 @@
 static-only-routines := warning-nop stack_chk_fail_local
 
 CFLAGS-backtrace.c = -fno-omit-frame-pointer
-CFLAGS-sprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-snprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-asprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vasprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-obprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-dprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vdprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgets_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fread_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fread_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-swprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vswprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-wprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vfwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgetws_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgetws_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
+CFLAGS-sprintf_chk.c = $(libio-mtsafe)
+CFLAGS-snprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vsprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vsnprintf_chk.c = $(libio-mtsafe)
+CFLAGS-asprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vasprintf_chk.c = $(libio-mtsafe)
+CFLAGS-obprintf_chk.c = $(libio-mtsafe)
+CFLAGS-dprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vdprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-printf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vfprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-gets_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgets_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgets_u_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fread_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fread_u_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-swprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vswprintf_chk.c = $(libio-mtsafe)
+CFLAGS-wprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vfwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgetws_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgetws_u_chk.c = $(libio-mtsafe) $(exceptions)
 CFLAGS-read_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables

Modified: trunk/libc/dirent/alphasort.c
==============================================================================
--- trunk/libc/dirent/alphasort.c (original)
+++ trunk/libc/dirent/alphasort.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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,7 +15,15 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* We need to avoid the header declaration of alphasort64, because
+   the types don't match alphasort and then the compiler will
+   complain about the mismatch when we do the alias below.  */
+#define alphasort64     __renamed_alphasort64
+
 #include <dirent.h>
+
+#undef  alphasort64
+
 #include <string.h>
 
 int
@@ -23,3 +31,7 @@
 {
   return strcoll ((*a)->d_name, (*b)->d_name);
 }
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (alphasort, alphasort64)
+#endif

Modified: trunk/libc/dirent/alphasort64.c
==============================================================================
--- trunk/libc/dirent/alphasort64.c (original)
+++ trunk/libc/dirent/alphasort64.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2000, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -18,8 +18,13 @@
 #include <dirent.h>
 #include <string.h>
 
+/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64.  */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
 int
 alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
 {
   return strcoll ((*a)->d_name, (*b)->d_name);
 }
+
+#endif

Modified: trunk/libc/dirent/scandir.c
==============================================================================
--- trunk/libc/dirent/scandir.c (original)
+++ trunk/libc/dirent/scandir.c Fri Aug 17 19:39:53 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992-1998,2000,2002,2003,2009,2011
-   Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -16,7 +15,15 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* We need to avoid the header declaration of scandir64, because
+   the types don't match scandir and then the compiler will
+   complain about the mismatch when we do the alias below.  */
+#define scandir64       __renamed_scandir64
+
 #include <dirent.h>
+
+#undef  scandir64
+
 #include <fcntl.h>
 
 #ifndef SCANDIR
@@ -35,3 +42,7 @@
 {
   return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp);
 }
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (scandir, scandir64)
+#endif

Modified: trunk/libc/dirent/scandir64.c
==============================================================================
--- trunk/libc/dirent/scandir64.c (original)
+++ trunk/libc/dirent/scandir64.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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
@@ -17,8 +17,13 @@
 
 #include <dirent.h>
 
+/* scandir.c defines scandir64 as an alias if _DIRENT_MATCHES_DIRENT64.  */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
 #define SCANDIR scandir64
 #define SCANDIRAT scandirat64
 #define DIRENT_TYPE struct dirent64
 
 #include <dirent/scandir.c>
+
+#endif

Modified: trunk/libc/dirent/scandirat.c
==============================================================================
--- trunk/libc/dirent/scandirat.c (original)
+++ trunk/libc/dirent/scandirat.c Fri Aug 17 19:39:53 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992-1998,2000,2002,2003,2009,2011
-   Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -16,7 +15,15 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* We need to avoid the header declaration of scandir64, because
+   the types don't match scandir and then the compiler will
+   complain about the mismatch when we do the alias below.  */
+#define scandirat64       __renamed_scandirat64
+
 #include <dirent.h>
+
+#undef  scandirat64
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -141,3 +148,7 @@
   return c.cnt;
 }
 libc_hidden_def (SCANDIRAT)
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (scandirat, scandirat64)
+#endif

Modified: trunk/libc/dirent/scandirat64.c
==============================================================================
--- trunk/libc/dirent/scandirat64.c (original)
+++ trunk/libc/dirent/scandirat64.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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
@@ -17,9 +17,14 @@
 
 #include <dirent.h>
 
+/* scandirat.c defines scandirat64 as an alias if _DIRENT_MATCHES_DIRENT64.  */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
 #define SCANDIRAT scandirat64
 #define READDIR __readdir64
 #define DIRENT_TYPE struct dirent64
 #define SKIP_SCANDIR_CANCEL 1
 
 #include "scandirat.c"
+
+#endif

Modified: trunk/libc/dirent/versionsort.c
==============================================================================
--- trunk/libc/dirent/versionsort.c (original)
+++ trunk/libc/dirent/versionsort.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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,7 +15,15 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* We need to avoid the header declaration of versionsort64, because
+   the types don't match versionsort and then the compiler will
+   complain about the mismatch when we do the alias below.  */
+#define versionsort64     __renamed_versionsort64
+
 #include <dirent.h>
+
+#undef  versionsort64
+
 #include <string.h>
 
 int
@@ -23,3 +31,7 @@
 {
   return __strverscmp ((*a)->d_name, (*b)->d_name);
 }
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (versionsort, versionsort64)
+#endif

Modified: trunk/libc/dirent/versionsort64.c
==============================================================================
--- trunk/libc/dirent/versionsort64.c (original)
+++ trunk/libc/dirent/versionsort64.c Fri Aug 17 19:39:53 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2000, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -18,8 +18,13 @@
 #include <dirent.h>
 #include <string.h>
 
+/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64.  */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
 int
 versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
 {
   return __strverscmp ((*a)->d_name, (*b)->d_name);
 }
+
+#endif

Modified: trunk/libc/elf/chroot_canon.c
==============================================================================
--- trunk/libc/elf/chroot_canon.c (original)
+++ trunk/libc/elf/chroot_canon.c Fri Aug 17 19:39:53 2012
@@ -1,6 +1,5 @@
 /* Return the canonical absolute name of a given file inside chroot.
-   Copyright (C) 1996,1997,1998,1999,2000,2001,2004,2005,2010,2011
-	Free Software Foundation, Inc.
+   Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,12 +19,12 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <eloop-threshold.h>
 #include <ldconfig.h>
 
 #ifndef PATH_MAX
@@ -127,7 +126,7 @@
 	      char *buf = alloca (PATH_MAX);
 	      size_t len;
 
-	      if (++num_links > MAXSYMLINKS)
+	      if (++num_links > __eloop_threshold ())
 		{
 		  __set_errno (ELOOP);
 		  goto error;

Modified: trunk/libc/elf/dl-close.c
==============================================================================
--- trunk/libc/elf/dl-close.c (original)
+++ trunk/libc/elf/dl-close.c Fri Aug 17 19:39:53 2012
@@ -641,7 +641,7 @@
 #ifdef SHARED
 	      assert (nsid != LM_ID_BASE);
 #endif
-	      ns->_ns_loaded = imap->l_next;
+	      r->r_map = ns->_ns_loaded = imap->l_next;
 	    }
 
 	  --ns->_ns_nloaded;

Modified: trunk/libc/elf/dl-load.c
==============================================================================
--- trunk/libc/elf/dl-load.c (original)
+++ trunk/libc/elf/dl-load.c Fri Aug 17 19:39:53 2012
@@ -1194,9 +1194,11 @@
 	       was executed directly.  The setup will happen later.  */
 	    break;
 
+# ifdef _LIBC_REENTRANT
 	  /* In a static binary there is no way to tell if we dynamically
 	     loaded libpthread.  */
 	  if (GL(dl_error_catch_tsd) == &_dl_initial_error_catch_tsd)
+# endif
 #endif
 	    {
 	      /* We have not yet loaded libpthread.

Modified: trunk/libc/elf/dl-lookup.c
==============================================================================
--- trunk/libc/elf/dl-lookup.c (original)
+++ trunk/libc/elf/dl-lookup.c Fri Aug 17 19:39:53 2012
@@ -1,5 +1,5 @@
 /* Look up a symbol in the loaded objects.
-   Copyright (C) 1995-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-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
@@ -27,6 +27,7 @@
 #include <sysdep-cancel.h>
 #include <bits/libc-lock.h>
 #include <tls.h>
+#include <atomic.h>
 
 #include <assert.h>
 

Modified: trunk/libc/elf/dl-open.c
==============================================================================
--- trunk/libc/elf/dl-open.c (original)
+++ trunk/libc/elf/dl-open.c Fri Aug 17 19:39:53 2012
@@ -1,5 +1,5 @@
 /* Load a shared object at runtime, relocate it, and run its initializer.
-   Copyright (C) 1996-2007, 2009-2012 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
@@ -33,6 +33,7 @@
 #include <sysdep-cancel.h>
 #include <tls.h>
 #include <stap-probe.h>
+#include <atomic.h>
 
 #include <dl-dst.h>
 

Modified: trunk/libc/elf/dl-sym.c
==============================================================================
--- trunk/libc/elf/dl-sym.c (original)
+++ trunk/libc/elf/dl-sym.c Fri Aug 17 19:39:53 2012
@@ -1,5 +1,5 @@
 /* Look up a symbol in a shared object loaded by `dlopen'.
-   Copyright (C) 1999-2002,2004,2006,2007,2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-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
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdlib.h>
 #include <libintl.h>
 
 #include <dlfcn.h>

Modified: trunk/libc/elf/elf.h
==============================================================================
--- trunk/libc/elf/elf.h (original)
+++ trunk/libc/elf/elf.h Fri Aug 17 19:39:53 2012
@@ -2734,8 +2734,23 @@
 #define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
 #define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
 #define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
-
-#define R_MN10300_NUM		24
+#define R_MN10300_TLS_GD	24	/* 32-bit offset for global dynamic.  */
+#define R_MN10300_TLS_LD	25	/* 32-bit offset for local dynamic.  */
+#define R_MN10300_TLS_LDO	26	/* Module-relative offset.  */
+#define R_MN10300_TLS_GOTIE	27	/* GOT offset for static TLS block
+					   offset.  */
+#define R_MN10300_TLS_IE	28	/* GOT address for static TLS block
+					   offset.  */
+#define R_MN10300_TLS_LE	29	/* Offset relative to static TLS
+					   block.  */
+#define R_MN10300_TLS_DTPMOD	30	/* ID of module containing symbol.  */
+#define R_MN10300_TLS_DTPOFF	31	/* Offset in module TLS block.  */
+#define R_MN10300_TLS_TPOFF	32	/* Offset in static TLS block.  */
+#define R_MN10300_SYM_DIFF	33	/* Adjustment for next reloc as needed
+					   by linker relaxation.  */
+#define R_MN10300_ALIGN		34	/* Alignment requirement for linker
+					   relaxation.  */
+#define R_MN10300_NUM		35
 
 
 /* M32R relocs.  */

Modified: trunk/libc/elf/tst-unique1mod1.c
==============================================================================
--- trunk/libc/elf/tst-unique1mod1.c (original)
+++ trunk/libc/elf/tst-unique1mod1.c Fri Aug 17 19:39:53 2012
@@ -1,12 +1,9 @@
 #include <config.h>
 
 #ifdef HAVE_ASM_UNIQUE_OBJECT
-# define S(s) _S (s)
-# define _S(s) #s
-
 asm (".data;"
      ".globl var\n"
-     ".type var, " S (ASM_TYPE_DIRECTIVE_PREFIX) "gnu_unique_object\n"
+     ".type var, %gnu_unique_object\n"
      ".size var, 4\n"
      "var:.zero 4\n"
      ".previous");

Modified: trunk/libc/elf/tst-unique1mod2.c
==============================================================================
--- trunk/libc/elf/tst-unique1mod2.c (original)
+++ trunk/libc/elf/tst-unique1mod2.c Fri Aug 17 19:39:53 2012
@@ -1,12 +1,9 @@
 #include <config.h>
 
 #ifdef HAVE_ASM_UNIQUE_OBJECT
-# define S(s) _S (s)
-# define _S(s) #s
-
 asm (".data;"
      ".globl var\n"
-     ".type var, " S (ASM_TYPE_DIRECTIVE_PREFIX) "gnu_unique_object\n"
+     ".type var, %gnu_unique_object\n"
      ".size var, 4\n"
      "var:.zero 4\n"
      ".previous");

Modified: trunk/libc/elf/tst-unique2mod1.c
==============================================================================
--- trunk/libc/elf/tst-unique2mod1.c (original)
+++ trunk/libc/elf/tst-unique2mod1.c Fri Aug 17 19:39:53 2012
@@ -1,12 +1,9 @@
 #include <config.h>
 
 #ifdef HAVE_ASM_UNIQUE_OBJECT
-# define S(s) _S (s)
-# define _S(s) #s
-
 asm (".data;"
      ".globl var\n"
-     ".type var, " S (ASM_TYPE_DIRECTIVE_PREFIX) "gnu_unique_object\n"
+     ".type var, %gnu_unique_object\n"
      ".size var, 4\n"
      "var:.zero 4\n"
      ".previous");

Modified: trunk/libc/elf/tst-unique2mod2.c
==============================================================================
--- trunk/libc/elf/tst-unique2mod2.c (original)
+++ trunk/libc/elf/tst-unique2mod2.c Fri Aug 17 19:39:53 2012
@@ -1,12 +1,9 @@
 #include <config.h>
 
 #ifdef HAVE_ASM_UNIQUE_OBJECT
-# define S(s) _S (s)
-# define _S(s) #s
-
 asm (".data;"
      ".globl var\n"
-     ".type var, " S (ASM_TYPE_DIRECTIVE_PREFIX) "gnu_unique_object\n"
+     ".type var, %gnu_unique_object\n"
      ".size var, 4\n"
      "var:.zero 4\n"
      ".previous");

Modified: trunk/libc/grp/Makefile
==============================================================================
--- trunk/libc/grp/Makefile (original)
+++ trunk/libc/grp/Makefile Fri Aug 17 19:39:53 2012
@@ -1,5 +1,4 @@
-# Copyright (C) 1991,1992,1996-2000,2003,2004,2012
-# Free Software Foundation, Inc.
+# Copyright (C) 1991-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
@@ -51,8 +50,8 @@
 CFLAGS-getgrent_r.c = -fexceptions
 CFLAGS-getgrent.c = -fexceptions
 CFLAGS-fgetgrent.c = -fexceptions
-CFLAGS-fgetgrent_r.c = -fexceptions -D_IO_MTSAFE_IO
-CFLAGS-putgrent.c = -fexceptions -D_IO_MTSAFE_IO
+CFLAGS-fgetgrent_r.c = -fexceptions $(libio-mtsafe)
+CFLAGS-putgrent.c = -fexceptions $(libio-mtsafe)
 CFLAGS-initgroups.c = $(OPTION_EGLIBC_INET-CFLAGS-y) -fexceptions
 CFLAGS-getgrgid.c = -fexceptions
 

Modified: trunk/libc/gshadow/Makefile
==============================================================================
--- trunk/libc/gshadow/Makefile (original)
+++ trunk/libc/gshadow/Makefile Fri Aug 17 19:39:53 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.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -29,8 +29,8 @@
 CFLAGS-getsgent_r.c = -fexceptions
 CFLAGS-getsgent.c = -fexceptions
 CFLAGS-fgetsgent.c = -fexceptions
-CFLAGS-fgetsgent_r.c = -fexceptions -D_IO_MTSAFE_IO
-CFLAGS-putsgent.c = -fexceptions -D_IO_MTSAFE_IO
+CFLAGS-fgetsgent_r.c = -fexceptions $(libio-mtsafe)
+CFLAGS-putsgent.c = -fexceptions $(libio-mtsafe)
 CFLAGS-getsgnam.c = -fexceptions
 CFLAGS-getsgnam_r.c = -fexceptions
 

Modified: trunk/libc/hurd/lookup-retry.c
==============================================================================
--- trunk/libc/hurd/lookup-retry.c (original)
+++ trunk/libc/hurd/lookup-retry.c Fri Aug 17 19:39:53 2012
@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <_itoa.h>
+#include <eloop-threshold.h>
 
 /* Translate the error from dir_lookup into the error the user sees.  */
 static inline error_t
@@ -103,7 +104,7 @@
 	  /* Fall through.  */
 
 	case FS_RETRY_NORMAL:
-	  if (nloops++ >= SYMLOOP_MAX)
+	  if (nloops++ >= __eloop_threshold ())
 	    {
 	      __mach_port_deallocate (__mach_task_self (), *result);
 	      return ELOOP;
@@ -180,7 +181,7 @@
 	      dirport = INIT_PORT_CRDIR;
 	      if (*result != MACH_PORT_NULL)
 		__mach_port_deallocate (__mach_task_self (), *result);
-	      if (nloops++ >= SYMLOOP_MAX)
+	      if (nloops++ >= __eloop_threshold ())
 		return ELOOP;
 	      file_name = &retryname[1];
 	      break;

Modified: trunk/libc/include/atomic.h
==============================================================================
--- trunk/libc/include/atomic.h (original)
+++ trunk/libc/include/atomic.h Fri Aug 17 19:39:53 2012
@@ -198,8 +198,12 @@
 
 
 /* Add VALUE to *MEM and return the old value of *MEM.  */
-#ifndef atomic_exchange_and_add
-# define atomic_exchange_and_add(mem, value) \
+#ifndef atomic_exchange_and_add_acq
+# ifdef atomic_exchange_and_add
+#  define atomic_exchange_and_add_acq(mem, value) \
+  atomic_exchange_and_add (mem, value)
+# else
+#  define atomic_exchange_and_add_acq(mem, value) \
   ({ __typeof (*(mem)) __atg6_oldval;					      \
      __typeof (mem) __atg6_memp = (mem);				      \
      __typeof (*(mem)) __atg6_value = (value);				      \

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