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

[Commits] r20864 - in /trunk: ./ libc/ libc/bits/ libc/catgets/ libc/crypt/ libc/csu/ libc/debug/ libc/elf/ libc/grp/ libc/iconv/ libc...



Author: joseph
Date: Tue Sep 25 14:42:18 2012
New Revision: 20864

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

Added:
    trunk/libc/elf/tst-rtld-load-self.sh
      - copied unchanged from r20863, fsf/trunk/libc/elf/tst-rtld-load-self.sh
    trunk/libc/include/rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/include/rounding-mode.h
    trunk/libc/malloc/tst-malloc-usable.c
      - copied unchanged from r20863, fsf/trunk/libc/malloc/tst-malloc-usable.c
    trunk/libc/nptl/tst-cancel21-static.c
      - copied unchanged from r20863, fsf/trunk/libc/nptl/tst-cancel21-static.c
    trunk/libc/nptl/tst-sem14.c
      - copied unchanged from r20863, fsf/trunk/libc/nptl/tst-sem14.c
    trunk/libc/ports/sysdeps/alpha/fpu/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/ports/sysdeps/alpha/fpu/get-rounding-mode.h
    trunk/libc/ports/sysdeps/arm/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/ports/sysdeps/arm/get-rounding-mode.h
    trunk/libc/ports/sysdeps/ia64/Makeconfig
      - copied unchanged from r20863, fsf/trunk/libc/ports/sysdeps/ia64/Makeconfig
    trunk/libc/ports/sysdeps/ia64/fpu/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/ports/sysdeps/ia64/fpu/get-rounding-mode.h
    trunk/libc/ports/sysdeps/powerpc/nofpu/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/ports/sysdeps/powerpc/nofpu/get-rounding-mode.h
    trunk/libc/stdio-common/tst-printf-round.c
      - copied unchanged from r20863, fsf/trunk/libc/stdio-common/tst-printf-round.c
    trunk/libc/sysdeps/generic/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/generic/get-rounding-mode.h
    trunk/libc/sysdeps/generic/malloc-sysdep.h
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/generic/malloc-sysdep.h
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_cosf.c
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_cosf.c
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_sinf.c
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/i386/i686/fpu/multiarch/s_sinf.c
    trunk/libc/sysdeps/s390/fpu/get-rounding-mode.h
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/s390/fpu/get-rounding-mode.h
    trunk/libc/sysdeps/sparc/sparc32/sparcv9/addmul_1.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/addmul_1.S
    trunk/libc/sysdeps/sparc/sparc32/sparcv9/mul_1.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/mul_1.S
    trunk/libc/sysdeps/sparc/sparc32/sparcv9/submul_1.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/sparc/sparc32/sparcv9/submul_1.S
    trunk/libc/sysdeps/unix/sysv/linux/malloc-sysdep.h
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/unix/sysv/linux/malloc-sysdep.h
    trunk/libc/sysdeps/x86_64/fpu/s_cosf.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/x86_64/fpu/s_cosf.S
    trunk/libc/sysdeps/x86_64/fpu/s_sinf.S
      - copied unchanged from r20863, fsf/trunk/libc/sysdeps/x86_64/fpu/s_sinf.S
Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/Makeconfig
    trunk/libc/Makefile
    trunk/libc/NEWS
    trunk/libc/bits/libc-lock.h
    trunk/libc/catgets/Makefile
    trunk/libc/catgets/test-gencat.sh
    trunk/libc/config.make.in
    trunk/libc/configure
    trunk/libc/configure.in
    trunk/libc/crypt/md5test-giant.c
    trunk/libc/csu/libc-tls.c
    trunk/libc/debug/Makefile
    trunk/libc/elf/Makefile
    trunk/libc/elf/dl-tls.c
    trunk/libc/elf/elf.h
    trunk/libc/elf/rtld.c
    trunk/libc/elf/tst-pathopt.sh
    trunk/libc/grp/Makefile
    trunk/libc/grp/tst_fgetgrent.sh
    trunk/libc/iconv/gconv_db.c
    trunk/libc/iconvdata/Makefile
    trunk/libc/iconvdata/run-iconv-test.sh
    trunk/libc/intl/Makefile
    trunk/libc/intl/tst-gettext.sh
    trunk/libc/intl/tst-gettext2.sh
    trunk/libc/intl/tst-gettext4.sh
    trunk/libc/intl/tst-gettext6.sh
    trunk/libc/intl/tst-translit.sh
    trunk/libc/io/Makefile
    trunk/libc/io/ftwtest-sh
    trunk/libc/libio/Makefile
    trunk/libc/libio/fileops.c
    trunk/libc/libio/iogetdelim.c
    trunk/libc/libio/iogetline.c
    trunk/libc/libio/iogetwline.c
    trunk/libc/libio/iopopen.c
    trunk/libc/libio/libio.h
    trunk/libc/libio/libioP.h
    trunk/libc/libio/oldfileops.c
    trunk/libc/libio/oldiopopen.c
    trunk/libc/libio/test-freopen.sh
    trunk/libc/libio/wfileops.c
    trunk/libc/localedata/ChangeLog
    trunk/libc/localedata/Makefile
    trunk/libc/localedata/gen-locale.sh
    trunk/libc/localedata/locales/es_DO
    trunk/libc/localedata/locales/es_GT
    trunk/libc/localedata/locales/es_HN
    trunk/libc/localedata/locales/es_MX
    trunk/libc/localedata/locales/es_NI
    trunk/libc/localedata/locales/es_PA
    trunk/libc/localedata/locales/es_PR
    trunk/libc/localedata/locales/es_SV
    trunk/libc/localedata/sort-test.sh
    trunk/libc/localedata/tst-ctype.sh
    trunk/libc/localedata/tst-fmon.sh
    trunk/libc/localedata/tst-langinfo.sh
    trunk/libc/localedata/tst-locale.sh
    trunk/libc/localedata/tst-mbswcs.sh
    trunk/libc/localedata/tst-numeric.sh
    trunk/libc/localedata/tst-rpmatch.sh
    trunk/libc/localedata/tst-trans.sh
    trunk/libc/localedata/tst-wctype.sh
    trunk/libc/malloc/Makefile
    trunk/libc/malloc/arena.c
    trunk/libc/malloc/hooks.c
    trunk/libc/malloc/malloc.c
    trunk/libc/malloc/mcheck.c
    trunk/libc/malloc/memusage.c
    trunk/libc/malloc/tst-mtrace.sh
    trunk/libc/manual/arith.texi
    trunk/libc/manual/contrib.texi
    trunk/libc/manual/examples/inetcli.c
    trunk/libc/manual/memory.texi
    trunk/libc/manual/socket.texi
    trunk/libc/math/libm-test.inc
    trunk/libc/nptl/ChangeLog
    trunk/libc/nptl/Makefile
    trunk/libc/nptl/sysdeps/i386/tls.h
    trunk/libc/nptl/sysdeps/pthread/bits/libc-lockP.h
    trunk/libc/nptl/sysdeps/pthread/pthread.h
    trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sem_post.c
    trunk/libc/nptl/sysdeps/x86_64/tls.h
    trunk/libc/nptl/tst-tls6.sh
    trunk/libc/ports/ChangeLog.alpha
    trunk/libc/ports/ChangeLog.arm
    trunk/libc/ports/ChangeLog.hppa
    trunk/libc/ports/ChangeLog.ia64
    trunk/libc/ports/ChangeLog.powerpc
    trunk/libc/ports/ChangeLog.tile
    trunk/libc/ports/sysdeps/alpha/fpu/libm-test-ulps
    trunk/libc/ports/sysdeps/alpha/fpu/s_isnan.c
    trunk/libc/ports/sysdeps/arm/bits/atomic.h
    trunk/libc/ports/sysdeps/ia64/fpu/fegetround.c
    trunk/libc/ports/sysdeps/tile/__tls_get_addr.S
    trunk/libc/ports/sysdeps/tile/libm-test-ulps
    trunk/libc/ports/sysdeps/tile/sysdep.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/nptl/localplt.data
    trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/setfpucw.c
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/Versions
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/errno.h
    trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list
    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/sys/procfs.h
    trunk/libc/posix/Makefile
    trunk/libc/posix/globtest.sh
    trunk/libc/posix/tst-getconf.sh
    trunk/libc/posix/wordexp-tst.sh
    trunk/libc/scripts/check-local-headers.sh
    trunk/libc/scripts/test-installation.pl
    trunk/libc/stdio-common/Makefile
    trunk/libc/stdio-common/printf_fp.c
    trunk/libc/stdio-common/printf_fphex.c
    trunk/libc/stdio-common/tst-printf.sh
    trunk/libc/stdio-common/tst-unbputc.sh
    trunk/libc/stdlib/Makefile
    trunk/libc/stdlib/gen-tst-strtod-round.c
    trunk/libc/stdlib/strtod_l.c
    trunk/libc/stdlib/tst-fmtmsg.sh
    trunk/libc/stdlib/tst-secure-getenv.c
    trunk/libc/stdlib/tst-strtod-overflow.c
    trunk/libc/stdlib/tst-strtod-round.c
    trunk/libc/sysdeps/generic/_G_config.h
    trunk/libc/sysdeps/gnu/_G_config.h
    trunk/libc/sysdeps/i386/fpu/libm-test-ulps
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/Makefile
    trunk/libc/sysdeps/i386/i686/fpu/multiarch/e_expf.c
    trunk/libc/sysdeps/ieee754/flt-32/s_cosf.c
    trunk/libc/sysdeps/ieee754/flt-32/s_sinf.c
    trunk/libc/sysdeps/mach/bits/libc-lock.h
    trunk/libc/sysdeps/mach/hurd/_G_config.h
    trunk/libc/sysdeps/mach/hurd/bits/libc-lock.h
    trunk/libc/sysdeps/s390/s390-32/multiarch/Makefile
    trunk/libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
    trunk/libc/sysdeps/s390/s390-32/multiarch/memcmp.S
    trunk/libc/sysdeps/s390/s390-32/multiarch/memcpy.S
    trunk/libc/sysdeps/s390/s390-32/multiarch/memset.S
    trunk/libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
    trunk/libc/sysdeps/sparc/bits/hwcap.h
    trunk/libc/sysdeps/sparc/dl-procinfo.c
    trunk/libc/sysdeps/sparc/dl-procinfo.h
    trunk/libc/sysdeps/sparc/fpu/libm-test-ulps
    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_settime.c
    trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
    trunk/libc/sysdeps/unix/sysv/linux/ttyname.c
    trunk/libc/sysdeps/unix/sysv/linux/ttyname_r.c
    trunk/libc/sysdeps/wordsize-64/Makefile
    trunk/libc/sysdeps/wordsize-64/tst-writev.c
    trunk/libc/sysdeps/x86_64/Makefile
    trunk/libc/sysdeps/x86_64/dl-machine.h
    trunk/libc/sysdeps/x86_64/fpu/libm-test-ulps
    trunk/libc/sysdeps/x86_64/tst-xmmymm.sh

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 25 14:42:18 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-20391
+/fsf/trunk:15224-20863

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Sep 25 14:42:18 2012
@@ -1,3 +1,602 @@
+2012-09-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/libio.h (_IO_size_t): Define to size_t, not _G_size_t.
+	(_IO_ssize_t): Define to __ssize_t, not _G_ssize_t.
+	(_IO_off_t): Define to __off_t, not _G_off_t.
+	(_IO_pid_t): Define to __pid_t, not _G_pid_t.
+	(_IO_uid_t): Define to __uid_t, not _G_uid_t.
+	(_IO_wint_t): Define to wint_t, not _G_wint_t.
+	* libio/libioP.h (struct _IO_jump_t): Use size_t not _G_size_t as
+	type of __dummy and __dummy2 fields.
+	* sysdeps/generic/_G_config.h (_G_size_t): Remove.
+	(_G_ssize_t): Likewise.
+	(_G_off_t): Likewise.
+	(_G_pid_t): Likewise.
+	(_G_uid_t): Likewise.
+	(_G_wchar_t): Likewise.
+	(_G_wint_t): Likewise.
+	* sysdeps/gnu/_G_config.h (_G_size_t): Remove.
+	(_G_ssize_t): Likewise.
+	(_G_off_t): Likewise.
+	(_G_pid_t): Likewise.
+	(_G_uid_t): Likewise.
+	(_G_wchar_t): Likewise.
+	(_G_wint_t): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_size_t): Remove.
+	(_G_ssize_t): Likewise.
+	(_G_off_t): Likewise.
+	(_G_pid_t): Likewise.
+	(_G_uid_t): Likewise.
+	(_G_wchar_t): Likewise.
+	(_G_wint_t): Likewise.
+
+2012-09-25  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* malloc/arena.c: Include malloc-sysdep.h.
+	(shrink_heap): Use check_may_shrink_heap to decide if madvise
+	is sufficient to shrink the heap or an unmap is needed.
+	* sysdeps/generic/malloc-sysdep.h: New file.  Define
+	new function check_may_shrink_heap.
+	* sysdeps/unix/sysv/linux/malloc-sysdep.h: New file.  Define
+	new function check_may_shrink_heap.
+
+2012-09-25  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* libio/fileops.c (_IO_new_file_seekoff): Fix typos in
+	comments.
+
+2012-09-24  Dmitry V. Levin  <ldv@xxxxxxxxxxxx>
+
+	* catgets/test-gencat.sh: Add "set -e".
+	* elf/tst-pathopt.sh: Likewise.
+	* grp/tst_fgetgrent.sh: Likewise.
+	* iconvdata/run-iconv-test.sh: Likewise.
+	* intl/tst-gettext.sh: Likewise.
+	* intl/tst-gettext2.sh: Likewise.
+	* intl/tst-gettext4.sh: Likewise.
+	* intl/tst-gettext6.sh: Likewise.
+	* intl/tst-translit.sh: Likewise.
+	* io/ftwtest-sh: Likewise.
+	* libio/test-freopen.sh: Likewise.
+	* malloc/tst-mtrace.sh: Likewise.
+	* posix/globtest.sh: Likewise.
+	* posix/tst-getconf.sh: Likewise.
+	* posix/wordexp-tst.sh: Likewise.
+	* stdio-common/tst-printf.sh: Likewise.
+	* stdio-common/tst-unbputc.sh: Likewise.
+	* stdlib/tst-fmtmsg.sh: Likewise.
+	* sysdeps/x86_64/tst-xmmymm.sh: Likewise.
+	* catgets/Makefile: Do not specify -e option when running
+	testsuite shell scripts.
+	* elf/Makefile: Likewise.
+	* grp/Makefile: Likewise.
+	* iconvdata/Makefile: Likewise.
+	* intl/Makefile: Likewise.
+	* io/Makefile: Likewise.
+	* libio/Makefile: Likewise.
+	* malloc/Makefile: Likewise.
+	* posix/Makefile: Likewise.
+	* stdio-common/Makefile: Likewise.
+	* stdlib/Makefile: Likewise.
+	* sysdeps/x86_64/Makefile: Likewise.
+
+	* io/ftwtest-sh: Add copyright header.
+	* posix/globtest.sh: Likewise.
+	* posix/tst-getconf.sh: Likewise.
+	* posix/wordexp-tst.sh: Likewise.
+	* sysdeps/x86_64/tst-xmmymm.sh: Likewise.
+
+2012-09-24  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #13679]
+	* Makeconfig (+link): Defined as $(+link-static) if
+	$(build-shared) isn't yes.
+	(link-tests): Defined as $(+link-static-tests) if $(build-shared)
+	isn't yes.
+	(static-gnulib): Add -lgcc_eh if $(build-shared) isn't yes.
+
+	* Makeconfig (+postctorT): Replace crtendS.o with crtend.o.
+
+	[BZ #14562]
+	* malloc/arena.c (heap_trim): Properly get fencepost and adjust
+	new chunk size with MALLOC_ALIGN_MASK.
+
+2012-09-24  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #5044]
+	* stdio-common/printf_fphex.c: Include <stdbool.h> and
+	<rounding-mode.h>.
+	(__printf_fphex): Determine rounding using get_rounding_mode and
+	round_away.
+	* stdio-common/tst-printf-round.c (struct hex_test): New
+	structure.
+	(hex_tests): New variable.
+	(test_hex_in_one_mode): New function.
+	(do_test): Also run tests for hex float output.
+
+2012-09-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/iopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+	[!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+	* libio/libio.h (_IO_HAVE_SYS_WAIT): Remove.
+	* libio/oldiopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+	[!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+	* sysdeps/generic/_G_config.h (_G_HAVE_SYS_WAIT): Remove.
+	* sysdeps/gnu/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+
+2012-09-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional.
+	* sysdeps/generic/_G_config.h (_G_NEED_STDARG_H): Remove.
+	* sysdeps/gnu/_G_config.h (_G_NEED_STDARG_H): Remove.
+	* sysdeps/mach/hurd/_G_config.h (_G_NEED_STDARG_H): Remove.
+
+2012-09-19  Dmitry V. Levin  <ldv@xxxxxxxxxxxx>
+
+	[BZ #14579]
+	* elf/rtld.c (dl_main): Limit the check for self loading to normal
+	mode only.
+	* elf/tst-rtld-load-self.sh: New test.
+	* elf/Makefile: Run it.
+
+2012-09-18  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/wordsize-64/Makefile [$(subdir) = misc]
+	(tst-writev-ENV): Remove.
+	* sysdeps/wordsize-64/tst-writev.c (TIMEOUT): Define.
+
+2012-09-17  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* crypt/md5test-giant.c (TIMEOUT): Increase to 8 minutes for tilegx.
+
+2012-09-17  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/iogetline.c [_LIBC || !_G_HAVE_IO_GETLINE_INFO]: Make code
+	unconditional.
+	* libio/iogetwline.c [_LIBC || !_G_HAVE_IO_GETLINE_INFO]:
+	Likewise.
+	* sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Remove.
+	* sysdeps/gnu/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_HAVE_IO_GETLINE_INFO):
+	Likewise.
+
+2012-09-14  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14587]
+	* Makeconfig (ASFLAGS): Remove $(have-cpp-asm-debuginfo) check.
+	* config.make.in (have-cpp-asm-debuginfo): Removed.
+	* configure.in: Don't substitute libc_cv_cpp_asm_debuginfo.
+	* configure: Regenerated.
+
+2012-09-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #5044]
+	* stdio-common/printf_fp.c: Include <stdbool.h> and
+	<rounding-mode.h>.
+	(___printf_fp): Determine rounding using get_rounding_mode and
+	round_away.
+	* stdio-common/tst-printf-round.c: New file.
+	* stdio-common/Makefile (tests): Add tst-printf-round.
+	(link-libm): New variable.
+	($(objpfx)tst-printf-round): Depend in $(link-libm).
+
+2012-09-13  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14576]
+	* bits/libc-lock.h (__rtld_lock_init_recursive): Removed.
+	* sysdeps/mach/bits/libc-lock.h (__rtld_lock_init_recursive):
+	Likewise.
+	* sysdeps/mach/hurd/bits/libc-lock.h (__rtld_lock_init_recursive):
+	Likewise.
+
+2012-09-13  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/libio.h [!_G_HAVE_PRINTF_FP] (_IO_USE_DTOA): Remove.
+	* sysdeps/generic/_G_config.h (_G_HAVE_PRINTF_FP): Likewise.
+	* sysdeps/gnu/_G_config.h (_G_HAVE_PRINTF_FP): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_HAVE_PRINTF_FP): Likewise.
+
+2012-09-12  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14518]
+	* include/rounding-mode.h: New file.
+	* sysdeps/generic/get-rounding-mode.h: Likewise.
+	* sysdeps/s390/fpu/get-rounding-mode.h: Likewise.
+	* stdlib/strtod_l.c: Include <rounding-mode.h>.
+	(MAX_VALUE): New macro.
+	(MIN_VALUE): Likewise.
+	(overflow_value): New function.
+	(underflow_value): Likewise.
+	(round_and_return): Use overflow_value and underflow_value to
+	determine return values in overflow and underflow cases.  Use
+	round_away to determine rounding depending on rounding mode.
+	(____STRTOF_INTERNAL): Use overflow_value and underflow_value to
+	determine return values in overflow and underflow cases.
+	* stdlib/tst-strtod-round.c: Include <fenv.h>.
+	(struct test_results): New structure.
+	(struct test): Use struct test_results to store expected results
+	for all rounding modes.
+	(TEST): Include expected results for all rounding modes.
+	(test_in_one_mode): New function.
+	(do_test): Use test_in_one_mode to compute and check results.
+	Check results for all rounding modes.
+	* stdlib/Makefile ($(objpfx)tst-strtod-round): Depend on
+	$(link-libm).
+
+2012-12-09  Allan McRae  <allan@xxxxxxxxxxxxx>
+
+        * sysdeps/i386/fpu/libm-test-ulps: Update
+
+2012-09-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/generic/_G_config.h (_G_int16_t): Remove.
+	(_G_int32_t): Likewise.
+	(_G_uint16_t): Likewise.
+	(_G_uint32_t): Likewise.
+	(_G_HAVE_BOOL): Likewise.
+	(_G_HAVE_ATEXIT): Likewise.
+	(_G_HAVE_LONG_DOUBLE_IO): Likewise.
+	(_G_HAVE_IO_FILE_OPEN): Likewise.
+	* sysdeps/gnu/_G_config.h (_G_int16_t): Remove.
+	(_G_int32_t): Likewise.
+	(_G_uint16_t): Likewise.
+	(_G_uint32_t): Likewise.
+	(_G_HAVE_BOOL): Likewise.
+	(_G_HAVE_ATEXIT): Likewise.
+	(_G_HAVE_LONG_DOUBLE_IO): Likewise.
+	(_G_HAVE_IO_FILE_OPEN): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_int16_t): Remove.
+	(_G_int32_t): Likewise.
+	(_G_uint16_t): Likewise.
+	(_G_uint32_t): Likewise.
+	(_G_HAVE_BOOL): Likewise.
+	(_G_HAVE_ATEXIT): Likewise.
+	(_G_HAVE_LONG_DOUBLE_IO): Likewise.
+	(_G_HAVE_IO_FILE_OPEN): Likewise.
+
+2012-09-11  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* csu/libc-tls.c: Update copyright years.
+
+2012-09-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libioP.h [_G_USING_THUNKS]: Make code unconditional.
+	[!_G_USING_THUNKS]: Remove conditional code.
+	* sysdeps/gnu/_G_config.h (_G_USING_THUNKS): Remove.
+	* sysdeps/mach/hurd/_G_config.h (_G_USING_THUNKS): Likewise.
+
+	* libio/libioP.h [__GNUC__] (VTABLE_LABEL): Remove.
+	[!builtinbuf_vtable && __cplusplus] (builtinbuf_vtable): Likewise.
+	* sysdeps/generic/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
+	(_G_VTABLE_LABEL_PREFIX): Likewise.
+	(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
+	* sysdeps/gnu/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
+	(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
+	(_G_VTABLE_LABEL_PREFIX): Likewise.
+	(_G_VTABLE_LABEL_PREFIX_ID): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
+	(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
+	(_G_VTABLE_LABEL_PREFIX): Likewise.
+	(_G_VTABLE_LABEL_PREFIX_ID): Likewise.
+
+2012-09-10  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* libio/Makefile: Include ../Makeconfig before tests.
+	(tests): Add tst-fopenloc and depend on $(objpfx)tst-fopenloc.check
+	only if $(build-shared) is yes.
+
+	* iconv/gconv_db.c: Update copyright years.
+
+2012-09-10  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
+
+	* sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S: Fix
+	unwind info if defined PIC. Fix special cases description.
+	* sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S: Likewise.
+
+	* sysdeps/x86_64/fpu/s_sinf.S: Fix special cases description, fix
+	DP_HI_MASK entry.
+	* sysdeps/x86_64/fpu/s_cosf.S: Likewise.
+
+2012-09-07  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* scripts/check-local-headers.sh: Add "shopt -s nullglob".
+
+	* iconv/gconv_db.c (free_derivation): Check if deriv->steps
+	is NULL.
+
+	* debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
+	(LDLIBS-tst-chk4): This.
+	(LDFLAGS-tst-chk5): Renamed to ...
+	(LDLIBS-tst-chk5): This.
+	(LDFLAGS-tst-chk6): Renamed to ...
+	(LDLIBS-tst-chk6): This.
+	(LDFLAGS-tst-lfschk4): Renamed to ...
+	(LDLIBS-tst-lfschk4): This.
+	(LDFLAGS-tst-lfschk5): Renamed to ...
+	(LDLIBS-tst-lfschk5): This.
+	(LDFLAGS-tst-lfschk6): Renamed to ...
+	(LDLIBS-tst-lfschk6): This.
+
+	* Makefile ($(inst_includedir)/gnu/stubs.h): Remove dependency
+	on $(common-objpfx)soversions.mk.
+
+2012-09-07  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #10014]
+	* manual/examples/inetcli.c (SERVERHOST): Use www.gnu.org as
+	example host name.
+
+2012-09-07  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* malloc/arena.c (arena_get_retry): New function that gets
+	another arena for the caller to try its request on.
+	* malloc/malloc.c (__libc_malloc): Use get_another_arena if the
+	current arena cannot fulfill the request.
+	(__libc_memalign): Likewise.
+	(__libc_memalign): Likewise.
+	(__libc_pvalloc): Likewise.
+	(__libc_calloc): Likewise.
+
+2012-09-05  John Tobey  <john.tobey@xxxxxxxxx>
+
+	[BZ #13542]
+	* manual/arith.texi (Operations on Complex): Fix description
+	of carg branch cut.
+
+2012-09-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #10014]
+	* manual/socket.texi (Host Addresses): Use www.gnu.org as example
+	host name.
+
+	[BZ #10038]
+	* manual/memory.texi (Memory): Make order of menu items match
+	order of sections.
+
+2012-09-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* elf/dl-tls.c (DL_INITIAL_DTV): Removed.
+	(_dl_initial_dtv): New.  Defined if SHARED isn't defined.
+	(_dl_deallocate_tls): Restore GL(dl_initial_dtv).
+
+2012-09-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* csu/libc-tls.c (static_dtv): Renamed to ...
+	(_dl_static_dtv): This.  Make it global.
+	(_dl_initial_dtv): Removed.
+	(__libc_setup_tls): Updated.
+	* elf/dl-tls.c (DL_INITIAL_DTV): New macro.
+	(_dl_deallocate_tls): Replace GL(dl_initial_dtv) with
+	DL_INITIAL_DTV.
+
+2012-09-06  Petr Machata  <pmachata@xxxxxxxxxx>
+
+	* elf/elf.h (NT_S390_HIGH_GPRS): New macro.
+	(NT_S390_TIMER, NT_S390_TODCMP, NT_S390_TODPREG): Likewise.
+	(NT_S390_CTRS, NT_S390_PREFIX, NT_S390_LAST_BREAK): Likewise.
+	(NT_S390_SYSTEM_CALL, NT_ARM_VFP): Likewise.
+
+2012-09-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14545]
+	* csu/libc-tls.c (_dl_initial_dtv): New variable.
+	* elf/dl-tls.c (_dl_deallocate_tls): Always check dtv before
+	freeing dtv[-1].
+
+2012-09-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14544]
+	* Makeconfig (link-static-before-libc): Replace $(+prector)
+	with $(+prectorT).
+	(link-static-after-libc): Replace $(+postctor) with
+	$(+postctorT).
+	(link-bounded): Replace $(+prector)/$(+postctor) with
+	$(+prectorT)/$(+postctorT).
+	(+prectorT): New macro.
+	(+postctorT): Likewise.
+
+2012-09-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* stdlib/gen-tst-strtod-round.c: Include <assert.h>.
+	(round_str): Handle values above the maximum for IBM long double
+	as inexact.
+	* stdlib/tst-strtod-round.c (tests): Regenerated.
+
+2012-09-06  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/s390/s390-32/multiarch/Makefile: Remove -mzarch
+	assembler flag.
+	* sysdeps/s390/s390-32/multiarch/memcmp.S: Use .machinemode
+	zarch_nohighgprs around the zarch optimized routines.
+	* sysdeps/s390/s390-32/multiarch/memcpy.S: Likewise.
+	* sysdeps/s390/s390-32/multiarch/memset.S: Likewise.
+	* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Explicitly check
+	for zarch.
+
+2012-09-05  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/fpu/libm-test-ulps: Update.
+
+	* sysdeps/sparc/bits/hwcap.h (HWCAP_SPARC_PAUSE,
+	HWCAP_SPARC_CBCOND, HWCAP_SPARC_CRYPTO): Define.
+	* sysdeps/sparc/dl-procinfo.h (_DL_HWCAP_COUNT): Increase to 27.
+	* sysdeps/sparc/dl-procinfo.c (_dl_sparc_cap_flags): Add new
+	entries.
+
+2012-09-05  Alexandre Oliva  <aoliva@xxxxxxxxxx>
+
+	* malloc/arena.c: Fold copyright years.
+	* malloc/mcheck.c, malloc/memusage.c: Likewise.
+
+2012-09-05  Alexandre Oliva  <aoliva@xxxxxxxxxx>
+
+	* malloc/malloc.c (__libc_mallopt) <M_MMAP_MAX>: Fix indentation.
+
+2012-09-05  Alexandre Oliva  <aoliva@xxxxxxxxxx>
+
+	* manual/contrib.texi (Contributors): Fix typo.  Complete entry.
+
+2012-09-05  Alexandre Oliva  <aoliva@xxxxxxxxxx>
+
+	* malloc/malloc.c (__libc_mallopt) <M_MMAP_THRESHOLD>: Do not
+	change internal state upon failure.
+
+2012-09-05  Alexandre Oliva  <aoliva@xxxxxxxxxx>
+
+	* malloc/mcheck.c (mcheck_check_all): Fix typo.
+	* malloc/memusage.c (mmap): Likewise.
+	(mmap64, mremap): Likewise.  Adjust name in comment.
+
+2012-09-05  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* libio/fileops.c: Fix typos in comments.
+	* libio/oldfileops.c: Likewise.
+	* libio/wfileops.c: Likewise.
+
+2012-09-05  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	[BZ #1349]
+	* malloc/Makefile (tests): Add tst-malloc-usable test case.
+	(tst-malloc-usable-ENV): Set environment for test case.
+	* malloc/hooks.c (malloc_check_get_size): New function to get
+	requested size.
+	* malloc/malloc.c (musable): Use malloc_check_get_size.
+	* malloc/tst-malloc-usable.c: New test case.
+
+2012-09-05  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* stdlib/tst-strtod-overflow.c (TIMEOUT): Define.
+
+2012-09-05  Allan McRae  <allan@xxxxxxxxxxxxx>
+
+	[BZ #13966]
+	* configure.in (CXX_SYSINCLUDES): Use compiler output to
+	determine header location.
+	* configure: Regenerated.
+
+2012-09-05  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* stdlib/gen-tst-strtod-round.c (formats): Add Motorola extended
+	float format.
+	* stdlib/tst-strtod-round.c (TEST) [LDBL_MANT_DIG == 64 &&
+	LDBL_MAX_EXP == 16384]: Add case for Motorola extended float
+	format.
+	(test): Regenerate.
+
+2012-09-04  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/sparc32/sparcv9/addmul_1.S: New file.
+	* sysdeps/sparc/sparc32/sparcv9/submul_1.S: New file.
+	* sysdeps/sparc/sparc32/sparcv9/mul_1.S: New file.
+
+2012-09-04  Florian Weimer  <fweimer@xxxxxxxxxx>
+
+	* stdlib/tst-secure-getenv.c (alternative_main): Only warn on SGID
+	failures.
+
+	* stdlib/tst-secure-getenv.c: Fix whitespace in comments.
+
+2012-09-04  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #9914]
+	* libio/iogetdelim.c: Include <limits.h>.
+	(_IO_getdelim): Avoid integer overflow in testing whether cur_len
+	+ len + 1 would overflow.
+
+2012-09-03  Andreas Jaeger  <aj@xxxxxxx>
+
+	* sysdeps/x86_64/fpu/libm-test-ulps: Update.
+	* sysdeps/i386/fpu/libm-test-ulps: Update.
+
+2012-09-03  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
+
+	* sysdeps/i386/i686/fpu/multiarch/Makefile (sysdep_routines):
+	Add s_sinf-sse2, s_conf-sse2.
+
+	* sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S: New file.
+	* sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S: New file.
+	* sysdeps/i386/i686/fpu/multiarch/s_sinf.c: New file.
+	* sysdeps/i386/i686/fpu/multiarch/s_cosf.c: New file.
+
+	* sysdeps/ieee754/flt-32/s_sinf.c (SINF, SINF_FUNC): Add macros
+	for using routine as __sinf_ia32.
+	Use macro for function declaration and weak_alias.
+	* sysdeps/ieee754/flt-32/s_cosf.c (COSF, COSF_FUNC): Add macros
+	for using routine as __cosf_ia32.
+	Use macro for function declaration and weak_alias.
+
+	* sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S: Fix Copyright.
+	* sysdeps/i386/i686/fpu/multiarch/e_expf.c: Fix Copyright.
+
+	* sysdeps/x86_64/fpu/s_sinf.S: New file.
+	* sysdeps/x86_64/fpu/s_cosf.S: New file.
+	* sysdeps/x86_64/fpu/libm-test-ulps: Update.
+
+	* math/libm-test.inc (cos_test): Add more test cases.
+	(sin_test): Likewise.
+	(sincos_test): Likewise.
+
+2012-09-03  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
+
+	* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
+	(IFUNC_RESOLVE): Make pointers to the specialized implementations
+	hidden.
+	* sysdeps/s390/s390-64/multiarch/ifunc-resolve.c: Likewise.
+
+2012-09-02  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14538]
+	* sysdeps/x86_64/dl-machine.h (elf_machine_dynamic): Use the
+	first element of the GOT.
+	(elf_machine_load_address): Return the difference between
+	the runtime address of _DYNAMIC and elf_machine_dynamic ().
+
+2012-09-01  Allan McRae  <allan@xxxxxxxxxxxxx>
+
+	[BZ #13412]
+	* configure.in (AWK): Require gawk version 3.0 or later.
+	* configure: Regenerated.
+
+2012-09-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_POSIX_CPU_TIMERS): Remove.
+	* sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+	[__NR_clock_getres]: Make code unconditional.
+	[!__ASSUME_POSIX_CPU_TIMERS]: Remoce conditional code.
+	(clock_getcpuclockid): Remove code left unreachable by removal of
+	conditionals.
+	* sysdeps/unix/sysv/linux/clock_getres.c [__NR_clock_getres]: Make
+	code unconditional.
+	[__ASSUME_POSIX_CPU_TIMERS]: Likewise.
+	[!__ASSUME_POSIX_CPU_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_gettime.c [__NR_clock_gettime]:
+	Make code unconditional.
+	[__ASSUME_POSIX_CPU_TIMERS]: Likewise.
+	[!__ASSUME_POSIX_CPU_TIMERS]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/clock_settime.c
+	[__ASSUME_POSIX_CPU_TIMERS <= 0 && __NR_clock_settime]: Remove
+	conditional code.
+	[__ASSUME_POSIX_CPU_TIMERS]: Make code unconditional.
+	[!__ASSUME_POSIX_CPU_TIMERS]: Remove conditional code.
+
+2012-08-29  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14476]
+	* Makefile (install): Also pass LD_SO=$(ld.so-version) to
+	scripts/test-installation.pl.
+
+	* scripts/test-installation.pl: Use LD_SO to get $ld_so_name
+	and $ld_so_version if it is set.
+
+2012-08-29  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	[BZ #14516]
+	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Don't return
+	failure if reading from procfs failed.
+	* sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Likewise.
+
 2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h

Modified: trunk/libc/Makeconfig
==============================================================================
--- trunk/libc/Makeconfig (original)
+++ trunk/libc/Makeconfig Tue Sep 25 14:42:18 2012
@@ -411,8 +411,39 @@
 LDFLAGS-rtld += $(hashstyle-LDFLAGS)
 endif
 
+# Command for linking PIE programs with the C library.
+ifndef +link-pie
++link-pie = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
+	     $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+	     $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
+	     $(addprefix $(csu-objpfx),S$(start-installed-name)) \
+	     $(+preinit) $(+prectorS) \
+	     $(filter-out $(addprefix $(csu-objpfx),start.o \
+						    S$(start-installed-name))\
+			  $(+preinit) $(link-extra-libs) \
+			  $(common-objpfx)libc% $(+postinit),$^) \
+	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+endif
+# Command for statically linking programs with the C library.
+ifndef +link-static
++link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
+	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
+	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
+	      $(+preinit) $(+prectorT) \
+	      $(filter-out $(addprefix $(csu-objpfx),start.o \
+						     $(start-installed-name))\
+			   $(+preinit) $(link-extra-libs-static) \
+			   $(common-objpfx)libc% $(+postinit),$^) \
+	      $(link-extra-libs-static) $(link-libc-static)
++link-static-after-libc = $(+postctorT) $(+postinit)
++link-static = $(+link-static-before-libc) $(link-libc-static) \
+	       $(+link-static-after-libc)
++link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \
+		     $(+link-static-after-libc)
+endif
 # Commands for linking programs with the C library.
 ifndef +link
+ifeq (yes,$(build-shared))
 +link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
 	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
 	      $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
@@ -426,48 +457,22 @@
 +link-after-libc = $(+postctor) $(+postinit)
 +link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
 +link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
-endif
-# Command for linking PIE programs with the C library.
-ifndef +link-pie
-+link-pie = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
-	     $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
-	     $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
-	     $(addprefix $(csu-objpfx),S$(start-installed-name)) \
-	     $(+preinit) $(+prectorS) \
-	     $(filter-out $(addprefix $(csu-objpfx),start.o \
-						    S$(start-installed-name))\
-			  $(+preinit) $(link-extra-libs) \
-			  $(common-objpfx)libc% $(+postinit),$^) \
-	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
-endif
-# Command for statically linking programs with the C library.
-ifndef +link-static
-+link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
-	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
-	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-	      $(+preinit) $(+prector) \
-	      $(filter-out $(addprefix $(csu-objpfx),start.o \
-						     $(start-installed-name))\
-			   $(+preinit) $(link-extra-libs-static) \
-			   $(common-objpfx)libc% $(+postinit),$^) \
-	      $(link-extra-libs-static) $(link-libc-static)
-+link-static-after-libc = $(+postctor) $(+postinit)
-+link-static = $(+link-static-before-libc) $(link-libc-static) \
-	       $(+link-static-after-libc)
-+link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \
-		     $(+link-static-after-libc)
+else
++link = $(+link-static)
++link-tests = $(+link-static-tests)
+endif
 endif
 # Command for statically linking bounded-pointer programs with the C library.
 ifndef +link-bounded
 +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
 	      $(sysdep-LDFLAGS) $(LDFLAGS)  \
 	      $(addprefix $(csu-objpfx),b$(static-start-installed-name)) \
-	      $(+preinit) $(+prector) \
+	      $(+preinit) $(+prectorT) \
 	      $(filter-out $(addprefix $(csu-objpfx),start.ob \
 						     $(start-installed-name))\
 			   $(+preinit) $(link-extra-libs-bounded) \
 			   $(common-objpfx)libc% $(+postinit),$^) \
-	      $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit)
+	      $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctorT) $(+postinit)
 endif
 ifndef config-LDFLAGS
 ifeq (yes,$(build-shared))
@@ -568,7 +573,14 @@
 gnulib = -lgcc $(gnulib-arch)
 gnulib-tests := -lgcc $(libgcc_eh)
 static-gnulib-arch =
+# By default, elf/static-stubs.o, instead of -lgcc_eh, is used to
+# statically link programs.  When --disable-shared is used, we use
+# -lgcc_eh since elf/static-stubs.o isn't sufficient.
+ifeq (yes,$(build-shared))
 static-gnulib = -lgcc $(static-gnulib-arch)
+else
+static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+endif
 static-gnulib-tests := -lgcc -lgcc_eh $(libunwind)
 libc.so-gnulib := -lgcc
 endif
@@ -579,6 +591,9 @@
 # Variants of the two previous definitions for linking PIE programs.
 +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
 +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
+# Variants of the two previous definitions for statically linking programs.
++prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o`
++postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
 +interp = $(addprefix $(elf-objpfx),interp.os)
 csu-objpfx = $(common-objpfx)csu/
 elf-objpfx = $(common-objpfx)elf/
@@ -806,11 +821,7 @@
 
 # The assembler can generate debug information too.
 ifndef ASFLAGS
-ifeq ($(have-cpp-asm-debuginfo),yes)
 ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
-else
-ASFLAGS :=
-endif
 endif
 ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
 

Modified: trunk/libc/Makefile
==============================================================================
--- trunk/libc/Makefile (original)
+++ trunk/libc/Makefile Tue Sep 25 14:42:18 2012
@@ -120,7 +120,7 @@
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-	CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+	LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif
@@ -194,7 +194,7 @@
 else
 installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
 
-$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
+$(inst_includedir)/gnu/stubs.h: $(+force)
 	$(make-target-directory)
 	{ \
 	 echo '/* This file is automatically generated.';\

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Tue Sep 25 14:42:18 2012
@@ -9,10 +9,12 @@
 
 * The following bugs are resolved with this release:
 
-  3479, 5400, 6778, 6808, 9685, 11607, 13717, 13696, 13939, 14042, 14090,
-  14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 14252, 14283,
+  1349, 3479, 5044, 5400, 6778, 6808, 9685, 9914, 10014, 10038, 11607,
+  13412, 13542, 13679, 13717, 13696, 13939, 13966, 14042, 14090, 14166,
+  14150, 14151, 14154, 14157, 14166, 14173, 14195, 14237, 14252, 14283,
   14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459,
-  14505, 14519
+  14476, 14505, 14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545,
+  14562, 14576, 14579, 14583, 14587.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
@@ -39,6 +41,10 @@
   never attempts to contact the Name Service Caching Daemon (nscd).
   New configure option --disable-build-nscd avoids building nscd itself;
   this is the default if --disable-nscd is used.
+
+* The ttyname and ttyname_r functions on Linux now fall back to searching for
+  the tty file descriptor in /dev/pts or /dev if /proc is not available.  This
+  allows creation of chroots without the procfs mounted on /proc.
 
 
 Version 2.16
@@ -67,7 +73,7 @@
   14043, 14044, 14048, 14049, 14050, 14053, 14055, 14059, 14064, 14075,
   14080, 14083, 14103, 14104, 14109, 14112, 14117, 14122, 14123, 14134,
   14153, 14183, 14188, 14199, 14210, 14218, 14229, 14241, 14273, 14277,
-  14278
+  14278,
 
 * Support for the x32 ABI on x86-64 added.  The x32 target is selected by
   configuring glibc with:

Modified: trunk/libc/bits/libc-lock.h
==============================================================================
--- trunk/libc/bits/libc-lock.h (original)
+++ trunk/libc/bits/libc-lock.h Tue Sep 25 14:42:18 2012
@@ -49,7 +49,6 @@
 
 /* Same as last but this time we initialize a recursive mutex.  */
 #define __libc_lock_init_recursive(NAME)
-#define __rtld_lock_init_recursive(NAME)
 
 /* Finalize the named lock variable, which must be locked.  It cannot be
    used again until __libc_lock_init is called again on it.  This must be

Modified: trunk/libc/catgets/Makefile
==============================================================================
--- trunk/libc/catgets/Makefile (original)
+++ trunk/libc/catgets/Makefile Tue Sep 25 14:42:18 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2000, 2002-2004, 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
@@ -79,7 +79,7 @@
 
 $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
 			  $(objpfx)sample.SJIS.cat
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
 
 $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
 	GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \

Modified: trunk/libc/catgets/test-gencat.sh
==============================================================================
--- trunk/libc/catgets/test-gencat.sh (original)
+++ trunk/libc/catgets/test-gencat.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test escape character handling in gencat.
-# Copyright (C) 2000, 2001, 2002 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2

Modified: trunk/libc/config.make.in
==============================================================================
--- trunk/libc/config.make.in (original)
+++ trunk/libc/config.make.in Tue Sep 25 14:42:18 2012
@@ -55,7 +55,6 @@
 with-fp = @with_fp@
 old-glibc-headers = @old_glibc_headers@
 unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
-have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@
 have-forced-unwind = @libc_cv_forced_unwind@
 have-fpie = @libc_cv_fpie@
 have-mfma4 = @libc_cv_cc_fma4@

Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Tue Sep 25 14:42:18 2012
@@ -589,7 +589,6 @@
 libc_cv_cc_sse2avx
 libc_cv_cc_avx
 libc_cv_cc_sse4
-libc_cv_cpp_asm_debuginfo
 libc_cv_forced_unwind
 libc_cv_rootsbindir
 libc_cv_localstatedir
@@ -623,7 +622,6 @@
 BISON
 INSTALL_INFO
 PERL
-AWK
 libc_cv_have_ksh
 KSH
 libc_cv_have_bash2
@@ -633,6 +631,7 @@
 SYSINCLUDES
 AUTOCONF
 READELF
+AWK
 SED
 MAKEINFO
 MSGFMT
@@ -5093,6 +5092,69 @@
   SED=: aux_missing="$aux_missing sed"
 fi
 
+for ac_prog in gawk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+if test -z "$AWK"; then
+  ac_verc_fail=yes
+else
+  # Found it, now check the version.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $AWK" >&5
+$as_echo_n "checking version of $AWK... " >&6; }
+  ac_prog_version=`$AWK --version 2>&1 | sed -n 's/^.*GNU Awk[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+  case $ac_prog_version in
+    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+    [3-9].*)
+       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+$as_echo "$ac_prog_version" >&6; }
+fi
+if test $ac_verc_fail = yes; then
+  critic_missing="$critic_missing gawk"
+fi
+
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args.
@@ -5373,13 +5435,11 @@
     CXX_SYSINCLUDES=
     cxxversion=`$CXX -dumpversion 2>&5` &&
     cxxmachine=`$CXX -dumpmachine 2>&5` &&
-    for d in include "$cxxmachine/include"; do
-      i=../../../../$d/c++/$cxxversion
-      cxxheaders=`$CXX -print-file-name="$i"` &&
-      test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
-      CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+    cxxplus=`$CXX -print-prog-name=cc1plus`
+    cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'`
+    test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+    CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
 -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
-    done
   fi
 fi
 
@@ -5529,48 +5589,6 @@
   libc_cv_have_ksh=yes
 fi
 
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
 
 if test "x$AWK" != "xgawk"; then
   as_fn_error $? "GLIBC requires GNU awk." "$LINENO" 5
@@ -7576,7 +7594,6 @@
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is default" >&5
 $as_echo_n "checking whether -fPIC is default... " >&6; }
 if ${libc_cv_pic_default+:} false; then :
@@ -8216,7 +8233,6 @@
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
-AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 

Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Tue Sep 25 14:42:18 2012
@@ -954,6 +954,9 @@
   [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
   [3.0[2-9]*|3.[1-9]*|[4-9]*],
   SED=: aux_missing="$aux_missing sed")
+AC_CHECK_PROG_VER(AWK, gawk, --version,
+  [GNU Awk[^0-9]*\([0-9][0-9.]*\)],
+  [[3-9].*], critic_missing="$critic_missing gawk")
 
 AC_CHECK_TOOL(READELF, readelf, false)
 AC_CHECK_TOOL(NM, nm, false)
@@ -1000,13 +1003,11 @@
     CXX_SYSINCLUDES=
     cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
     cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
-    for d in include "$cxxmachine/include"; do
-      i=../../../../$d/c++/$cxxversion
-      cxxheaders=`$CXX -print-file-name="$i"` &&
-      test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
-      CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
+    cxxplus=`$CXX -print-prog-name=cc1plus`
+    cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'`
+    test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
+    CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
 -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
-    done
   fi
 fi
 AC_SUBST(SYSINCLUDES)
@@ -1071,7 +1072,6 @@
 fi
 AC_SUBST(libc_cv_have_ksh)
 
-AC_PROG_AWK
 dnl We need gawk for at least gen-sorted.awk and option-groups.awk.
 if test "x$AWK" != "xgawk"; then
   AC_MSG_ERROR([GLIBC requires GNU awk.])
@@ -2180,7 +2180,6 @@
 AC_SUBST(libc_cv_forced_unwind)
 
 dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests
-AC_SUBST(libc_cv_cpp_asm_debuginfo)
 AC_SUBST(libc_cv_cc_sse4)
 AC_SUBST(libc_cv_cc_avx)
 AC_SUBST(libc_cv_cc_sse2avx)

Modified: trunk/libc/crypt/md5test-giant.c
==============================================================================
--- trunk/libc/crypt/md5test-giant.c (original)
+++ trunk/libc/crypt/md5test-giant.c Tue Sep 25 14:42:18 2012
@@ -132,6 +132,6 @@
 #endif
 
 /* This needs on a fast machine 90s.  */
-#define TIMEOUT 180
+#define TIMEOUT 480
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

Modified: trunk/libc/csu/libc-tls.c
==============================================================================
--- trunk/libc/csu/libc-tls.c (original)
+++ trunk/libc/csu/libc-tls.c Tue Sep 25 14:42:18 2012
@@ -1,5 +1,5 @@
 /* Initialization code for TLS in statically linked application.
-   Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@
 extern size_t _dl_phnum;
 
 
-static dtv_t static_dtv[2 + TLS_SLOTINFO_SURPLUS];
+dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
 
 
 static struct
@@ -163,33 +163,33 @@
 		       & ~(max_align - 1));
 
   /* Initialize the dtv.  [0] is the length, [1] the generation counter.  */
-  static_dtv[0].counter = (sizeof (static_dtv) / sizeof (static_dtv[0])) - 2;
-  // static_dtv[1].counter = 0;		would be needed if not already done
+  _dl_static_dtv[0].counter = (sizeof (_dl_static_dtv) / sizeof (_dl_static_dtv[0])) - 2;
+  // _dl_static_dtv[1].counter = 0;		would be needed if not already done
 
   /* Initialize the TLS block.  */
 #if TLS_TCB_AT_TP
-  static_dtv[2].pointer.val = ((char *) tlsblock + tcb_offset
+  _dl_static_dtv[2].pointer.val = ((char *) tlsblock + tcb_offset
 			       - roundup (memsz, align ?: 1));
   static_map.l_tls_offset = roundup (memsz, align ?: 1);
 #elif TLS_DTV_AT_TP
-  static_dtv[2].pointer.val = (char *) tlsblock + tcb_offset;
+  _dl_static_dtv[2].pointer.val = (char *) tlsblock + tcb_offset;
   static_map.l_tls_offset = tcb_offset;
 #else
 # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
 #endif
-  static_dtv[2].pointer.is_static = true;
+  _dl_static_dtv[2].pointer.is_static = true;
   /* sbrk gives us zero'd memory, so we don't need to clear the remainder.  */
-  memcpy (static_dtv[2].pointer.val, initimage, filesz);
+  memcpy (_dl_static_dtv[2].pointer.val, initimage, filesz);
 
   /* Install the pointer to the dtv.  */
 
   /* Initialize the thread pointer.  */
 #if TLS_TCB_AT_TP
-  INSTALL_DTV ((char *) tlsblock + tcb_offset, static_dtv);
+  INSTALL_DTV ((char *) tlsblock + tcb_offset, _dl_static_dtv);
 
   const char *lossage = TLS_INIT_TP ((char *) tlsblock + tcb_offset, 0);
 #elif TLS_DTV_AT_TP
-  INSTALL_DTV (tlsblock, static_dtv);
+  INSTALL_DTV (tlsblock, _dl_static_dtv);
   const char *lossage = TLS_INIT_TP (tlsblock, 0);
 #else
 # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"

Modified: trunk/libc/debug/Makefile
==============================================================================
--- trunk/libc/debug/Makefile (original)
+++ trunk/libc/debug/Makefile Tue Sep 25 14:42:18 2012
@@ -124,12 +124,12 @@
 tst-lfschk4-ENV = LOCPATH=$(common-objpfx)localedata
 tst-lfschk5-ENV = LOCPATH=$(common-objpfx)localedata
 tst-lfschk6-ENV = LOCPATH=$(common-objpfx)localedata
-LDFLAGS-tst-chk4 = -lstdc++
-LDFLAGS-tst-chk5 = -lstdc++
-LDFLAGS-tst-chk6 = -lstdc++
-LDFLAGS-tst-lfschk4 = -lstdc++
-LDFLAGS-tst-lfschk5 = -lstdc++
-LDFLAGS-tst-lfschk6 = -lstdc++
+LDLIBS-tst-chk4 = -lstdc++
+LDLIBS-tst-chk5 = -lstdc++
+LDLIBS-tst-chk6 = -lstdc++
+LDLIBS-tst-lfschk4 = -lstdc++
+LDLIBS-tst-lfschk5 = -lstdc++
+LDLIBS-tst-lfschk6 = -lstdc++
 
 # backtrace_symbols only works if we link with -rdynamic.
 LDFLAGS-tst-backtrace2 = -rdynamic

Modified: trunk/libc/elf/Makefile
==============================================================================
--- trunk/libc/elf/Makefile (original)
+++ trunk/libc/elf/Makefile Tue Sep 25 14:42:18 2012
@@ -440,7 +440,7 @@
 
 ifeq (yes,$(build-shared))
 # eglibc: ifeq ($(cross-compiling),no)
-tests: $(objpfx)tst-pathopt.out
+tests: $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out
 # eglibc: endif
 endif
 
@@ -714,8 +714,11 @@
 $(objpfx)tst-pathopt: $(libdl)
 $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \
 			  $(objpfx)pathoptobj.so
-	$(SHELL) -e $< $(common-objpfx) "$(cross-test-wrapper)" \
+	$(SHELL) $< $(common-objpfx) "$(cross-test-wrapper)" \
 		$(..)scripts/run-with-env.sh
+
+$(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so
+	$(SHELL) $^ > $@
 
 $(objpfx)initfirst: $(libdl)
 $(objpfx)initfirst.out: $(objpfx)firstobj.so

Modified: trunk/libc/elf/dl-tls.c
==============================================================================
--- trunk/libc/elf/dl-tls.c (original)
+++ trunk/libc/elf/dl-tls.c Tue Sep 25 14:42:18 2012
@@ -464,6 +464,11 @@
 rtld_hidden_def (_dl_allocate_tls)
 
 
+#ifndef SHARED
+extern dtv_t _dl_static_dtv[];
+# define _dl_initial_dtv (&_dl_static_dtv[1])
+#endif
+
 void
 internal_function
 _dl_deallocate_tls (void *tcb, bool dealloc_tcb)
@@ -477,9 +482,7 @@
       free (dtv[1 + cnt].pointer.val);
 
   /* The array starts with dtv[-1].  */
-#ifdef SHARED
   if (dtv != GL(dl_initial_dtv))
-#endif
     free (dtv - 1);
 
   if (dealloc_tcb)

Modified: trunk/libc/elf/elf.h
==============================================================================
--- trunk/libc/elf/elf.h (original)
+++ trunk/libc/elf/elf.h Tue Sep 25 14:42:18 2012
@@ -622,6 +622,15 @@
 #define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
 #define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
 #define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
+#define NT_S390_HIGH_GPRS	0x300	/* s390 upper register halves */
+#define NT_S390_TIMER	0x301		/* s390 timer register */
+#define NT_S390_TODCMP	0x302		/* s390 TOD clock comparator register */
+#define NT_S390_TODPREG	0x303		/* s390 TOD programmable register */
+#define NT_S390_CTRS	0x304		/* s390 control registers */
+#define NT_S390_PREFIX	0x305		/* s390 prefix register */
+#define NT_S390_LAST_BREAK	0x306	/* s390 breaking event address */
+#define NT_S390_SYSTEM_CALL	0x307	/* s390 system call restart data */
+#define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
 
 /* Legal values for the note segment descriptor types for object files.  */
 

Modified: trunk/libc/elf/rtld.c
==============================================================================
--- trunk/libc/elf/rtld.c (original)
+++ trunk/libc/elf/rtld.c Tue Sep 25 14:42:18 2012
@@ -1094,7 +1094,8 @@
       /* Now the map for the main executable is available.  */
       main_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
 
-      if (GL(dl_rtld_map).l_info[DT_SONAME] != NULL
+      if (__builtin_expect (mode, normal) == normal
+	  && GL(dl_rtld_map).l_info[DT_SONAME] != NULL
 	  && main_map->l_info[DT_SONAME] != NULL
 	  && strcmp ((const char *) D_PTR (&GL(dl_rtld_map), l_info[DT_STRTAB])
 		     + GL(dl_rtld_map).l_info[DT_SONAME]->d_un.d_val,

Modified: trunk/libc/elf/tst-pathopt.sh
==============================================================================
--- trunk/libc/elf/tst-pathopt.sh (original)
+++ trunk/libc/elf/tst-pathopt.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test lookup path optimization.
-# Copyright (C) 2000 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 cross_test_wrapper="$2"

Modified: trunk/libc/grp/Makefile
==============================================================================
--- trunk/libc/grp/Makefile (original)
+++ trunk/libc/grp/Makefile Tue Sep 25 14:42:18 2012
@@ -60,7 +60,7 @@
 ifeq (yes,$(build-shared))
 tests: $(objpfx)tst_fgetgrent.out
 $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent
-	$(SHELL) -e tst_fgetgrent.sh $(common-objpfx) $(elf-objpfx) \
+	$(SHELL) $< $(common-objpfx) $(elf-objpfx) \
 		 $(rtld-installed-name) "$(cross-test-wrapper)"
 
 endif

Modified: trunk/libc/grp/tst_fgetgrent.sh
==============================================================================
--- trunk/libc/grp/tst_fgetgrent.sh (original)
+++ trunk/libc/grp/tst_fgetgrent.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger <aj@xxxxxxxxxxxxxxxxxxxxxx>, 1999.
-#
 
 # The GNU C Library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1; shift
 elf_objpfx=$1; shift

Modified: trunk/libc/iconv/gconv_db.c
==============================================================================
--- trunk/libc/iconv/gconv_db.c (original)
+++ trunk/libc/iconv/gconv_db.c Tue Sep 25 14:42:18 2012
@@ -1,6 +1,5 @@
 /* Provide access to the collection of available transformation modules.
-   Copyright (C) 1997-2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -194,10 +193,13 @@
       }
 
   /* Free the name strings.  */
-  free ((char *) deriv->steps[0].__from_name);
-  free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
-
-  free ((struct __gconv_step *) deriv->steps);
+  if (deriv->steps != NULL)
+    {
+      free ((char *) deriv->steps[0].__from_name);
+      free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+      free ((struct __gconv_step *) deriv->steps);
+    }
+
   free (deriv);
 }
 

Modified: trunk/libc/iconvdata/Makefile
==============================================================================
--- trunk/libc/iconvdata/Makefile (original)
+++ trunk/libc/iconvdata/Makefile Tue Sep 25 14:42:18 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2008, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-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
@@ -303,7 +303,7 @@
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so)) \
 			 $(common-objdir)/iconv/iconv_prog TESTS
-	$(SHELL) -e $< $(common-objdir) '$(cross-test-wrapper)' > $@
+	$(SHELL) $< $(common-objdir) '$(cross-test-wrapper)' > $@
 
 $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so)) \

Modified: trunk/libc/iconvdata/run-iconv-test.sh
==============================================================================
--- trunk/libc/iconvdata/run-iconv-test.sh (original)
+++ trunk/libc/iconvdata/run-iconv-test.sh Tue Sep 25 14:42:18 2012
@@ -1,9 +1,8 @@
 #! /bin/sh -f
 # Run available iconv(1) tests.
-# Copyright (C) 1998-2002, 2005, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
-#
 
 # The GNU C Library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 codir=$1
 cross_test_wrapper="$2"

Modified: trunk/libc/intl/Makefile
==============================================================================
--- trunk/libc/intl/Makefile (original)
+++ trunk/libc/intl/Makefile Tue Sep 25 14:42:18 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2003,2005,2008,2011,2012 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
@@ -75,18 +75,18 @@
 $(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
 $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
+	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \
 	  $(objpfx)tst-gettext.mtrace '$(cross-test-wrapper)'
 $(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
+	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \
 	'$(cross-test-wrapper)'
 $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \
+	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \
 	'$(cross-test-wrapper)'
 $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
 $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
 
 $(objpfx)tst-codeset.out: $(codeset_mo)
 $(objpfx)tst-gettext3.out: $(codeset_mo)

Modified: trunk/libc/intl/tst-gettext.sh
==============================================================================
--- trunk/libc/intl/tst-gettext.sh (original)
+++ trunk/libc/intl/tst-gettext.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test of gettext functions.
-# Copyright (C) 2000, 2002, 2004 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 objpfx=$2

Modified: trunk/libc/intl/tst-gettext2.sh
==============================================================================
--- trunk/libc/intl/tst-gettext2.sh (original)
+++ trunk/libc/intl/tst-gettext2.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test of gettext functions.
-# Copyright (C) 2000, 2003, 2005 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 objpfx=$2

Modified: trunk/libc/intl/tst-gettext4.sh
==============================================================================
--- trunk/libc/intl/tst-gettext4.sh (original)
+++ trunk/libc/intl/tst-gettext4.sh Tue Sep 25 14:42:18 2012
@@ -1,9 +1,8 @@
 #! /bin/sh
 # Test that gettext() in multithreaded applications works correctly if
 # different threads operate in different locales with the same encoding.
-# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-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
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2

Modified: trunk/libc/intl/tst-gettext6.sh
==============================================================================
--- trunk/libc/intl/tst-gettext6.sh (original)
+++ trunk/libc/intl/tst-gettext6.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test that gettext() in multithreaded applications works correctly.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2

Modified: trunk/libc/intl/tst-translit.sh
==============================================================================
--- trunk/libc/intl/tst-translit.sh (original)
+++ trunk/libc/intl/tst-translit.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test of transliteration in gettext functions.
-# Copyright (C) 2000, 2002, 2005 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 objpfx=$2

Modified: trunk/libc/io/Makefile
==============================================================================
--- trunk/libc/io/Makefile (original)
+++ trunk/libc/io/Makefile Tue Sep 25 14:42:18 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1992-2003,2005-2008,2011,2012 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
@@ -118,7 +118,7 @@
 
 $(objpfx)ftwtest.out: $(objpfx)ftwtest
 	$(ftwtest-tmpdir) \
-	$(SHELL) -e ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \
+	$(SHELL) ftwtest-sh $(shell cd $(common-objpfx). && pwd)/ \
 		 '$(cross-test-wrapper)' \
 		 $(shell cd $(..)scripts && pwd)/run-with-env.sh \
 		 $(shell cd $(<D) && pwd)/$(<F) > $@

Modified: trunk/libc/io/ftwtest-sh
==============================================================================
--- trunk/libc/io/ftwtest-sh (original)
+++ trunk/libc/io/ftwtest-sh Tue Sep 25 14:42:18 2012
@@ -1,4 +1,23 @@
 #! /bin/sh
+# Test for nftw(3).
+# Copyright (C) 1997-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
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+set -e
 
 # The common objpfx, used to find libraries and the dynamic loader.
 objpfx=$1

Modified: trunk/libc/libio/Makefile
==============================================================================
--- trunk/libc/libio/Makefile (original)
+++ trunk/libc/libio/Makefile Tue Sep 25 14:42:18 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2004,2006-2009,2011,2012 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
@@ -59,6 +59,8 @@
 	wprintf wscanf fwscanf vwscanf					      \
 	fwide
 
+include ../Makeconfig
+
 tests = test-fmemopen tst-ext tst-ext2				\
 	tst-mmap-setvbuf tst-atime tst-eof			\
 	tst-freopen bug-ungetc bug-fseek			\
@@ -68,7 +70,7 @@
 	tst-memstream1 tst-memstream2				\
 	bug-memstream1 tst-popen1 bug-fclose1
 tests-$(OPTION_EGLIBC_LOCALE_CODE)				\
-     += tst-swscanf tst-fgetws tst-fopenloc tst-setvbuf1	\
+     += tst-swscanf tst-fgetws tst-setvbuf1			\
 	tst-ungetwc1 tst-ungetwc2 bug-ftell bug-ungetwc2	\
 	tst-widetext 
 tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO)		\
@@ -80,11 +82,14 @@
      += tst_swprintf tst_swscanf			\
 	tst-sscanf					\
 	tst-wmemstream1 tst-wmemstream2
+ifeq (yes,$(build-shared))
+# Add test-fopenloc only if shared library is enabled since it depends on
+# shared localedata objects.
+tests-$(OPTION_EGLIBC_LOCALE_CODE) += tst-fopenloc
+endif
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
-
-include ../Makeconfig
 
 ifeq ($(versioning),yes)
 routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \
@@ -194,12 +199,16 @@
 ifeq (y,$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO))
 tests: $(objpfx)test-freopen.out
 $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'	\
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)'	\
 	$(common-objpfx)libio/
 endif
 
 ifeq (y,$(OPTION_EGLIBC_LOCALE_CODE))
+ifeq (yes,$(build-shared))
+# Run tst-fopenloc.check only if shared library is enabled since it
+# depends on tst-fopenloc.out.
 tests: $(objpfx)tst-fopenloc.check
+endif
 $(objpfx)tst-fopenloc.check: $(objpfx)tst-fopenloc.out
 	cmp ../iconvdata/testdata/ISO-8859-1..UTF8 $(objpfx)tst-fopenloc.out \
 	  > $@

Modified: trunk/libc/libio/fileops.c
==============================================================================
--- trunk/libc/libio/fileops.c (original)
+++ trunk/libc/libio/fileops.c Tue Sep 25 14:42:18 2012
@@ -102,7 +102,7 @@
    to _IO_buf_base, though not necessarily if we have switched from
    get mode to put mode.  (The reason is to maintain the invariant
    that _IO_read_end corresponds to the external file position.)
-   _IO_write_base is non-NULL and usually equal to _IO_base_base.
+   _IO_write_base is non-NULL and usually equal to _IO_buf_base.
    We also have _IO_write_end == _IO_buf_end, but only in fully buffered mode.
    The un-flushed character are those between _IO_write_base and _IO_write_ptr.
 
@@ -992,10 +992,10 @@
   /* Flush unwritten characters.
      (This may do an unneeded write if we seek within the buffer.
      But to be able to switch to reading, we would need to set
-     egptr to ptr.  That can't be done in the current design,
+     egptr to pptr.  That can't be done in the current design,
      which assumes file_ptr() is eGptr.  Anyway, since we probably
      end up flushing when we close(), it doesn't make much difference.)
-     FIXME: simulate mem-papped files. */
+     FIXME: simulate mem-mapped files. */
 
   if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
     if (_IO_switch_to_get_mode (fp))

Modified: trunk/libc/libio/iogetdelim.c
==============================================================================
--- trunk/libc/libio/iogetdelim.c (original)
+++ trunk/libc/libio/iogetdelim.c Tue Sep 25 14:42:18 2012
@@ -29,6 +29,7 @@
 #include "libioP.h"
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 
 /* Read up to (and including) a TERMINATOR from FP into *LINEPTR
    (and null-terminate it).  *LINEPTR is a pointer returned from malloc (or
@@ -89,7 +90,7 @@
       t = (char *) memchr ((void *) fp->_IO_read_ptr, delimiter, len);
       if (t != NULL)
 	len = (t - fp->_IO_read_ptr) + 1;
-      if (__builtin_expect (cur_len + len + 1 < 0, 0))
+      if (__builtin_expect (len >= SSIZE_MAX - cur_len, 0))
 	{
 	  __set_errno (EOVERFLOW);
 	  result = -1;

Modified: trunk/libc/libio/iogetline.c
==============================================================================
--- trunk/libc/libio/iogetline.c (original)
+++ trunk/libc/libio/iogetline.c Tue Sep 25 14:42:18 2012
@@ -26,8 +26,6 @@
 
 #include "libioP.h"
 #include <string.h>
-
-#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
 
 _IO_size_t
 _IO_getline (fp, buf, n, delim, extract_delim)
@@ -117,5 +115,3 @@
   return ptr - buf;
 }
 libc_hidden_def (_IO_getline_info)
-
-#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */

Modified: trunk/libc/libio/iogetwline.c
==============================================================================
--- trunk/libc/libio/iogetwline.c (original)
+++ trunk/libc/libio/iogetwline.c Tue Sep 25 14:42:18 2012
@@ -31,8 +31,6 @@
 #ifdef _LIBC
 # define wmemcpy __wmemcpy
 #endif
-
-#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
 
 _IO_size_t
 _IO_getwline (fp, buf, n, delim, extract_delim)
@@ -122,5 +120,3 @@
     }
   return ptr - buf;
 }
-
-#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */

Modified: trunk/libc/libio/iopopen.c
==============================================================================
--- trunk/libc/libio/iopopen.c (original)
+++ trunk/libc/libio/iopopen.c Tue Sep 25 14:42:18 2012
@@ -29,7 +29,6 @@
 # define _POSIX_SOURCE
 #endif
 #include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -50,8 +49,6 @@
 #endif
 extern _IO_pid_t _IO_fork (void) __THROW;
 #endif
-
-#endif /* _IO_HAVE_SYS_WAIT */
 
 #ifndef _IO_dup2
 #ifdef _LIBC
@@ -114,7 +111,6 @@
      const char *command;
      const char *mode;
 {
-#if _IO_HAVE_SYS_WAIT
   int read_or_write;
   int parent_end, child_end;
   int pipe_fds[2];
@@ -273,9 +269,6 @@
 
   _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
   return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return NULL;
-#endif
 }
 
 _IO_FILE *
@@ -317,7 +310,6 @@
      _IO_FILE *fp;
 {
   /* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
   int wstatus;
   _IO_proc_file **ptr = &proc_file_chain;
   _IO_pid_t wait_pid;
@@ -356,9 +348,6 @@
   if (wait_pid == -1)
     return -1;
   return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return -1;
-#endif
 }
 
 static const struct _IO_jump_t _IO_proc_jumps = {

Modified: trunk/libc/libio/libio.h
==============================================================================
--- trunk/libc/libio/libio.h (original)
+++ trunk/libc/libio/libio.h Tue Sep 25 14:42:18 2012
@@ -34,37 +34,31 @@
 #define _IO_pos_t _G_fpos_t /* obsolete */
 #define _IO_fpos_t _G_fpos_t
 #define _IO_fpos64_t _G_fpos64_t
-#define _IO_size_t _G_size_t
-#define _IO_ssize_t _G_ssize_t
-#define _IO_off_t _G_off_t
+#define _IO_size_t size_t
+#define _IO_ssize_t __ssize_t
+#define _IO_off_t __off_t
 #define _IO_off64_t _G_off64_t
-#define _IO_pid_t _G_pid_t
-#define _IO_uid_t _G_uid_t
+#define _IO_pid_t __pid_t
+#define _IO_uid_t __uid_t
 #define _IO_iconv_t _G_iconv_t
-#define _IO_HAVE_SYS_WAIT _G_HAVE_SYS_WAIT
 #define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
 #define _IO_BUFSIZ _G_BUFSIZ
 #define _IO_va_list _G_va_list
-#define _IO_wint_t _G_wint_t
-
-#ifdef _G_NEED_STDARG_H
+#define _IO_wint_t wint_t
+
 /* This define avoids name pollution if we're using GNU stdarg.h */
-# define __need___va_list
-# include <stdarg.h>
-# ifdef __GNUC_VA_LIST
-#  undef _IO_va_list
-#  define _IO_va_list __gnuc_va_list
-# endif /* __GNUC_VA_LIST */
-#endif
+#define __need___va_list
+#include <stdarg.h>
+#ifdef __GNUC_VA_LIST
+# undef _IO_va_list
+# define _IO_va_list __gnuc_va_list
+#endif /* __GNUC_VA_LIST */
 
 #ifndef __P
 # include <sys/cdefs.h>
 #endif /*!__P*/
 
 #define _IO_UNIFIED_JUMPTABLES 1
-#ifndef _G_HAVE_PRINTF_FP
-# define _IO_USE_DTOA 1
-#endif
 
 #ifndef EOF
 # define EOF (-1)

Modified: trunk/libc/libio/libioP.h
==============================================================================
--- trunk/libc/libio/libioP.h (original)
+++ trunk/libc/libio/libioP.h Tue Sep 25 14:42:18 2012
@@ -113,34 +113,18 @@
 # define _IO_vtable_offset(THIS) 0
 #endif
 #define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS)
-#ifdef _G_USING_THUNKS
-# define JUMP_FIELD(TYPE, NAME) TYPE NAME
-# define JUMP0(FUNC, THIS) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS)
-# define JUMP1(FUNC, THIS, X1) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1)
-# define JUMP2(FUNC, THIS, X1, X2) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1, X2)
-# define JUMP3(FUNC, THIS, X1,X2,X3) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1,X2, X3)
-# define JUMP_INIT(NAME, VALUE) VALUE
-# define JUMP_INIT_DUMMY JUMP_INIT(dummy, 0), JUMP_INIT (dummy2, 0)
-
-# define WJUMP0(FUNC, THIS) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS)
-# define WJUMP1(FUNC, THIS, X1) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1)
-# define WJUMP2(FUNC, THIS, X1, X2) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1, X2)
-# define WJUMP3(FUNC, THIS, X1,X2,X3) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1,X2, X3)
-#else
-/* These macros will change when we re-implement vtables to use "thunks"! */
-# define JUMP_FIELD(TYPE, NAME) struct { short delta1, delta2; TYPE pfn; } NAME
-# define JUMP0(FUNC, THIS) _IO_JUMPS_FUNC(THIS)->FUNC.pfn (THIS)
-# define JUMP1(FUNC, THIS, X1) _IO_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1)
-# define JUMP2(FUNC, THIS, X1, X2) _IO_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1, X2)
-# define JUMP3(FUNC, THIS, X1,X2,X3) _IO_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1,X2,X3)
-# define JUMP_INIT(NAME, VALUE) {0, 0, VALUE}
-# define JUMP_INIT_DUMMY JUMP_INIT(dummy, 0)
-
-# define WJUMP0(FUNC, THIS) _IO_WIDE_JUMPS_FUNC(THIS)->FUNC.pfn (THIS)
-# define WJUMP1(FUNC, THIS, X1) _IO_WIDE_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1)
-# define WJUMP2(FUNC, THIS, X1, X2) _IO_WIDE_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1, X2)
-# define WJUMP3(FUNC, THIS, X1,X2,X3) _IO_WIDE_JUMPS_FUNC(THIS)->FUNC.pfn (THIS, X1,X2,X3)
-#endif
+#define JUMP_FIELD(TYPE, NAME) TYPE NAME
+#define JUMP0(FUNC, THIS) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS)
+#define JUMP1(FUNC, THIS, X1) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1)
+#define JUMP2(FUNC, THIS, X1, X2) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1, X2)
+#define JUMP3(FUNC, THIS, X1,X2,X3) (_IO_JUMPS_FUNC(THIS)->FUNC) (THIS, X1,X2, X3)
+#define JUMP_INIT(NAME, VALUE) VALUE
+#define JUMP_INIT_DUMMY JUMP_INIT(dummy, 0), JUMP_INIT (dummy2, 0)
+
+#define WJUMP0(FUNC, THIS) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS)
+#define WJUMP1(FUNC, THIS, X1) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1)
+#define WJUMP2(FUNC, THIS, X1, X2) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1, X2)
+#define WJUMP3(FUNC, THIS, X1,X2,X3) (_IO_WIDE_JUMPS_FUNC(THIS)->FUNC) (THIS, X1,X2, X3)
 
 /* The 'finish' function does any final cleaning up of an _IO_FILE object.
    It does not delete (free) it, but does everything else to finalize it.
@@ -302,10 +286,8 @@
 
 struct _IO_jump_t
 {
-    JUMP_FIELD(_G_size_t, __dummy);
-#ifdef _G_USING_THUNKS
-    JUMP_FIELD(_G_size_t, __dummy2);
-#endif
+    JUMP_FIELD(size_t, __dummy);
+    JUMP_FIELD(size_t, __dummy2);
     JUMP_FIELD(_IO_finish_t, __finish);
     JUMP_FIELD(_IO_overflow_t, __overflow);
     JUMP_FIELD(_IO_underflow_t, __underflow);
@@ -878,30 +860,6 @@
 # endif
 #endif
 
-/* VTABLE_LABEL defines NAME as of the CLASS class.
-   CNLENGTH is strlen(#CLASS).  */
-#ifdef __GNUC__
-# if _G_VTABLE_LABEL_HAS_LENGTH
-#  define VTABLE_LABEL(NAME, CLASS, CNLENGTH) \
-  extern char NAME[] asm (_G_VTABLE_LABEL_PREFIX #CNLENGTH #CLASS);
-# else
-#  define VTABLE_LABEL(NAME, CLASS, CNLENGTH) \
-  extern char NAME[] asm (_G_VTABLE_LABEL_PREFIX #CLASS);
-# endif
-#endif /* __GNUC__ */
-
-#if !defined(builtinbuf_vtable) && defined(__cplusplus)
-# ifdef __GNUC__
-VTABLE_LABEL(builtinbuf_vtable, builtinbuf, 10)
-# else
-#  if _G_VTABLE_LABEL_HAS_LENGTH
-#   define builtinbuf_vtable _G_VTABLE_LABEL_PREFIX_ID##10builtinbuf
-#  else
-#   define builtinbuf_vtable _G_VTABLE_LABEL_PREFIX_ID##builtinbuf
-#  endif
-# endif
-#endif /* !defined(builtinbuf_vtable) && defined(__cplusplus) */
-
 #define _IO_va_start(args, last) va_start(args, last)
 
 extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;

Modified: trunk/libc/libio/oldfileops.c
==============================================================================
--- trunk/libc/libio/oldfileops.c (original)
+++ trunk/libc/libio/oldfileops.c Tue Sep 25 14:42:18 2012
@@ -76,7 +76,7 @@
    to _IO_buf_base, though not necessarily if we have switched from
    get mode to put mode.  (The reason is to maintain the invariant
    that _IO_read_end corresponds to the external file position.)
-   _IO_write_base is non-NULL and usually equal to _IO_base_base.
+   _IO_write_base is non-NULL and usually equal to _IO_buf_base.
    We also have _IO_write_end == _IO_buf_end, but only in fully buffered mode.
    The un-flushed character are those between _IO_write_base and _IO_write_ptr.
 
@@ -492,10 +492,10 @@
   /* Flush unwritten characters.
      (This may do an unneeded write if we seek within the buffer.
      But to be able to switch to reading, we would need to set
-     egptr to ptr.  That can't be done in the current design,
+     egptr to pptr.  That can't be done in the current design,
      which assumes file_ptr() is eGptr.  Anyway, since we probably
      end up flushing when we close(), it doesn't make much difference.)
-     FIXME: simulate mem-papped files. */
+     FIXME: simulate mem-mapped files. */
 
   if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
     if (_IO_switch_to_get_mode (fp))

Modified: trunk/libc/libio/oldiopopen.c
==============================================================================
--- trunk/libc/libio/oldiopopen.c (original)
+++ trunk/libc/libio/oldiopopen.c Tue Sep 25 14:42:18 2012
@@ -30,7 +30,6 @@
 # define _POSIX_SOURCE
 #endif
 #include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -48,8 +47,6 @@
 #endif
 extern _IO_pid_t _IO_fork (void) __THROW;
 #endif
-
-#endif /* _IO_HAVE_SYS_WAIT */
 
 #include <shlib-compat.h>
 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
@@ -123,7 +120,6 @@
      const char *command;
      const char *mode;
 {
-#if _IO_HAVE_SYS_WAIT
   volatile int read_or_write;
   volatile int parent_end, child_end;
   int pipe_fds[2];
@@ -194,9 +190,6 @@
 
   _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
   return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return NULL;
-#endif
 }
 
 _IO_FILE *
@@ -240,7 +233,6 @@
      _IO_FILE *fp;
 {
   /* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
   int wstatus;
   _IO_proc_file **ptr = &old_proc_file_chain;
   _IO_pid_t wait_pid;
@@ -279,9 +271,6 @@
   if (wait_pid == -1)
     return -1;
   return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return -1;
-#endif
 }
 
 const struct _IO_jump_t _IO_old_proc_jumps = {

Modified: trunk/libc/libio/test-freopen.sh
==============================================================================
--- trunk/libc/libio/test-freopen.sh (original)
+++ trunk/libc/libio/test-freopen.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test of freopen.
-# Copyright (C) 2000, 2001 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
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
+set -e
+
 common_objpfx=$1
 run_program_prefix=$2
 objpfx=$3

Modified: trunk/libc/libio/wfileops.c
==============================================================================
--- trunk/libc/libio/wfileops.c (original)
+++ trunk/libc/libio/wfileops.c Tue Sep 25 14:42:18 2012
@@ -589,7 +589,7 @@
   /* Flush unwritten characters.
      (This may do an unneeded write if we seek within the buffer.
      But to be able to switch to reading, we would need to set
-     egptr to ptr.  That can't be done in the current design,
+     egptr to pptr.  That can't be done in the current design,
      which assumes file_ptr() is eGptr.  Anyway, since we probably
      end up flushing when we close(), it doesn't make much difference.)
      FIXME: simulate mem-mapped files. */

Modified: trunk/libc/localedata/ChangeLog
==============================================================================
--- trunk/libc/localedata/ChangeLog (original)
+++ trunk/libc/localedata/ChangeLog Tue Sep 25 14:42:18 2012
@@ -1,3 +1,33 @@
+2012-09-24  Dmitry V. Levin  <ldv@xxxxxxxxxxxx>
+
+	* gen-locale.sh: Add "set -e".
+	* sort-test.sh: Likewise.
+	* tst-ctype.sh: Likewise.
+	* tst-fmon.sh: Likewise.
+	* tst-langinfo.sh: Likewise.
+	* tst-locale.sh: Likewise.
+	* tst-mbswcs.sh: Likewise.
+	* tst-numeric.sh: Likewise.
+	* tst-rpmatch.sh: Likewise.
+	* tst-trans.sh: Likewise.
+	* tst-wctype.sh: Likewise.
+	* Makefile: Do not specify -e option when running testsuite
+	shell scripts.
+
+	* sort-test.sh: Add copyright header.
+
+2012-09-05  Jeff Law  <law@xxxxxxxxxx>
+
+	[BZ#14510]
+	* locales/es_DO: Fix LC_NUMERIC decimal_point and thousands_sep.
+	* locales/es_GT: Likewise.
+	* locales/es_HN: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_NI: Likewise.
+	* locales/es_PA: Likewise.
+	* locales/es_PR: Likewise.
+	* locales/es_SV: Likewise.
+
 2012-06-20  Petr Baudis  <pasky@xxxxxx>
 
 	* locales/mag_IN: Fix comment character.

Modified: trunk/libc/localedata/Makefile
==============================================================================
--- trunk/libc/localedata/Makefile (original)
+++ trunk/libc/localedata/Makefile Tue Sep 25 14:42:18 2012
@@ -1,5 +1,4 @@
-# Copyright (C) 1996-2003,2005,2007-2009,2011,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
@@ -148,7 +147,7 @@
 $(addprefix $(objpfx),$(CTYPE_FILES)): %: \
   gen-locale.sh $(common-objpfx)locale/localedef Makefile \
   $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))
-	@$(SHELL) -e gen-locale.sh $(common-objpfx)	\
+	@$(SHELL) gen-locale.sh $(common-objpfx)	\
 		 '$(if $(cross-localedef), 		\
 		       $(cross-localedef),		\
 		       $(built-program-cmd))'		\
@@ -169,45 +168,45 @@
 
 $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
 		       $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
 	  > $@
 $(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
 		       $(objpfx)sort-test.out \
 		       $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
 	  > $@
 $(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
 		       $(objpfx)sort-test.out \
 		       $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
 	  > $@
 $(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
 			 $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
 $(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
 			  $(objpfx)tst-fmon.out \
 			  $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
 $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
 			$(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
 $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
 			 $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
 			 $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
 			 $(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
 $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
 			$(objpfx)sort-test.out \
 			$(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
 $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
 			$(objpfx)sort-test.out tst-wctype.input \
 			$(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
 $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
 			$(objpfx)sort-test.out \
 			$(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+	$(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
 $(objpfx)tst-digits.out: $(objpfx)tst-locale.out
 $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
 # eglibc: endif

Modified: trunk/libc/localedata/gen-locale.sh
==============================================================================
--- trunk/libc/localedata/gen-locale.sh (original)
+++ trunk/libc/localedata/gen-locale.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Generate test locale files.
-# Copyright (C) 2000,01,02 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx="$1"; shift
 localedef="$1"; shift

Modified: trunk/libc/localedata/locales/es_DO
==============================================================================
--- trunk/libc/localedata/locales/es_DO (original)
+++ trunk/libc/localedata/locales/es_DO Tue Sep 25 14:42:18 2012
@@ -78,7 +78,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_GT
==============================================================================
--- trunk/libc/localedata/locales/es_GT (original)
+++ trunk/libc/localedata/locales/es_GT Tue Sep 25 14:42:18 2012
@@ -77,7 +77,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_HN
==============================================================================
--- trunk/libc/localedata/locales/es_HN (original)
+++ trunk/libc/localedata/locales/es_HN Tue Sep 25 14:42:18 2012
@@ -78,7 +78,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_MX
==============================================================================
--- trunk/libc/localedata/locales/es_MX (original)
+++ trunk/libc/localedata/locales/es_MX Tue Sep 25 14:42:18 2012
@@ -78,7 +78,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U2009>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_NI
==============================================================================
--- trunk/libc/localedata/locales/es_NI (original)
+++ trunk/libc/localedata/locales/es_NI Tue Sep 25 14:42:18 2012
@@ -69,7 +69,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_PA
==============================================================================
--- trunk/libc/localedata/locales/es_PA (original)
+++ trunk/libc/localedata/locales/es_PA Tue Sep 25 14:42:18 2012
@@ -78,7 +78,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002c>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_PR
==============================================================================
--- trunk/libc/localedata/locales/es_PR (original)
+++ trunk/libc/localedata/locales/es_PR Tue Sep 25 14:42:18 2012
@@ -69,7 +69,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/locales/es_SV
==============================================================================
--- trunk/libc/localedata/locales/es_SV (original)
+++ trunk/libc/localedata/locales/es_SV Tue Sep 25 14:42:18 2012
@@ -78,7 +78,9 @@
 END LC_MONETARY
 
 LC_NUMERIC
-copy "es_ES"
+decimal_point        "<U002E>"
+thousands_sep        "<U002C>"
+grouping             3;3
 END LC_NUMERIC
 
 LC_TIME

Modified: trunk/libc/localedata/sort-test.sh
==============================================================================
--- trunk/libc/localedata/sort-test.sh (original)
+++ trunk/libc/localedata/sort-test.sh Tue Sep 25 14:42:18 2012
@@ -1,4 +1,23 @@
 #! /bin/sh
+# Test collation using xfrm-test.
+# Copyright (C) 1997-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
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1; shift
 run_program_prefix=$1; shift

Modified: trunk/libc/localedata/tst-ctype.sh
==============================================================================
--- trunk/libc/localedata/tst-ctype.sh (original)
+++ trunk/libc/localedata/tst-ctype.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Testing the implementation of the isxxx() and toxxx() functions.
-# Copyright (C) 2000 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1; shift
 tst_ctype=$1; shift

Modified: trunk/libc/localedata/tst-fmon.sh
==============================================================================
--- trunk/libc/localedata/tst-fmon.sh (original)
+++ trunk/libc/localedata/tst-fmon.sh Tue Sep 25 14:42:18 2012
@@ -1,9 +1,8 @@
 #! /bin/sh
 # Testing the implementation of strfmon(3).
-# Copyright (C) 1996-1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@xxxxxxxxxxxxxxxxx>, 1997.
-#
 
 # The GNU C Library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2

Modified: trunk/libc/localedata/tst-langinfo.sh
==============================================================================
--- trunk/libc/localedata/tst-langinfo.sh (original)
+++ trunk/libc/localedata/tst-langinfo.sh Tue Sep 25 14:42:18 2012
@@ -1,8 +1,7 @@
 #! /bin/sh
 # Test nl_langinfo.
-# Copyright (C) 2000, 2001, 2003, 2007, 2008 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
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
 run_program_prefix=$2

Modified: trunk/libc/localedata/tst-locale.sh
==============================================================================
--- trunk/libc/localedata/tst-locale.sh (original)
+++ trunk/libc/localedata/tst-locale.sh Tue Sep 25 14:42:18 2012
@@ -1,9 +1,8 @@
 #! /bin/sh
 # Testing the implementation of localedata.
-# Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger, <aj@xxxxxxxxxxxxxxxxxxxxxx>, 1998.
-#
 
 # The GNU C Library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1; shift

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