[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r12751 - in /trunk: libc/ libc/bits/ libc/catgets/ libc/csu/ libc/debug/ libc/elf/ libc/iconv/ libc/include/ libc/include/sy...
- To: commits@xxxxxxxxxx
- Subject: [commits] r12751 - in /trunk: libc/ libc/bits/ libc/catgets/ libc/csu/ libc/debug/ libc/elf/ libc/iconv/ libc/include/ libc/include/sy...
- From: joseph@xxxxxxxxxx
- Date: Fri, 04 Feb 2011 22:13:23 -0000
Author: joseph
Date: Fri Feb 4 14:13:20 2011
New Revision: 12751
Log:
Merge changes between r12321 and r12643 from /fsf/trunk.
Added:
trunk/libc/stdio-common/tst-grouping.c
- copied unchanged from r12643, fsf/trunk/libc/stdio-common/tst-grouping.c
trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c
- copied unchanged from r12643, fsf/trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c
trunk/libc/sysdeps/unix/sysv/linux/setgroups.c
- copied unchanged from r12643, fsf/trunk/libc/sysdeps/unix/sysv/linux/setgroups.c
trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c
- copied unchanged from r12643, fsf/trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c
trunk/ports/sysdeps/powerpc/dl-procinfo.c
- copied unchanged from r12643, fsf/trunk/ports/sysdeps/powerpc/dl-procinfo.c
trunk/ports/sysdeps/powerpc/dl-procinfo.h
- copied unchanged from r12643, fsf/trunk/ports/sysdeps/powerpc/dl-procinfo.h
trunk/ports/sysdeps/powerpc/powerpc32/405/
- copied from r12643, fsf/trunk/ports/sysdeps/powerpc/powerpc32/405/
trunk/ports/sysdeps/powerpc/powerpc32/440/
- copied from r12643, fsf/trunk/ports/sysdeps/powerpc/powerpc32/440/
trunk/ports/sysdeps/powerpc/powerpc32/464/
- copied from r12643, fsf/trunk/ports/sysdeps/powerpc/powerpc32/464/
trunk/ports/sysdeps/powerpc/powerpc32/476/
- copied from r12643, fsf/trunk/ports/sysdeps/powerpc/powerpc32/476/
trunk/ports/sysdeps/powerpc/powerpc32/Makefile
- copied unchanged from r12643, fsf/trunk/ports/sysdeps/powerpc/powerpc32/Makefile
trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/
- copied from r12643, fsf/trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/405/
trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/
- copied from r12643, fsf/trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/440/
trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/
- copied from r12643, fsf/trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/464/
trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/
- copied from r12643, fsf/trunk/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/476/
Modified:
trunk/libc/ChangeLog
trunk/libc/NEWS
trunk/libc/bits/select.h
trunk/libc/catgets/gencat.c
trunk/libc/config.h.in
trunk/libc/configure
trunk/libc/configure.in
trunk/libc/csu/version.c
trunk/libc/debug/catchsegv.sh
trunk/libc/debug/xtrace.sh
trunk/libc/elf/Makefile
trunk/libc/elf/check-execstack.c
trunk/libc/elf/dl-dst.h
trunk/libc/elf/dl-load.c
trunk/libc/elf/dl-support.c
trunk/libc/elf/ldconfig.c
trunk/libc/elf/ldd.bash.in
trunk/libc/elf/rtld.c
trunk/libc/elf/sofini.c
trunk/libc/elf/soinit.c
trunk/libc/elf/sprof.c
trunk/libc/iconv/iconv_prog.c
trunk/libc/iconv/iconvconfig.c
trunk/libc/include/alloca.h
trunk/libc/include/features.h
trunk/libc/include/sys/resource.h
trunk/libc/io/fcntl.h
trunk/libc/locale/programs/locale.c
trunk/libc/locale/programs/localedef.c
trunk/libc/malloc/malloc.c
trunk/libc/malloc/memusage.sh
trunk/libc/malloc/mtrace.pl
trunk/libc/nptl/ChangeLog
trunk/libc/nptl/Makefile
trunk/libc/nptl/Versions
trunk/libc/nptl/alloca_cutoff.c
trunk/libc/nptl/pthread_cond_timedwait.c
trunk/libc/nptl/pthread_cond_wait.c
trunk/libc/nptl/pthread_rwlock_rdlock.c
trunk/libc/nptl/pthread_rwlock_timedrdlock.c
trunk/libc/nptl/pthread_rwlock_timedwrlock.c
trunk/libc/nptl/pthread_rwlock_wrlock.c
trunk/libc/nptl/sysdeps/pthread/setxid.h
trunk/libc/nscd/hstcache.c
trunk/libc/nscd/nscd.c
trunk/libc/nss/getent.c
trunk/libc/nss/nss_files/files-hosts.c
trunk/libc/po/ja.po
trunk/libc/posix/fnmatch_loop.c
trunk/libc/posix/getconf.c
trunk/libc/posix/globtest.sh
trunk/libc/posix/regexec.c
trunk/libc/posix/testfnm.c
trunk/libc/posix/tst-fnmatch.input
trunk/libc/posix/tst-fnmatch2.c
trunk/libc/stdio-common/Makefile
trunk/libc/stdio-common/printf_fp.c
trunk/libc/stdio-common/vfprintf.c
trunk/libc/string/xpg-strerror.c
trunk/libc/sysdeps/i386/Makefile
trunk/libc/sysdeps/i386/bits/select.h
trunk/libc/sysdeps/i386/init-first.c
trunk/libc/sysdeps/i386/stackinfo.h
trunk/libc/sysdeps/ia64/stackinfo.h
trunk/libc/sysdeps/mach/hurd/i386/init-first.c
trunk/libc/sysdeps/mach/hurd/powerpc/init-first.c
trunk/libc/sysdeps/mach/xpg-strerror.c
trunk/libc/sysdeps/posix/getaddrinfo.c
trunk/libc/sysdeps/posix/spawni.c
trunk/libc/sysdeps/powerpc/stackinfo.h
trunk/libc/sysdeps/s390/stackinfo.h
trunk/libc/sysdeps/sh/init-first.c
trunk/libc/sysdeps/sh/stackinfo.h
trunk/libc/sysdeps/sparc/stackinfo.h
trunk/libc/sysdeps/unix/readdir_r.c
trunk/libc/sysdeps/unix/sysv/linux/bits/socket.h
trunk/libc/sysdeps/unix/sysv/linux/i386/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit64.c
trunk/libc/sysdeps/unix/sysv/linux/i386/setgroups.c
trunk/libc/sysdeps/unix/sysv/linux/ia64/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/init-first.c
trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
trunk/libc/sysdeps/unix/sysv/linux/mkdirat.c
trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/s390/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/sh/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/mman.h
trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/socket.h
trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
trunk/libc/sysdeps/x86_64/bits/select.h
trunk/libc/sysdeps/x86_64/stackinfo.h
trunk/libc/version.h
trunk/ports/ChangeLog
trunk/ports/ChangeLog.arm
trunk/ports/ChangeLog.m68k
trunk/ports/ChangeLog.mips
trunk/ports/sysdeps/arm/eabi/fclrexcpt.c
trunk/ports/sysdeps/arm/eabi/fraiseexcpt.c
trunk/ports/sysdeps/arm/eabi/fsetexcptflg.c
trunk/ports/sysdeps/arm/stackinfo.h
trunk/ports/sysdeps/m68k/stackinfo.h
trunk/ports/sysdeps/mach/hurd/mips/init-first.c
trunk/ports/sysdeps/mips/init-first.c
trunk/ports/sysdeps/mips/stackinfo.h
trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/mman.h
trunk/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Fri Feb 4 14:13:20 2011
@@ -1,6 +1,228 @@
+2010-10-01 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
+ decoding ACE if AI_CANONIDN.
+
+2011-01-18 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * elf/Makefile: Build IFUNC tests unless multi-arch = no.
+
+2011-01-17 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * version.h (RELEASE): Bump for 2.13 release.
+ * include/features.h: (__GLIBC_MINOR__): Bump to 13.
+
+ * io/fcntl.h: Define AT_NO_AUTOMOUNT.
+
+ * sysdeps/unix/sysv/linux/i386/bits/mman.h: Define MADV_HUGEPAGE and
+ MADV_NOHUGEPAGE.
+ * sysdeps/unix/sysv/linux/ia64/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/sh/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
+
+ * posix/getconf.c: Update copyright year.
+ * catgets/gencat.c: Likewise.
+ * csu/version.c: Likewise.
+ * debug/catchsegv.sh: Likewise.
+ * debug/xtrace.sh: Likewise.
+ * elf/ldconfig.c: Likewise.
+ * elf/ldd.bash.in: Likewise.
+ * elf/sprof.c (print_version): Likewise.
+ * iconv/iconv_prog.c: Likewise.
+ * iconv/iconvconfig.c: Likewise.
+ * locale/programs/locale.c: Likewise.
+ * locale/programs/localedef.c: Likewise.
+ * malloc/memusage.sh: Likewise.
+ * malloc/mtrace.pl: Likewise.
+ * nscd/nscd.c (print_version): Likewise.
+ * nss/getent.c: Likewise.
+
+ * sysdeps/unix/sysv/linux/bits/socket.h: Define AF_CAIF, AF_ALG,
+ PF_CAIF, and PF_ALG.
+ * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
+
+2011-01-16 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * elf/Makefile (tlsmod17a-modules, tlsmod18a-modules): Define.
+ (modules-names): Use them.
+ (ifunc-test-modules, ifunc-pie-tests): Define.
+ (extra-test-objs): Add tlsmod17a-modules, tlsmod18a-modules,
+ tst-pie1, ifunc-test-modules and ifunc-pie-tests objects.
+ (test-extras): Likewise.
+ ($(patsubst %,$(objpfx)%.os,$(tlsmod17a-modules))): Use
+ $(compile-command.c).
+ ($(patsubst %,$(objpfx)%.os,$(tlsmod18a-modules))): Likewise.
+ (all-built-dso): Define.
+ (check-textrel.out, check-execstack.out): Depend on it.
+
+ * configure.in: Don't override --enable-multi-arch.
+
+2011-01-15 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #6812]
+ * nscd/hstcache.c (tryagain): Define.
+ (cache_addhst): Return tryagain not notfound for temporary errors.
+ (addhstbyX): Also set h_errno to TRY_AGAIN when memory allocation
+ failed.
+
+2011-01-14 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #10563]
+ * sysdeps/unix/sysv/linux/i386/setgroups.c: Use INLINE_SETXID_SYSCALL
+ to make the syscall.
+ * sysdeps/unix/sysv/linux/setgroups.c: New file.
+
+ [BZ #12378]
+ * posix/fnmatch_loop.c (FCT): When matching '[' keep track of beginning
+ and fall back to matching as normal character if the string ends before
+ the matching ']' is found. This is what POSIX requires.
+ * posix/testfnm.c: Adjust test result.
+ * posix/globtest.sh: Adjust test result. Add new test.
+ * posix/tst-fnmatch.input: Likewise.
+ * posix/tst-fnmatch2.c: Add new test.
+
+2010-12-28 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * elf/Makefile (check-execstack): Revert last change. Depend on
+ check-execstack.h.
+ (check-execstack.h): New target.
+ (generated): Add check-execstack.h.
+ * elf/check-execstack.c: Include "check-execstack.h".
+ (main): Revert last change.
+ (handle_file): Return zero if GNU_STACK is absent and
+ DEFAULT_STACK_PERMS doesn't include PF_X.
+
+2011-01-13 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/posix/spawni.c (__spawni): Don't fail if close file action
+ in child fails because the descriptor is already closed.
+ * include/sys/resource.h: Add libc_hidden_proto for getrlimit64.
+ * sysdeps/unix/sysv/linux/getrlimit64.c: Add libc_hidden_def.
+ * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Likewise.
+
+ [BZ #12397]
+ * sysdeps/unix/sysv/linux/mkdirat.c (mkdirat): Fix handling of missing
+ syscall.
+
+ [BZ #10484]
+ * nss/nss_files/files-hosts.c (HOST_DB_LOOKUP): Handle overflows of
+ temporary buffer used to handle multi lookups locally.
+ * include/alloca.h: Add libc_hidden_proto for __libc_alloca_cutoff.
+
+2011-01-12 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * elf/dl-dst.h (DL_DST_REQUIRED): Allow l_origin to be NULL when
+ loader is ld.so.
+
+2011-01-10 Paul Pluzhnikov <ppluzhnikov@xxxxxxxxxx>
+
+ * sysdeps/i386/Makefile: stdlib/cxa_finalize.c needs 16-byte stack
+ alignment for SSE2.
+
+2011-01-12 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #12394]
+ * stdio-common/printf_fp.c (__printf_fp): Add more room for grouping
+ characters. When rounding increased number of integer digits recompute
+ number of groups.
+ * stdio-common/tst-grouping.c: New file.
+ * stdio-common/Makefile: Add rules to build and run tst-grouping.
+
+2011-01-09 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/i386/bits/select.h: Don't use asm code for __FD_SET,
+ __FD_CLR, and __FS_ISSET. gcc generates better code on its own.
+
+ * sysdeps/x86_64/bits/select.h: Mark value of __FD_SET and __FD_CLR as
+ void.
+ * bits/select.h: Likewise.
+
+2011-01-08 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * po/ja.po: Update from translation team.
+
+2011-01-04 David S. Miller <davem@xxxxxxxxxxxxxxxxxxxx>
+
+ [BZ #11155]
+ * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Use i386's
+ implementation just like for lxstat, fxstatat, et al.
+
+2010-12-27 Jim Meyering <meyering@xxxxxxxxxx>
+
+ [BZ #12348]
+ * posix/regexec.c (build_trtable): Return failure indication upon
+ calloc failure. Otherwise, re_search_internal could infloop on OOM.
+
+2010-12-25 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #12201]
+ * sysdeps/unix/sysv/linux/getrlimit64.c: New file.
+ * sysdeps/unix/sysv/linux/setrlimit64.c: New file.
+ * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Use ../getrlimit64.c.
+ * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_PRLIMIT64.
+
+ [BZ #12207]
+ * malloc/malloc.c (do_check_malloc_state): Use fastbin macro.
+
+ [BZ #12204]
+ * string/xpg-strerror.c (__xpg_strerror_r): Return error code, not -1.
+ * sysdeps/mach/xpg-strerror.c (__xpg_strerror_r): Likewise.
+
+2010-12-15 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * config.h.in (NO_CTORS_DTORS_SECTIONS): Define.
+ * configure.in: Define NO_CTORS_DTORS_SECTIONS if linker
+ script has SORT_BY_INIT_PRIORITY.
+ * elf/sofini.c: Remove `.ctors' and `.dtors' sections if
+ NO_CTORS_DTORS_SECTIONS is defined.
+ * elf/soinit.c: Likewise.
+ * sysdeps/i386/init-first.c: Don't call __libc_global_ctors if
+ NO_CTORS_DTORS_SECTIONS is defined.
+ * sysdeps/mach/hurd/i386/init-first.c: Likewise.
+ * sysdeps/mach/hurd/powerpc/init-first.c: Likewise.
+ * sysdeps/sh/init-first.c: Likewise.
+ * sysdeps/unix/sysv/linux/init-first.c: Likewise.
+
+2010-12-24 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * stdio-common/vfprintf.c (vfprintf): If printf handlers are installed
+ always use the slow path.
+
+2010-12-15 Ryan S. Arnold <rsa@xxxxxxxxxx>
+
+ * elf/Makefile: (check-execstack): Replace $(native-compile) with a
+ similar rule which adds the sysdep directories to the header search in
+ order to pick up the correct platform stackinfo.h.
+ * elf/check-execstack.c (main): Check DEFAULT_STACK_PERMS for PF_X and
+ perform test if it is, otherwise return successfully without testing.
+ * elf/dl-load.c (_dl_map_object_from_fd): Source stack_flags from
+ DEFAULT_STACK_PERMS define in stackinfo.h.
+ * elf/dl-support.c (_dl_stack_flags): Source from DEFAULT_STACK_PERMS
+ defined in stackinfo.h.
+ * elf/rtld.c (_dl_starting_up): Source ._dl_stack_flags from
+ DEFAULT_STACK_PERMS defined in stackinfo.h.
+ * sysdeps/i386/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.
+ * sysdeps/ia64/stackinfo.h: Likewise.
+ * sysdeps/s390/stackinfo.h: Likewise.
+ * sysdeps/sh/stackinfo.h: Likewise.
+ * sysdeps/sparc/stackinfo.h: Likewise.
+ * sysdeps/x86_64/stackinfo.h: Likewise.
+ * sysdeps/powerpc/stackinfo.h: Define DEFAULT_STACK_PERMS without
+ PF_X for powerpc64. Retain PF_X for powerpc32.
+
+2010-12-19 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/unix/readdir_r.c (__READDIR_R): Compute reclen more
+ accurately.
+ * sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c: Define
+ GETDENTS_64BIT_ALIGNED.
+
2010-12-14 Ulrich Drepper <dreper@xxxxxxxxx>
- * sysdeps/i386/i686/multiarch/strcmp.S: Undo accident checkin.
+ * sysdeps/i386/i686/multiarch/strcmp.S: Undo accidental checkin.
2010-12-10 Andreas Schwab <schwab@xxxxxxxxxx>
Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
-GNU C Library NEWS -- history of user-visible changes. 2010-11-10
-Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
+GNU C Library NEWS -- history of user-visible changes. 2011-1-15
+Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions.
Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
@@ -9,9 +9,11 @@
* The following bugs are resolved with this release:
- 3268, 7066, 10851, 11611, 11640, 11701, 11840, 11856, 11883, 11903, 11904,
- 11968, 11979, 12005, 12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108,
- 12113, 12140, 12159, 12167, 12191, 12194, 12205
+ 3268, 6812, 7066, 10085, 10484, 10563, 10851, 11149, 11155, 11611, 11640,
+ 11655, 11701, 11840, 11856, 11883, 11903, 11904, 11968, 11979, 12005,
+ 12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108, 12113, 12140,
+ 12159, 12167, 12191, 12194, 12201, 12204, 12205, 12207, 12348, 12378,
+ 12394, 12397
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
@@ -1923,8 +1925,7 @@
----------------------------------------------------------------------
Copyright information:
-Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2005,2006
- Free Software Foundation, Inc.
+Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
@@ -1938,4 +1939,5 @@
Local variables:
version-control: never
+fill-column: 76
End:
Modified: trunk/libc/bits/select.h
==============================================================================
--- trunk/libc/bits/select.h (original)
+++ trunk/libc/bits/select.h Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2001, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@
for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \
__FDS_BITS (__arr)[__i] = 0; \
} while (0)
-#define __FD_SET(d, s) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d))
-#define __FD_CLR(d, s) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d))
-#define __FD_ISSET(d, s) ((__FDS_BITS (s)[__FDELT(d)] & __FDMASK(d)) != 0)
+#define __FD_SET(d, s) \
+ ((void) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d)))
+#define __FD_CLR(d, s) \
+ ((void) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d)))
+#define __FD_ISSET(d, s) ((__FDS_BITS (s)[__FDELT (d)] & __FDMASK (d)) != 0)
Modified: trunk/libc/catgets/gencat.c
==============================================================================
--- trunk/libc/catgets/gencat.c (original)
+++ trunk/libc/catgets/gencat.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -250,7 +250,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/config.h.in
==============================================================================
--- trunk/libc/config.h.in (original)
+++ trunk/libc/config.h.in Fri Feb 4 14:13:20 2011
@@ -206,6 +206,9 @@
/* Define if multi-arch DSOs should be generated. */
#undef USE_MULTIARCH
+
+/* Define if `.ctors' and `.dtors' sections shouldn't be used. */
+#undef NO_CTORS_DTORS_SECTIONS
/*
*/
Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Fri Feb 4 14:13:20 2011
@@ -4136,7 +4136,7 @@
;;
*)
test -d "$srcdir/$libc_add_on" || {
- if test -d "$libc_add_on"; then
+ if test -d "$libc_add_on"; then
libc_add_on="`pwd`/$libc_add_on"
else
{ { $as_echo "$as_me:$LINENO: error: add-on directory \"$libc_add_on\" does not exist" >&5
@@ -4158,7 +4158,7 @@
libc_add_on_subdirs=
. "$libc_add_on_frag"
test -z "$libc_add_on" || {
- configured_add_ons="$configured_add_ons $libc_add_on"
+ configured_add_ons="$configured_add_ons $libc_add_on"
if test "x$libc_add_on_canonical" = xunknown; then
{ { $as_echo "$as_me:$LINENO: error: fragment must set \$libc_add_on_canonical" >&5
$as_echo "$as_me: error: fragment must set \$libc_add_on_canonical" >&2;}
@@ -4521,8 +4521,8 @@
for d in $add_ons_pfx ''; do
for a in $add_ons_sfx ''; do
if test -n "$m0$m0sub$b$v$o$m$msub"; then
- try_srcdir="${srcdir}/"
- case "$d" in
+ try_srcdir="${srcdir}/"
+ case "$d" in
/*) try_srcdir= ;;
esac
try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
@@ -4557,7 +4557,7 @@
*"$multi_arch_d"*)
;;
*)
- multi_arch=no
+ test x"$multi_arch" = xdefault && multi_arch=no
;;
esac
if test x"$multi_arch" != xno; then
@@ -4687,7 +4687,7 @@
fi
done
if test $found = no; then
- { $as_echo "$as_me:$LINENO: WARNING: $name/Implies specifies nonexistent $x" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: $name/Implies specifies nonexistent $x" >&5
$as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
fi
done
@@ -4766,7 +4766,7 @@
done
;;
*)
- test -d "$f" || { test -e "$f" && exit 88; }
+ test -d "$f" || { test -e "$f" && exit 88; }
;;
esac
done)
@@ -6224,7 +6224,7 @@
};
VERS_2 {
- global: sym;
+ global: sym;
} VERS_1;
EOF
if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5; then
@@ -6527,6 +6527,16 @@
{ { $as_echo "$as_me:$LINENO: error: Need linker with .init_array/.fini_array support." >&5
$as_echo "$as_me: error: Need linker with .init_array/.fini_array support." >&2;}
{ (exit 1); exit 1; }; }
+ elif { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cat >>confdefs.h <<\_ACEOF
+#define NO_CTORS_DTORS_SECTIONS 1
+_ACEOF
+
fi
{ $as_echo "$as_me:$LINENO: checking for libunwind-support in compiler" >&5
@@ -6672,7 +6682,7 @@
{ $as_echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5
$as_echo "$libc_cv_z_relro" >&6; }
if test "$libc_cv_z_relro" = no; then
- { { $as_echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
+ { { $as_echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
$as_echo "$as_me: error: linker with -z relro support required" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7261,13 +7271,13 @@
*) cfi_offset=0;;
esac
cat > conftest.s <<EOF
- .text
- .type func,%function
+ .text
+ .type func,%function
func:
- .cfi_startproc
+ .cfi_startproc
.cfi_remember_state
.cfi_rel_offset 1, $cfi_offset
- .cfi_endproc
+ .cfi_endproc
EOF
if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Fri Feb 4 14:13:20 2011
@@ -29,8 +29,8 @@
# Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
AC_ARG_WITH([gd],
- AC_HELP_STRING([--with-gd=DIR],
- [find libgd include dir and library with prefix DIR]),
+ AC_HELP_STRING([--with-gd=DIR],
+ [find libgd include dir and library with prefix DIR]),
[dnl
case "$with_gd" in
yes|''|no) ;;
@@ -39,18 +39,18 @@
esac
])
AC_ARG_WITH([gd-include],
- AC_HELP_STRING([--with-gd-include=DIR],
- [find libgd include files in DIR]),
- [dnl
+ AC_HELP_STRING([--with-gd-include=DIR],
+ [find libgd include files in DIR]),
+ [dnl
case "$with_gd_include" in
''|no) ;;
*) libgd_include="-I$withval" ;;
esac
])
AC_ARG_WITH([gd-lib],
- AC_HELP_STRING([--with-gd-lib=DIR],
- [find libgd library files in DIR]),
- [dnl
+ AC_HELP_STRING([--with-gd-lib=DIR],
+ [find libgd library files in DIR]),
+ [dnl
case "$with_gd_lib" in
''|no) ;;
*) libgd_ldflags="-L$withval" ;;
@@ -68,34 +68,34 @@
dnl Arguments to specify presence of other packages/features.
AC_ARG_WITH([fp],
- AC_HELP_STRING([--with-fp],
- [if using floating-point hardware @<:@default=yes@:>@]),
+ AC_HELP_STRING([--with-fp],
+ [if using floating-point hardware @<:@default=yes@:>@]),
[with_fp=$withval],
[with_fp=yes])
AC_SUBST(with_fp)
AC_ARG_WITH([binutils],
- AC_HELP_STRING([--with-binutils=PATH],
- [specify location of binutils (as and ld)]),
+ AC_HELP_STRING([--with-binutils=PATH],
+ [specify location of binutils (as and ld)]),
[path_binutils=$withval],
[path_binutils=''])
AC_ARG_WITH([elf],
- AC_HELP_STRING([--with-elf],
- [if using the ELF object format]),
+ AC_HELP_STRING([--with-elf],
+ [if using the ELF object format]),
[elf=$withval],
[elf=no])
AC_ARG_WITH([selinux],
- AC_HELP_STRING([--with-selinux],
- [if building with SELinux support]),
+ AC_HELP_STRING([--with-selinux],
+ [if building with SELinux support]),
[with_selinux=$withval],
[with_selinux=auto])
AC_ARG_WITH([xcoff],
- AC_HELP_STRING([--with-xcoff],
- [if using the XCOFF object format]),
+ AC_HELP_STRING([--with-xcoff],
+ [if using the XCOFF object format]),
[xcoff=$withval],
[xcoff=no])
AC_ARG_WITH([cvs],
- AC_HELP_STRING([--without-cvs],
- [if CVS should not be used]),
+ AC_HELP_STRING([--without-cvs],
+ [if CVS should not be used]),
[with_cvs=$withval],
[with_cvs=yes])
if test "$with_cvs" = yes; then
@@ -107,16 +107,16 @@
AC_SUBST(with_cvs)
AC_ARG_WITH([headers],
- AC_HELP_STRING([--with-headers=PATH],
- [location of system headers to use
+ AC_HELP_STRING([--with-headers=PATH],
+ [location of system headers to use
(for example /usr/src/linux/include)
@<:@default=compiler default@:>@]),
[sysheaders=$withval],
[sysheaders=''])
AC_ARG_ENABLE([sanity-checks],
- AC_HELP_STRING([--disable-sanity-checks],
- [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
+ AC_HELP_STRING([--disable-sanity-checks],
+ [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
[enable_sanity=$enableval],
[enable_sanity=yes])
@@ -139,34 +139,34 @@
dnl [static=yes])
static=yes
AC_ARG_ENABLE([shared],
- AC_HELP_STRING([--enable-shared],
- [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
+ AC_HELP_STRING([--enable-shared],
+ [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
[shared=$enableval],
[shared=default])
AC_ARG_ENABLE([profile],
- AC_HELP_STRING([--enable-profile],
- [build profiled library @<:@default=no@:>@]),
+ AC_HELP_STRING([--enable-profile],
+ [build profiled library @<:@default=no@:>@]),
[profile=$enableval],
[profile=no])
AC_ARG_ENABLE([omitfp],
- AC_HELP_STRING([--enable-omitfp],
- [build undebuggable optimized library @<:@default=no@:>@]),
+ AC_HELP_STRING([--enable-omitfp],
+ [build undebuggable optimized library @<:@default=no@:>@]),
[omitfp=$enableval],
[omitfp=no])
AC_ARG_ENABLE([bounded],
- AC_HELP_STRING([--enable-bounded],
- [build with runtime bounds checking @<:@default=no@:>@]),
+ AC_HELP_STRING([--enable-bounded],
+ [build with runtime bounds checking @<:@default=no@:>@]),
[bounded=$enableval],
[bounded=no])
AC_ARG_ENABLE([versioning],
- AC_HELP_STRING([--disable-versioning],
- [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
+ AC_HELP_STRING([--disable-versioning],
+ [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
[enable_versioning=$enableval],
[enable_versioning=yes])
AC_ARG_ENABLE([oldest-abi],
- AC_HELP_STRING([--enable-oldest-abi=ABI],
- [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
+ AC_HELP_STRING([--enable-oldest-abi=ABI],
+ [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
[oldest_abi=$enableval],
[oldest_abi=no])
if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
@@ -187,27 +187,27 @@
dnl Generic infrastructure for drop-in additions to libc.
AC_ARG_ENABLE([add-ons],
- AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
- [configure and build add-ons in DIR1,DIR2,...
- search for add-ons if no parameter given]),
+ AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
+ [configure and build add-ons in DIR1,DIR2,...
+ search for add-ons if no parameter given]),
, [enable_add_ons=yes])
dnl Let the user avoid using TLS. Don't know why but...
AC_ARG_WITH([tls],
- AC_HELP_STRING([--with-tls],
- [enable support for TLS]),
+ AC_HELP_STRING([--with-tls],
+ [enable support for TLS]),
[usetls=$withval],
[usetls=yes])
AC_ARG_WITH([__thread],
- AC_HELP_STRING([--without-__thread],
- [do not use TLS features even when supporting them]),
+ AC_HELP_STRING([--without-__thread],
+ [do not use TLS features even when supporting them]),
[use__thread=$withval],
[use__thread=yes])
AC_ARG_ENABLE([hidden-plt],
- AC_HELP_STRING([--disable-hidden-plt],
- [do not hide internal function calls to avoid PLT]),
+ AC_HELP_STRING([--disable-hidden-plt],
+ [do not hide internal function calls to avoid PLT]),
[hidden=$enableval],
[hidden=yes])
if test "x$hidden" = xno; then
@@ -224,8 +224,8 @@
dnl On some platforms we cannot use dynamic loading. We must provide
dnl static NSS modules.
AC_ARG_ENABLE([static-nss],
- AC_HELP_STRING([--enable-static-nss],
- [build static NSS modules @<:@default=no@:>@]),
+ AC_HELP_STRING([--enable-static-nss],
+ [build static NSS modules @<:@default=no@:>@]),
[static_nss=$enableval],
[static_nss=no])
dnl Enable static NSS also if we build no shared objects.
@@ -235,8 +235,8 @@
fi
AC_ARG_ENABLE([force-install],
- AC_HELP_STRING([--disable-force-install],
- [don't force installation of files from this package, even if they are older than the installed files]),
+ AC_HELP_STRING([--disable-force-install],
+ [don't force installation of files from this package, even if they are older than the installed files]),
[force_install=$enableval],
[force_install=yes])
AC_SUBST(force_install)
@@ -244,8 +244,8 @@
dnl On some platforms we allow dropping compatibility with all kernel
dnl versions.
AC_ARG_ENABLE([kernel],
- AC_HELP_STRING([--enable-kernel=VERSION],
- [compile for compatibility with kernel not older than VERSION]),
+ AC_HELP_STRING([--enable-kernel=VERSION],
+ [compile for compatibility with kernel not older than VERSION]),
[minimum_kernel=$enableval],
[])
dnl Prevent unreasonable values.
@@ -263,7 +263,7 @@
dnl appropriate.
AC_ARG_ENABLE([all-warnings],
AC_HELP_STRING([--enable-all-warnings],
- [enable all useful warnings gcc can issue]),
+ [enable all useful warnings gcc can issue]),
[all_warnings=$enableval],
[])
AC_SUBST(all_warnings)
@@ -449,7 +449,7 @@
;;
*)
test -d "$srcdir/$libc_add_on" || {
- if test -d "$libc_add_on"; then
+ if test -d "$libc_add_on"; then
libc_add_on="`pwd`/$libc_add_on"
else
AC_MSG_ERROR(add-on directory \"$libc_add_on\" does not exist)
@@ -468,7 +468,7 @@
libc_add_on_subdirs=
. "$libc_add_on_frag"
test -z "$libc_add_on" || {
- configured_add_ons="$configured_add_ons $libc_add_on"
+ configured_add_ons="$configured_add_ons $libc_add_on"
if test "x$libc_add_on_canonical" = xunknown; then
AC_MSG_ERROR(fragment must set \$libc_add_on_canonical)
fi
@@ -607,7 +607,7 @@
# For the multi-arch option we need support in the assembler.
AC_CACHE_CHECK([for assembler gnu_indirect_function symbol type support],
- libc_cv_asm_gnu_indirect_function, [dnl
+ libc_cv_asm_gnu_indirect_function, [dnl
cat > conftest.s <<EOF
.type foo,%gnu_indirect_function
EOF
@@ -776,8 +776,8 @@
for d in $add_ons_pfx ''; do
for a in $add_ons_sfx ''; do
if test -n "$m0$m0sub$b$v$o$m$msub"; then
- try_srcdir="${srcdir}/"
- case "$d" in
+ try_srcdir="${srcdir}/"
+ case "$d" in
/*) try_srcdir= ;;
esac
try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
@@ -812,7 +812,7 @@
*"$multi_arch_d"*)
;;
*)
- multi_arch=no
+ test x"$multi_arch" = xdefault && multi_arch=no
;;
esac
if test x"$multi_arch" != xno; then
@@ -933,7 +933,7 @@
fi
done
if test $found = no; then
- AC_MSG_WARN($name/Implies specifies nonexistent $x)
+ AC_MSG_WARN($name/Implies specifies nonexistent $x)
fi
done
else
@@ -1009,7 +1009,7 @@
done
;;
*)
- test -d "$f" || { test -e "$f" && exit 88; }
+ test -d "$f" || { test -e "$f" && exit 88; }
;;
esac
done)
@@ -1252,8 +1252,8 @@
#error stddef.h ignored __need_*
#endif
if (&size == NULL || &wchar == NULL) abort ();],
- libc_cv_friendly_stddef=yes,
- libc_cv_friendly_stddef=no)])
+ libc_cv_friendly_stddef=yes,
+ libc_cv_friendly_stddef=no)])
if test $libc_cv_friendly_stddef = yes; then
config_vars="$config_vars
override stddef.h = # The installed <stddef.h> seems to be libc-friendly."
@@ -1343,7 +1343,7 @@
};
VERS_2 {
- global: sym;
+ global: sym;
} VERS_1;
EOF
if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
@@ -1535,6 +1535,8 @@
rm -f conftest*])
if test $libc_cv_initfini_array != yes; then
AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
+ elif AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&AS_MESSAGE_LOG_FD]); then
+ AC_DEFINE(NO_CTORS_DTORS_SECTIONS)
fi
AC_CACHE_CHECK(for libunwind-support in compiler,
@@ -1617,7 +1619,7 @@
fi
fi])
if test "$libc_cv_z_relro" = no; then
- AC_MSG_ERROR(linker with -z relro support required)
+ AC_MSG_ERROR(linker with -z relro support required)
fi
;;
*) ;;
@@ -1885,12 +1887,12 @@
if test $ac_cv_prog_cc_works = yes; then
AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
[AC_TRY_LINK([asm ("_glibc_foobar:");], [glibc_foobar ();],
- libc_cv_asm_underscores=yes,
- libc_cv_asm_underscores=no)])
+ libc_cv_asm_underscores=yes,
+ libc_cv_asm_underscores=no)])
else
AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
[AC_CHECK_ASM_UNDERSCORE(libc_cv_asm_underscores=yes,
- libc_cv_asm_underscores=no)])
+ libc_cv_asm_underscores=no)])
fi
fi
if test $libc_cv_asm_underscores = no; then
@@ -1951,13 +1953,13 @@
*) cfi_offset=0;;
esac
cat > conftest.s <<EOF
- .text
- .type func,%function
+ .text
+ .type func,%function
func:
- .cfi_startproc
+ .cfi_startproc
.cfi_remember_state
.cfi_rel_offset 1, $cfi_offset
- .cfi_endproc
+ .cfi_endproc
EOF
if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_cfi_directives=yes
@@ -2185,7 +2187,7 @@
# See if we have the libaudit library
AC_CHECK_LIB(audit, audit_log_user_avc_message,
- have_libaudit=yes, have_libaudit=no)
+ have_libaudit=yes, have_libaudit=no)
if test "x$have_libaudit" = xyes; then
AC_DEFINE(HAVE_LIBAUDIT, 1, [SELinux libaudit support])
fi
Modified: trunk/libc/csu/version.c
==============================================================================
--- trunk/libc/csu/version.c (original)
+++ trunk/libc/csu/version.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
static const char banner[] =
"GNU C Library "PKGVERSION RELEASE" release version "VERSION", by Roland McGrath et al.\n\
-Copyright (C) 2010 Free Software Foundation, Inc.\n\
+Copyright (C) 2011 Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
PARTICULAR PURPOSE.\n\
Modified: trunk/libc/debug/catchsegv.sh
==============================================================================
--- trunk/libc/debug/catchsegv.sh (original)
+++ trunk/libc/debug/catchsegv.sh Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998,1999,2001,2003,2004,2006,2007,2008,2009,2010
+# Copyright (C) 1998,1999,2001,2003,2004,2006,2007,2008,2009,2010,2011
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
@@ -40,7 +40,7 @@
;;
--v | --ve | --ver | --vers | --versi | --versio | --version)
echo 'catchsegv @PKGVERSION@@VERSION@'
- echo 'Copyright (C) 2010 Free Software Foundation, Inc.
+ echo 'Copyright (C) 2011 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Written by Ulrich Drepper.'
Modified: trunk/libc/debug/xtrace.sh
==============================================================================
--- trunk/libc/debug/xtrace.sh (original)
+++ trunk/libc/debug/xtrace.sh Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
#! @BASH@
-# Copyright (C) 1999, 2001-2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1999.
@@ -66,7 +66,7 @@
printf $"Copyright (C) %s Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2010"
+" "2011"
printf $"Written by %s.
" "Ulrich Drepper"
exit 0
Modified: trunk/libc/elf/Makefile
==============================================================================
--- trunk/libc/elf/Makefile (original)
+++ trunk/libc/elf/Makefile Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2007,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007,2008,2009,2010,2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -213,6 +213,10 @@
tests: $(objpfx)tst-leaks1-mem
tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+tlsmod17a-modules = $(addprefix tst-tlsmod17a, $(tlsmod17a-suffixes))
+tlsmod18a-modules = $(addprefix tst-tlsmod18a, $(tlsmod17a-suffixes))
+extra-test-objs += $(tlsmod17a-modules:=.os) $(tlsmod18a-modules:=.os)
+test-extras += tst-tlsmod17a tst-tlsmod18a
modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
testobj1_1 failobj constload2 constload3 unloadmod \
dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \
@@ -232,9 +236,7 @@
tst-tlsmod9 tst-tlsmod10 tst-tlsmod11 tst-tlsmod12 \
tst-tlsmod13 tst-tlsmod13a tst-tlsmod14a tst-tlsmod14b \
tst-tlsmod15a tst-tlsmod15b tst-tlsmod16a tst-tlsmod16b \
- $(patsubst %,tst-tlsmod17a%,$(tlsmod17a-suffixes)) \
- tst-tlsmod17b \
- $(patsubst %,tst-tlsmod18a%,$(tlsmod18a-suffixes)) \
+ $(tlsmod17a-modules) tst-tlsmod17b $(tlsmod18a-modules) \
circlemod1 circlemod1a circlemod2 circlemod2a \
circlemod3 circlemod3a \
reldep8mod1 reldep8mod2 reldep8mod3 \
@@ -255,6 +257,8 @@
endif
ifeq (yesyes,$(have-fpie)$(build-shared))
modules-names += tst-piemod1
+extra-test-objs += tst-pie1.o
+test-extras += tst-pie1
endif
ifeq (x86_64,$(config-machine))
modules-names += tst-auditmod3a tst-auditmod3b \
@@ -271,7 +275,7 @@
# filtmod1.so has a special rule
modules-names-nobuild := filtmod1
-ifeq (yes,$(multi-arch))
+ifneq (no,$(multi-arch))
tests-static += ifuncmain1static ifuncmain1picstatic \
ifuncmain2static ifuncmain2picstatic \
ifuncmain4static ifuncmain4picstatic \
@@ -284,10 +288,16 @@
ifuncmain2 ifuncmain2pic ifuncmain3 ifuncmain4 \
ifuncmain5 ifuncmain5pic ifuncmain5staticpic \
ifuncmain7 ifuncmain7pic
+ifunc-test-modules = ifuncdep1 ifuncdep1pic ifuncdep2 ifuncdep2pic \
+ ifuncdep5 ifuncdep5pic
+extra-test-objs += $(ifunc-test-modules:=.o)
+test-extras += $(ifunc-test-modules)
ifeq (yes,$(have-fpie))
-tests: $(objpfx)ifuncmain1pie.out $(objpfx)ifuncmain1vispie.out \
- $(objpfx)ifuncmain1staticpie.out $(objpfx)ifuncmain5pie.out \
- $(objpfx)ifuncmain6pie.out $(objpfx)ifuncmain7pie.out
+ifunc-pie-tests = ifuncmain1pie ifuncmain1vispie ifuncmain1staticpie \
+ ifuncmain5pie ifuncmain6pie ifuncmain7pie
+tests: $(patsubst %,$(objpfx)%.out, $(ifunc-pie-tests))
+extra-test-objs += $(ifunc-pie-tests:=.o)
+test-extras += $(ifunc-pie-tests)
endif
modules-names += ifuncmod1 ifuncmod3 ifuncmod5 ifuncmod6
endif
@@ -791,16 +801,16 @@
$(objpfx)tst-tls17: $(libdl)
$(objpfx)tst-tls17.out: $(objpfx)tst-tlsmod17b.so
-$(patsubst %,$(objpfx)tst-tlsmod17a%.os,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.os : tst-tlsmod17a.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $<
-$(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so
-$(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes))
+$(patsubst %,$(objpfx)%.os,$(tlsmod17a-modules)): $(objpfx)tst-tlsmod17a%.os: tst-tlsmod17a.c
+ $(compile-command.c) -DN=$*
+$(patsubst %,$(objpfx)%.so,$(tlsmod17a-modules)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so
+$(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)%.so,$(tlsmod17a-modules))
$(objpfx)tst-tls18: $(libdl)
-$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes))
-$(patsubst %,$(objpfx)tst-tlsmod18a%.os,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $<
-$(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so
+$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)%.so,$(tlsmod18a-modules))
+$(patsubst %,$(objpfx)%.os,$(tlsmod18a-modules)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c
+ $(compile-command.c) -DN=$*
+$(patsubst %,$(objpfx)%.so,$(tlsmod18a-modules)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so
CFLAGS-tst-align.c = $(stack-align-test-flags)
CFLAGS-tst-align2.c = $(stack-align-test-flags)
@@ -906,9 +916,17 @@
$(objpfx)check-textrel: check-textrel.c
$(native-compile)
-check-execstack-CFLAGS = -O -Wall -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99
-$(objpfx)check-execstack: check-execstack.c
+check-execstack-CFLAGS = -O -Wall -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99 \
+ $(objpfx:%/=-I%)
+$(objpfx)check-execstack: check-execstack.c $(objpfx)check-execstack.h
$(native-compile)
+$(objpfx)check-execstack.h: $(first-word $(wildcard $(sysdirs:%=%/stackinfo.h)))
+ $(make-target-directory)
+ { echo '#include <stackinfo.h>'; echo '@@@DEFAULT_STACK_PERMS@@@'; } | \
+ $(CC) $(CFLAGS) $(CPPFLAGS) -E -x c-header - | \
+ sed -n -e 's/^@@@\(.*\)@@@/#define DEFAULT_STACK_PERMS \1/p' > $@T
+ mv -f $@T $@
+generated += check-execstack.h
check-localplt-CFLAGS = -O -Wall -D_GNU_SOURCE -std=gnu99
$(objpfx)check-localplt: check-localplt.c
@@ -917,16 +935,16 @@
ifeq (yes,$(build-shared))
tests: $(objpfx)check-textrel.out $(objpfx)check-execstack.out
-$(objpfx)check-textrel.out: $(objpfx)check-textrel
- $(dir $<)$(notdir $<) $(common-objpfx)libc.so \
- $(sort $(wildcard $(common-objpfx)*/lib*.so \
- $(common-objpfx)iconvdata/*.so)) > $@
+all-built-dso = $(common-objpfx)libc.so \
+ $(sort $(wildcard $(common-objpfx)*/lib*.so \
+ $(common-objpfx)iconvdata/*.so))
+
+$(objpfx)check-textrel.out: $(objpfx)check-textrel $(all-built-dso)
+ $(dir $<)$(notdir $<) $(filter-out $<, $^) > $@
generated += check-textrel check-textrel.out
-$(objpfx)check-execstack.out: $(objpfx)check-execstack
- $(dir $<)$(notdir $<) $(common-objpfx)libc.so \
- $(sort $(wildcard $(common-objpfx)*/lib*.so \
- $(common-objpfx)iconvdata/*.so)) > $@
+$(objpfx)check-execstack.out: $(objpfx)check-execstack $(all-built-dso)
+ $(dir $<)$(notdir $<) $(filter-out $<, $^) > $@
generated += check-execstack check-execstack.out
$(objpfx)tst-dlmodcount: $(libdl)
Modified: trunk/libc/elf/check-execstack.c
==============================================================================
--- trunk/libc/elf/check-execstack.c (original)
+++ trunk/libc/elf/check-execstack.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Check for executable stacks in DSOs.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contribute by Ulrich Drepper <drepper@xxxxxxxxxx>. 2009.
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "check-execstack.h"
#ifdef BITS
@@ -91,8 +92,13 @@
return 0;
}
- printf ("%s: no PT_GNU_STACK entry\n", fname);
- return 1;
+ if (DEFAULT_STACK_PERMS & PF_X)
+ {
+ printf ("%s: no PT_GNU_STACK entry\n", fname);
+ return 1;
+ }
+
+ return 0;
}
# undef BITS
@@ -152,7 +158,6 @@
for (cnt = 1; cnt < argc; ++cnt)
result |= handle_file (argv[cnt]);
-
return result;
}
#endif
Modified: trunk/libc/elf/dl-dst.h
==============================================================================
--- trunk/libc/elf/dl-dst.h (original)
+++ trunk/libc/elf/dl-dst.h Fri Feb 4 14:13:20 2011
@@ -1,6 +1,5 @@
/* Handling of dynamic sring tokens.
- Copyright (C) 1999,2001,2002,2003,2004,2006,2007
- Free Software Foundation, Inc.
+ Copyright (C) 1999,2001-2004,2006,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,6 +32,11 @@
__cnt; })
+#ifdef SHARED
+# define IS_RTLD(l) (l) == &GL(dl_rtld_map)
+#else
+# define IS_RTLD(l) 0
+#endif
/* Guess from the number of DSTs the length of the result string. */
#define DL_DST_REQUIRED(l, name, len, cnt) \
({ \
@@ -41,7 +45,7 @@
\
if (__cnt > 0) \
{ \
- size_t dst_len; \
+ size_t dst_len; \
/* Now we make a guess how many extra characters on top of the \
length of S we need to represent the result. We know that \
we have CNT replacements. Each at most can use \
@@ -50,11 +54,12 @@
minus 4 (which is the length of "$LIB"). \
\
First get the origin string if it is not available yet. \
- This can only happen for the map of the executable. */ \
+ This can only happen for the map of the executable or, when \
+ auditing, in ld.so. */ \
DL_DST_REQ_STATIC (l) \
if ((l)->l_origin == NULL) \
{ \
- assert ((l)->l_name[0] == '\0'); \
+ assert ((l)->l_name[0] == '\0' || IS_RTLD (l)); \
(l)->l_origin = _dl_get_origin (); \
dst_len = ((l)->l_origin && (l)->l_origin != (char *) -1 \
? strlen ((l)->l_origin) : 0); \
@@ -62,7 +67,7 @@
else \
dst_len = (l)->l_origin == (char *) -1 \
? 0 : strlen ((l)->l_origin); \
- dst_len = MAX (MAX (dst_len, GLRO(dl_platformlen)), \
+ dst_len = MAX (MAX (dst_len, GLRO(dl_platformlen)), \
strlen (DL_DST_LIB)); \
if (dst_len > 4) \
__len += __cnt * (dst_len - 4); \
Modified: trunk/libc/elf/dl-load.c
==============================================================================
--- trunk/libc/elf/dl-load.c (original)
+++ trunk/libc/elf/dl-load.c Fri Feb 4 14:13:20 2011
@@ -984,8 +984,10 @@
}
}
- /* Presumed absent PT_GNU_STACK. */
- uint_fast16_t stack_flags = PF_R|PF_W|PF_X;
+ /* On most platforms presume that PT_GNU_STACK is absent and the stack is
+ * executable. Other platforms default to a nonexecutable stack and don't
+ * need PT_GNU_STACK to do so. */
+ uint_fast16_t stack_flags = DEFAULT_STACK_PERMS;
{
/* Scan the program header table, collecting its load commands. */
Modified: trunk/libc/elf/dl-support.c
==============================================================================
--- trunk/libc/elf/dl-support.c (original)
+++ trunk/libc/elf/dl-support.c Fri Feb 4 14:13:20 2011
@@ -32,6 +32,7 @@
#include <dl-procinfo.h>
#include <unsecvars.h>
#include <hp-timing.h>
+#include <stackinfo.h>
extern char *__progname;
char **_dl_argv = &__progname; /* This is checked for some error messages. */
@@ -136,8 +137,9 @@
setting _dl_hwcap nonzero below, but we do anyway. */
uint64_t _dl_hwcap_mask __attribute__ ((nocommon));
-/* Prevailing state of the stack, PF_X indicating it's executable. */
-ElfW(Word) _dl_stack_flags = PF_R|PF_W|PF_X;
+/* Prevailing state of the stack. Generally this includes PF_X, indicating it's
+ * executable but this isn't true for all platforms. */
+ElfW(Word) _dl_stack_flags = DEFAULT_STACK_PERMS;
/* If loading a shared object requires that we make the stack executable
when it was not, we do it by calling this function.
Modified: trunk/libc/elf/ldconfig.c
==============================================================================
--- trunk/libc/elf/ldconfig.c (original)
+++ trunk/libc/elf/ldconfig.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
@@ -320,7 +320,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"),
"Andreas Jaeger");
}
@@ -1375,7 +1375,7 @@
{
save_cache (cache_file);
if (aux_cache_file)
- save_aux_cache (aux_cache_file);
+ save_aux_cache (aux_cache_file);
}
return 0;
Modified: trunk/libc/elf/ldd.bash.in
==============================================================================
--- trunk/libc/elf/ldd.bash.in (original)
+++ trunk/libc/elf/ldd.bash.in Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
#! @BASH@
-# Copyright (C) 1996-2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@
printf $"Copyright (C) %s Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2010"
+" "2011"
printf $"Written by %s and %s.
" "Roland McGrath" "Ulrich Drepper"
exit 0
Modified: trunk/libc/elf/rtld.c
==============================================================================
--- trunk/libc/elf/rtld.c (original)
+++ trunk/libc/elf/rtld.c Fri Feb 4 14:13:20 2011
@@ -40,6 +40,7 @@
#include <dl-osinfo.h>
#include <dl-procinfo.h>
#include <tls.h>
+#include <stackinfo.h>
#include <assert.h>
@@ -122,8 +123,9 @@
(except those which cannot be added for some reason). */
struct rtld_global _rtld_global =
{
- /* Default presumption without further information is executable stack. */
- ._dl_stack_flags = PF_R|PF_W|PF_X,
+ /* Generally the default presumption without further information is an
+ * executable stack but this is not true for all platforms. */
+ ._dl_stack_flags = DEFAULT_STACK_PERMS,
#ifdef _LIBC_REENTRANT
._dl_load_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER,
._dl_load_write_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER,
Modified: trunk/libc/elf/sofini.c
==============================================================================
--- trunk/libc/elf/sofini.c (original)
+++ trunk/libc/elf/sofini.c Fri Feb 4 14:13:20 2011
@@ -1,12 +1,14 @@
/* Finalizer module for ELF shared C library. This provides terminating
null pointer words in the `.ctors' and `.dtors' sections. */
+#ifndef NO_CTORS_DTORS_SECTIONS
static void (*const __CTOR_END__[1]) (void)
__attribute__ ((used, section (".ctors")))
= { 0 };
static void (*const __DTOR_END__[1]) (void)
__attribute__ ((used, section (".dtors")))
= { 0 };
+#endif
/* Terminate the frame unwind info section with a 4byte 0 as a sentinel;
this would be the 'length' field in a real FDE. */
Modified: trunk/libc/elf/soinit.c
==============================================================================
--- trunk/libc/elf/soinit.c (original)
+++ trunk/libc/elf/soinit.c Fri Feb 4 14:13:20 2011
@@ -3,8 +3,9 @@
the `.ctors' and `.dtors' sections so the lists are terminated, and
calling those lists of functions. */
-#include <libc-internal.h>
-#include <stdlib.h>
+#ifndef NO_CTORS_DTORS_SECTIONS
+# include <libc-internal.h>
+# include <stdlib.h>
static void (*const __CTOR_LIST__[1]) (void)
__attribute__ ((section (".ctors")))
@@ -40,3 +41,4 @@
void (*_fini_ptr) (void) __attribute__ ((section (".fini_array")))
= &__libc_fini;
+#endif
Modified: trunk/libc/elf/sprof.c
==============================================================================
--- trunk/libc/elf/sprof.c (original)
+++ trunk/libc/elf/sprof.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Read and display shared object profiling data.
- Copyright (C) 1997-2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -391,7 +391,7 @@
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
"),
- "2010");
+ "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/iconv/iconv_prog.c
==============================================================================
--- trunk/libc/iconv/iconv_prog.c (original)
+++ trunk/libc/iconv/iconv_prog.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Convert text in given files from the specified from-set to the to-set.
- Copyright (C) 1998-2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
@@ -435,7 +435,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/iconv/iconvconfig.c
==============================================================================
--- trunk/libc/iconv/iconvconfig.c (original)
+++ trunk/libc/iconv/iconvconfig.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Generate fastloading iconv module configuration files.
- Copyright (C) 2000-2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2000-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2000.
@@ -399,7 +399,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/include/alloca.h
==============================================================================
--- trunk/libc/include/alloca.h (original)
+++ trunk/libc/include/alloca.h Fri Feb 4 14:13:20 2011
@@ -14,6 +14,7 @@
extern int __libc_use_alloca (size_t size) __attribute__ ((const));
extern int __libc_alloca_cutoff (size_t size) __attribute__ ((const));
+libc_hidden_proto (__libc_alloca_cutoff)
#define __MAX_ALLOCA_CUTOFF 65536
Modified: trunk/libc/include/features.h
==============================================================================
--- trunk/libc/include/features.h (original)
+++ trunk/libc/include/features.h Fri Feb 4 14:13:20 2011
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1993,1995-2007,2009,2010 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2007,2009,2010,2011
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -336,7 +337,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
-#define __GLIBC_MINOR__ 12
+#define __GLIBC_MINOR__ 13
#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
Modified: trunk/libc/include/sys/resource.h
==============================================================================
--- trunk/libc/include/sys/resource.h (original)
+++ trunk/libc/include/sys/resource.h Fri Feb 4 14:13:20 2011
@@ -3,6 +3,7 @@
libc_hidden_proto (getpriority)
libc_hidden_proto (setpriority)
+libc_hidden_proto (getrlimit64)
/* Now define the internal interfaces. */
extern int __getrlimit (enum __rlimit_resource __resource,
Modified: trunk/libc/io/fcntl.h
==============================================================================
--- trunk/libc/io/fcntl.h (original)
+++ trunk/libc/io/fcntl.h Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007,2009,2010
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007,2009,2010,2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -110,6 +110,8 @@
# define AT_REMOVEDIR 0x200 /* Remove directory instead of
unlinking file. */
# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */
+# define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount
+ traversal. */
# define AT_EACCESS 0x200 /* Test access permitted for
effective IDs, not real IDs. */
#endif
Modified: trunk/libc/locale/programs/locale.c
==============================================================================
--- trunk/libc/locale/programs/locale.c (original)
+++ trunk/libc/locale/programs/locale.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Implementation of the locale program according to POSIX 9945-2.
- Copyright (C) 1995-1997, 1999-2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 1999-2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
@@ -297,7 +297,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/locale/programs/localedef.c
==============================================================================
--- trunk/libc/locale/programs/localedef.c (original)
+++ trunk/libc/locale/programs/localedef.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
@@ -407,7 +407,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
Modified: trunk/libc/malloc/malloc.c
==============================================================================
--- trunk/libc/malloc/malloc.c (original)
+++ trunk/libc/malloc/malloc.c Fri Feb 4 14:13:20 2011
@@ -2831,7 +2831,7 @@
max_fast_bin = fastbin_index(get_max_fast ());
for (i = 0; i < NFASTBINS; ++i) {
- p = av->fastbins[i];
+ p = fastbin (av, i);
/* The following test can only be performed for the main arena.
While mallopt calls malloc_consolidate to get rid of all fast
Modified: trunk/libc/malloc/memusage.sh
==============================================================================
--- trunk/libc/malloc/memusage.sh (original)
+++ trunk/libc/malloc/memusage.sh Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
#! @BASH@
-# Copyright (C) 1999-2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1999.
@@ -73,7 +73,7 @@
printf $"Copyright (C) %s Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-" "2010"
+" "2011"
printf $"Written by %s.
" "Ulrich Drepper"
exit 0
Modified: trunk/libc/malloc/mtrace.pl
==============================================================================
--- trunk/libc/malloc/mtrace.pl (original)
+++ trunk/libc/malloc/mtrace.pl Fri Feb 4 14:13:20 2011
@@ -1,7 +1,7 @@
#! @PERL@
eval "exec @PERL@ -S $0 $@"
if 0;
-# Copyright (C) 1997-2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1997.
# Based on the mtrace.awk script.
@@ -46,7 +46,7 @@
$ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
$ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
print "mtrace $PKGVERSION$VERSION\n";
- print "Copyright (C) 2010 Free Software Foundation, Inc.\n";
+ print "Copyright (C) 2011 Free Software Foundation, Inc.\n";
print "This is free software; see the source for copying conditions. There is NO\n";
print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
print "Written by Ulrich Drepper <drepper\@gnu.org>\n";
Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Fri Feb 4 14:13:20 2011
@@ -1,3 +1,29 @@
+2011-01-19 Roland McGrath <roland@xxxxxxxxxx>
+
+ * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo.
+ * pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise.
+ * pthread_rwlock_rdlock.c (__pthread_rwlock_rdlock): Likewise.
+ * pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock): Likewise.
+ * pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise.
+ * pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise.
+
+2011-01-16 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * Makefile (test-extras): Add tst-cleanup4aux.
+
+2011-01-14 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #10563]
+ * sysdeps/pthread/setxid.h (__SETXID_1): Add cast to assignment.
+ (__SETXID_2): Likewise.
+ (__SETXID_3): Likewise.
+
+2011-01-13 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #10484]
+ * Versions [libc] (GLIBC_PRIVATE): Export __libc_alloca_cutoff.
+ * alloca_cutoff.c: Add libc_hidden_def.
+
2010-10-13 H.J. Lu <hongjiu.lu@xxxxxxxxx>
[BZ #12113]
Modified: trunk/libc/nptl/Makefile
==============================================================================
--- trunk/libc/nptl/Makefile (original)
+++ trunk/libc/nptl/Makefile Fri Feb 4 14:13:20 2011
@@ -319,7 +319,7 @@
tst-tls5modd tst-tls5mode tst-tls5modf \
tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod
extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
-test-extras += $(modules-names)
+test-extras += $(modules-names) tst-cleanup4aux
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
tst-atfork2mod.so-no-z-defs = yes
Modified: trunk/libc/nptl/Versions
==============================================================================
--- trunk/libc/nptl/Versions (original)
+++ trunk/libc/nptl/Versions Fri Feb 4 14:13:20 2011
@@ -27,6 +27,7 @@
pthread_cond_broadcast; pthread_cond_timedwait;
}
GLIBC_PRIVATE {
+ __libc_alloca_cutoff;
# Internal libc interface to libpthread
__libc_dl_error_tsd;
}
Modified: trunk/libc/nptl/alloca_cutoff.c
==============================================================================
--- trunk/libc/nptl/alloca_cutoff.c (original)
+++ trunk/libc/nptl/alloca_cutoff.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Determine whether block of given size can be allocated on the stack or not.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -34,3 +34,4 @@
assume the maximum available stack space. */
?: __MAX_ALLOCA_CUTOFF * 4));
}
+libc_hidden_def (__libc_alloca_cutoff)
Modified: trunk/libc/nptl/pthread_cond_timedwait.c
==============================================================================
--- trunk/libc/nptl/pthread_cond_timedwait.c (original)
+++ trunk/libc/nptl/pthread_cond_timedwait.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004,2007,2010,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -65,7 +65,7 @@
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
/* Now we can release the mutex. */
Modified: trunk/libc/nptl/pthread_cond_wait.c
==============================================================================
--- trunk/libc/nptl/pthread_cond_wait.c (original)
+++ trunk/libc/nptl/pthread_cond_wait.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004,2006,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -101,7 +101,7 @@
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
/* Now we can release the mutex. */
Modified: trunk/libc/nptl/pthread_rwlock_rdlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_rdlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_rdlock.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -31,7 +31,7 @@
{
int result = 0;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
while (1)
Modified: trunk/libc/nptl/pthread_rwlock_timedrdlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_timedrdlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_timedrdlock.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -32,7 +32,7 @@
{
int result = 0;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock(rwlock->__data.__lock, rwlock->__data.__shared);
while (1)
Modified: trunk/libc/nptl/pthread_rwlock_timedwrlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_timedwrlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_timedwrlock.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -32,7 +32,7 @@
{
int result = 0;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
while (1)
Modified: trunk/libc/nptl/pthread_rwlock_wrlock.c
==============================================================================
--- trunk/libc/nptl/pthread_rwlock_wrlock.c (original)
+++ trunk/libc/nptl/pthread_rwlock_wrlock.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@xxxxxxxxxx>, 2003.
@@ -31,7 +31,7 @@
{
int result = 0;
- /* Make sure we are along. */
+ /* Make sure we are alone. */
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
while (1)
Modified: trunk/libc/nptl/sysdeps/pthread/setxid.h
==============================================================================
--- trunk/libc/nptl/sysdeps/pthread/setxid.h (original)
+++ trunk/libc/nptl/sysdeps/pthread/setxid.h Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2007, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,11 +20,11 @@
#include <sysdep.h>
#define __SETXID_1(cmd, arg1) \
- cmd.id[0] = arg1
+ cmd.id[0] = (long int) arg1
#define __SETXID_2(cmd, arg1, arg2) \
- __SETXID_1 (cmd, arg1); cmd.id[1] = arg2
+ __SETXID_1 (cmd, arg1); cmd.id[1] = (long int) arg2
#define __SETXID_3(cmd, arg1, arg2, arg3) \
- __SETXID_2 (cmd, arg1, arg2); cmd.id[2] = arg3
+ __SETXID_2 (cmd, arg1, arg2); cmd.id[2] = (long int) arg3
#ifdef SINGLE_THREAD
# define INLINE_SETXID_SYSCALL(name, nr, args...) \
Modified: trunk/libc/nscd/hstcache.c
==============================================================================
--- trunk/libc/nscd/hstcache.c (original)
+++ trunk/libc/nscd/hstcache.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Cache handling for host lookup.
- Copyright (C) 1998-2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
@@ -77,6 +77,20 @@
};
+/* This is the standard reply in case there are temporary problems. */
+static const hst_response_header tryagain =
+{
+ .version = NSCD_VERSION,
+ .found = 0,
+ .h_name_len = 0,
+ .h_aliases_cnt = 0,
+ .h_addrtype = -1,
+ .h_length = -1,
+ .h_addr_list_cnt = 0,
+ .error = TRY_AGAIN
+};
+
+
static void
cache_addhst (struct database_dyn *db, int fd, request_header *req,
const void *key, struct hostent *hst, uid_t owner,
@@ -111,11 +125,15 @@
else
{
/* We have no data. This means we send the standard reply for this
- case. */
+ case. Possibly this is only temporary. */
ssize_t total = sizeof (notfound);
+ assert (sizeof (notfound) == sizeof (tryagain));
+
+ const hst_response_header *resp = (errval == EAGAIN
+ ? &tryagain : ¬found);
if (fd != -1 &&
- TEMP_FAILURE_RETRY (send (fd, ¬found, total,
+ TEMP_FAILURE_RETRY (send (fd, resp, total,
MSG_NOSIGNAL)) != total)
all_written = false;
@@ -135,7 +153,7 @@
? db->negtimeout : ttl);
/* This is the reply. */
- memcpy (&dataset->resp, ¬found, total);
+ memcpy (&dataset->resp, resp, total);
/* Copy the key data. */
memcpy (dataset->strdata, key, req->key_len);
@@ -490,6 +508,7 @@
/* We set the error to indicate this is (possibly) a
temporary error and that it does not mean the entry
is not available at all. */
+ h_errno = TRY_AGAIN;
errval = EAGAIN;
break;
}
Modified: trunk/libc/nscd/nscd.c
==============================================================================
--- trunk/libc/nscd/nscd.c (original)
+++ trunk/libc/nscd/nscd.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxx>, 1998.
@@ -433,7 +433,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"),
"Thorsten Kukuk and Ulrich Drepper");
}
Modified: trunk/libc/nss/getent.c
==============================================================================
--- trunk/libc/nss/getent.c (original)
+++ trunk/libc/nss/getent.c Fri Feb 4 14:13:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxx>, 1998.
@@ -89,7 +89,7 @@
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2010");
+"), "2011");
fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk");
}
Modified: trunk/libc/nss/nss_files/files-hosts.c
==============================================================================
--- trunk/libc/nss/nss_files/files-hosts.c (original)
+++ trunk/libc/nss/nss_files/files-hosts.c Fri Feb 4 14:13:20 2011
@@ -1,5 +1,5 @@
/* Hosts file parser in nss_files module.
- Copyright (C) 1996-2001, 2003-2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996-2001, 2003-2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -129,19 +129,22 @@
&& _res_hconf.flags & HCONF_FLAG_MULTI) \
{ \
/* We have to get all host entries from the file. */ \
- const size_t tmp_buflen = MIN (buflen, 4096); \
- char tmp_buffer[tmp_buflen] \
+ size_t tmp_buflen = MIN (buflen, 4096); \
+ char tmp_buffer_stack[tmp_buflen] \
__attribute__ ((__aligned__ (__alignof__ (struct hostent_data))));\
+ char *tmp_buffer = tmp_buffer_stack; \
struct hostent tmp_result_buf; \
int naddrs = 1; \
int naliases = 0; \
char *bufferend; \
+ bool tmp_buffer_malloced = false; \
\
while (result->h_aliases[naliases] != NULL) \
++naliases; \
\
bufferend = (char *) &result->h_aliases[naliases + 1]; \
\
+ again: \
while ((status = internal_getent (&tmp_result_buf, tmp_buffer, \
tmp_buflen, errnop H_ERRNO_ARG \
EXTRA_ARGS_VALUE)) \
@@ -182,7 +185,7 @@
} \
/* If the real name is different add it also to the \
aliases. This means that there is a duplication \
- in the alias list but this is really the users \
+ in the alias list but this is really the user's \
problem. */ \
if (strcmp (old_result->h_name, \
tmp_result_buf.h_name) != 0) \
@@ -204,7 +207,7 @@
*errnop = ERANGE; \
*herrnop = NETDB_INTERNAL; \
status = NSS_STATUS_TRYAGAIN; \
- break; \
+ goto out; \
} \
\
new_h_addr_list = \
@@ -268,8 +271,54 @@
} \
} \
\
- if (status != NSS_STATUS_TRYAGAIN) \
+ if (status == NSS_STATUS_TRYAGAIN) \
+ { \
+ size_t newsize = 2 * tmp_buflen; \
+ if (tmp_buffer_malloced) \
+ { \
+ char *newp = realloc (tmp_buffer, newsize); \
+ if (newp != NULL) \
+ { \
+ assert ((((uintptr_t) newp) \
+ & (__alignof__ (struct hostent_data) - 1)) \
+ == 0); \
+ tmp_buffer = newp; \
+ tmp_buflen = newsize; \
+ goto again; \
+ } \
+ } \
+ else if (!__libc_use_alloca (buflen + newsize)) \
+ { \
+ tmp_buffer = malloc (newsize); \
+ if (tmp_buffer != NULL) \
+ { \
+ assert ((((uintptr_t) tmp_buffer) \
+ & (__alignof__ (struct hostent_data) - 1)) \
+ == 0); \
+ tmp_buffer_malloced = true; \
+ tmp_buflen = newsize; \
+ goto again; \
+ } \
+ } \
+ else \
+ { \
+ tmp_buffer \
+ = extend_alloca (tmp_buffer, tmp_buflen, \
+ newsize \
+ + __alignof__ (struct hostent_data)); \
+ tmp_buffer = (char *) (((uintptr_t) tmp_buffer \
+ + __alignof__ (struct hostent_data) \
+ - 1) \
+ & ~(__alignof__ (struct hostent_data)\
+ - 1)); \
+ goto again; \
+ } \
+ } \
+ else \
status = NSS_STATUS_SUCCESS; \
+ out: \
+ if (tmp_buffer_malloced) \
+ free (tmp_buffer); \
} \
\
\
Modified: trunk/libc/po/ja.po
==============================================================================
--- trunk/libc/po/ja.po (original)
+++ trunk/libc/po/ja.po Fri Feb 4 14:13:20 2011
@@ -1,300 +1,161 @@
# Japanese Messages for GNU libc.
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2004, 2010, 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the glibc package.
# GOTO Masanori <gotom@xxxxxxxxxxxx>, 2000-2004.
-#
+# Yasuaki Taniguchi <yasuakit@xxxxxxxxx>, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: libc 2.3.3\n"
-"POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2004-12-18 02:22+0900\n"
-"Last-Translator: GOTO Masanori <gotom@xxxxxxxxxxxx>\n"
+"Project-Id-Version: libc 2.11.1\n"
+"POT-Creation-Date: 2009-02-06 12:40-0800\n"
+"PO-Revision-Date: 2011-01-08 15:24+0900\n"
+"Last-Translator: Yasuaki Taniguchi <yasuakit@xxxxxxxxx>\n"
"Language-Team: Japanese <translation-team-ja@xxxxxxxxxxxxxxxxxxxxx>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "¥Ï¥ó¥°¥¢¥Ã¥×"
-
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "³ä¤ê¹þ¤ß"
-
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "½ªÎ»"
-
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "ÉÔÀµ¤ÊÌ¿Îá¤Ç¤¹"
-
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr "¥È¥ì¡¼¥¹/¥Ö¥ì¥¤¥¯¥Ý¥¤¥ó¥È ¥È¥é¥Ã¥×"
-
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "¥¢¥Ü¡¼¥È¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "ÉâÆ°¾®¿ôÅÀ±é»»Îã³°¤Ç¤¹"
-
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "¶¯À©½ªÎ»"
-
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "¥Ð¥¹¥¨¥é¡¼"
-
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó°ãÈ¿¤Ç¤¹"
-
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
-#. TRANS Every library function that returns this error code also generates a
-#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
-#. TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
-#. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
-#: stdio-common/../sysdeps/unix/siglist.c:39
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
-msgid "Broken pipe"
-msgstr "¥Ñ¥¤¥×¤¬ÀÚÃǤµ¤ì¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "¥¢¥é¡¼¥à¥¯¥í¥Ã¥¯"
-
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "½ªÎ»¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr "¶ÛµÞI/O¾ò·ï"
-
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "Ää»ß¤·¤Þ¤·¤¿ (¥·¥°¥Ê¥ë)"
-
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "Ää»ß¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "·Ñ³"
-
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "»Ò¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "Ää»ß¤·¤Þ¤·¤¿ (üËöÆþÎÏ)"
-
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "Ää»ß¤·¤Þ¤·¤¿ (üËö½ÐÎÏ)"
-
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr "I/O²Äǽ¤Ç¤¹"
-
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "CPU»þ´ÖÀ©¸Â¤òĶ²á¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "¥Õ¥¡¥¤¥ë¥µ¥¤¥ºÀ©¸Â¤òĶ²á¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
-msgstr "²¾ÁÛ¥¿¥¤¥Þ¤¬½ªÎ»¤·¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
-msgstr "¥×¥í¥Õ¥¡¥¤¥ê¥ó¥°¥¿¥¤¥Þ¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr "¥¦¥£¥ó¥É¥¦¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
-
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
-msgstr "¥æ¡¼¥¶ÄêµÁ¥·¥°¥Ê¥ë 1"
-
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
-msgstr "¥æ¡¼¥¶ÄêµÁ¥·¥°¥Ê¥ë 2"
-
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
-msgstr "EMT ¥È¥é¥Ã¥×"
-
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
-msgstr "ÉÔÀµ¤Ê¥·¥¹¥Æ¥à¥³¡¼¥ë"
-
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
-msgstr "¥¹¥¿¥Ã¥¯¼ºÇÔ"
-
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
-msgstr "¾ðÊóÍ×µá"
-
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
-msgstr "ÅŸ»¾ã³²"
-
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
-msgstr "¥ê¥½¡¼¥¹¤¬¼º¤ï¤ì¤Þ¤·¤¿"
-
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
-msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼¥·¥¹¥Æ¥à¤Ç¤Î¥¨¥é¡¼:"
-
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
-msgstr "̤ÃΤΥ¨¥é¡¼ "
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
-#, c-format
-msgid "cannot open `%s'"
-msgstr "`%s'¤ò³«¤±¤Þ¤»¤ó"
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
-#, c-format
-msgid "cannot read header from `%s'"
-msgstr "`%s'¤Î¥Ø¥Ã¥À¤òÆɤá¤Þ¤»¤ó"
-
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
-#, c-format
-msgid "cannot open input file `%s'"
-msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë`%s'¤ò³«¤±¤Þ¤»¤ó"
-
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
-#, c-format
-msgid "error while closing input `%s'"
-msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òÊĤ¸¤Æ¤¤¤ë´Ö¤Î¥¨¥é¡¼"
-
-#: iconv/iconv_charmap.c:443
-#, c-format
-msgid "illegal input sequence at position %Zd"
-msgstr "°ÌÃÖ %Zd ¤ÇÉÔÀµ¤ÊÆþÎÏ¥·¡¼¥±¥ó¥¹¤¬¤¢¤ê¤Þ¤·¤¿"
-
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
-msgid "incomplete character or shift sequence at end of buffer"
-msgstr "¥Ð¥Ã¥Õ¥¡¤ÎºÇ¸å¤Ç¤Î°ìÃפ·¤Ê¤¤Ê¸»ú¤Þ¤¿¤Ï¥·¥Õ¥È¥·¡¼¥±¥ó¥¹¤Ç¤¹"
-
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
-#: iconv/iconv_prog.c:585
-msgid "error while reading the input"
-msgstr "ÆþÎÏÆɤ߹þ¤ßÃæ¤Î¥¨¥é¡¼"
-
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
-msgid "unable to allocate buffer for input"
-msgstr "ÆþÎÏÍѥХåե¡¤ò³ä¤êÅö¤Æ¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:61
-msgid "Input/Output format specification:"
-msgstr "ÆþÎÏ/½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î»ÅÍÍ:"
-
-#: iconv/iconv_prog.c:62
-msgid "encoding of original text"
-msgstr "¸µ¤Î¥Æ¥¥¹¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°"
-
-#: iconv/iconv_prog.c:63
-msgid "encoding for output"
-msgstr "½ÐÎÏ»þ¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°"
-
-#: iconv/iconv_prog.c:64
-msgid "Information:"
-msgstr "¾ðÊó:"
-
-#: iconv/iconv_prog.c:65
-msgid "list all known coded character sets"
-msgstr "´ûÃΤÎÁ´¥¥ã¥é¥¯¥¿¥»¥Ã¥È¤òɽ¼¨"
-
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
-msgid "Output control:"
-msgstr "½ÐÎÏÀ©¸æ:"
-
-#: iconv/iconv_prog.c:67
-msgid "omit invalid characters from output"
-msgstr "½ÐÎϤ«¤éÉÔÀµ¤Êʸ»ú¤òÈ´¤«¤¹"
-
-#: iconv/iconv_prog.c:68
-msgid "output file"
-msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë"
-
-#: iconv/iconv_prog.c:69
-msgid "suppress warnings"
-msgstr "·Ù¹ð¤ÎÍÞÀ©"
-
-#: iconv/iconv_prog.c:70
-msgid "print progress information"
-msgstr "·Ð²á¾ðÊó¤Îɽ¼¨"
-
-#: iconv/iconv_prog.c:75
-msgid "Convert encoding of given files from one encoding to another."
-msgstr "Í¿¤¨¤é¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÊÑ´¹¤¹¤ë."
-
-#: iconv/iconv_prog.c:79
-msgid "[FILE...]"
-msgstr "[¥Õ¥¡¥¤¥ë...]"
-
-#: iconv/iconv_prog.c:201
-msgid "cannot open output file"
-msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:243
-#, c-format
-msgid "conversions from `%s' and to `%s' are not supported"
-msgstr "`%s'¤«¤é¤ÎÊÑ´¹¤È`%s'¤Ø¤ÎÊÑ´¹¤Ï¤É¤Á¤é¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:248
-#, c-format
-msgid "conversion from `%s' is not supported"
-msgstr "`%s'¤«¤é¤ÎÊÑ´¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:255
-#, c-format
-msgid "conversion to `%s' is not supported"
-msgstr "`%s'¤Ø¤ÎÊÑ´¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:259
-#, c-format
-msgid "conversion from `%s' to `%s' is not supported"
-msgstr "`%s'¤«¤é`%s'¤Ø¤ÎÊÑ´¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: iconv/iconv_prog.c:265
-msgid "failed to start conversion processing"
-msgstr "ÊÑ´¹½èÍý¤Î³«»Ï¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: iconv/iconv_prog.c:360
-msgid "error while closing output file"
-msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÊĤ¸¤Æ¤¤¤ë´Ö¤Î¥¨¥é¡¼"
-
-#: iconv/iconv_prog.c:409 iconv/iconvconfig.c:357 locale/programs/locale.c:279
-#: locale/programs/localedef.c:372 catgets/gencat.c:233
-#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
-msgid "Report bugs using the `glibcbug' script to <bugs@xxxxxxx>.\n"
-msgstr "¥Ð¥°¤Ï¥¹¥¯¥ê¥×¥È`glibcbug'¤òÍѤ¤¤Æ<bugs@xxxxxxx>¤Þ¤ÇÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤.\n"
-
-#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:371 locale/programs/locale.c:292
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:913
-#: nss/getent.c:74 nscd/nscd.c:355 nscd/nscd_nischeck.c:90 elf/ldconfig.c:274
-#: elf/sprof.c:349
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: argp/argp-help.c:228
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: ARGP_HELP_FMT パラメータã«ã¯å€¤ãŒå¿…è¦ã§ã™"
+
+#: argp/argp-help.c:238
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: ä¸æ˜Žãª ARGP_HELP_FMT パラメータã§ã™"
+
+#: argp/argp-help.c:251
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "ARGP_HELP_FMT ä¸ã«ã”ã¿ãŒã‚ã‚Šã¾ã™: %s"
+
+#: argp/argp-help.c:1215
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "é•·ã„å½¢å¼ã®ã‚ªãƒ—ションã§å¿…é ˆã¾ãŸã¯ä»»æ„ã®å¼•æ•°ã¯ã€ãã‚Œã«å¯¾å¿œã™ã‚‹çŸã„å½¢å¼ã®ã‚ªãƒ—ションã§ã‚‚åŒæ§˜ã«å¿…é ˆã¾ãŸã¯ä»»æ„ã§ã™ã€‚"
+
+#: argp/argp-help.c:1601
+msgid "Usage:"
+msgstr "使用法:"
+
+#: argp/argp-help.c:1605
+msgid " or: "
+msgstr "ã¾ãŸã¯: "
+
+#: argp/argp-help.c:1617
+msgid " [OPTION...]"
+msgstr " [OPTION...]"
+
+#: argp/argp-help.c:1644
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "詳細㯠`%s --help' ã¾ãŸã¯ `%s --usage' を実行ã—ã¦ä¸‹ã•ã„。\n"
+
+#: argp/argp-help.c:1672
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr ""
+"ãƒã‚°ã‚’発見ã—ãŸã‚‰ <%s> ã«å ±å‘Šã—ã¦ä¸‹ã•ã„。\n"
+"翻訳ã«é–¢ã™ã‚‹ãƒã‚°ã¯<translation-team-ja@xxxxxxxxxxxxxxxxxxxxx>ã«å ±å‘Šã—ã¦ãã ã•ã„。\n"
+
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—一覧を表示ã™ã‚‹"
+
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "çŸã„使用方法を表示ã™ã‚‹"
+
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "プãƒã‚°ãƒ©ãƒ åã‚’è¨å®šã™ã‚‹"
+
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "SECS 秒ã§ãƒãƒ³ã‚°ã‚¢ãƒƒãƒ—ã™ã‚‹ (デフォルト 3600)"
+
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "プãƒã‚°ãƒ©ãƒ ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹"
+
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(プãƒã‚°ãƒ©ãƒ エラー) ä¸æ˜Žãªãƒãƒ¼ã‚¸ãƒ§ãƒ³!?"
+
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: 引数ãŒå¤šã™ãŽã¾ã™\n"
+
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(プãƒã‚°ãƒ©ãƒ エラー) オプションã¯èªè˜ã•ã‚Œã¦ã„ã‚‹ã¹ãã§ã™!?"
+
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%s予期ã—ãªã„エラーã§ã™: %s。\n"
+
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%sアサーション `%s' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚\n"
+
+#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61
+msgid "NAME"
+msgstr "åå‰"
+
+#: catgets/gencat.c:111
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "シンボル定義をå«ã‚“ã C ヘッダファイル NAME を作æˆã™ã‚‹"
+
+#: catgets/gencat.c:113
+msgid "Do not use existing catalog, force new output file"
+msgstr "æ—¢å˜ã®ã‚«ã‚¿ãƒã‚°ã‚’使用ã›ãšã€å¼·åˆ¶çš„ã«æ–°ã—ã„出力ファイルã«ã™ã‚‹"
+
+#: catgets/gencat.c:114 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "出力をファイル NAME ã«æ›¸ã込む"
+
+#: catgets/gencat.c:119
+msgid ""
+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+"メッセージカタãƒã‚°ã‚’生æˆã™ã‚‹ã€‚INPUT-FILE ㌠- ã®å ´åˆã€å…¥åŠ›ã‚’標準入力ã‹ã‚‰èªã¿è¾¼ã‚€ã€‚OUTPUT-FILE\n"
+"㌠- ã®å ´åˆã€å‡ºåŠ›ã‚’標準出力ã«æ›¸ã込む。\n"
+
+#: catgets/gencat.c:124
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+
+#: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58
+#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sprof.c:360
+#: iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 locale/programs/locale.c:278
+#: locale/programs/localedef.c:371 login/programs/pt_chown.c:88
+#: malloc/memusage.sh:65 malloc/memusagestat.c:533 nscd/nscd.c:415
+#: nss/getent.c:842 nss/makedb.c:231 posix/getconf.c:1030
+#: sunrpc/rpc_main.c:1494 sunrpc/rpcinfo.c:699
+#: sysdeps/unix/sysv/linux/lddlibc4.c:62
+#, c-format
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+"ãƒã‚°ã‚’å ±å‘Šã™ã‚‹æ–¹æ³•ã«é–¢ã—ã¦ã¯ã€ä¸‹è¨˜ã‚’å‚ç…§ã—ã¦ãã ã•ã„:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+
+#: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66
+#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sprof.c:375
+#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:73 malloc/memusagestat.c:551 nscd/nscd.c:429
+#: nss/getent.c:81 nss/makedb.c:245 posix/getconf.c:1012
+#: sysdeps/unix/sysv/linux/lddlibc4.c:69
#, c-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -304,36 +165,1148 @@
"Copyright (C) %s Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ÍøÍѵöÂú¤Ë¤Ä¤¤¤Æ¤Ï¥½¡¼¥¹¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
-"¾¦¶ÈÀ¤äÆÃÄê¤ÎÌÜŪ¤Ø¤ÎŬ¹çÀ¤ÎÇ¡²¿¤Ë´Ø¤ï¤é¤º¡¢ÌµÊݾڤǤ¹¡£ \n"
-
-#: iconv/iconv_prog.c:428 iconv/iconvconfig.c:376 locale/programs/locale.c:297
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:918
-#: nss/getent.c:79 nscd/nscd.c:360 nscd/nscd_nischeck.c:95 elf/ldconfig.c:279
-#: elf/sprof.c:355
+
+#: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70
+#: elf/ldconfig.c:321 elf/sprof.c:381 iconv/iconv_prog.c:428
[... 13411 lines stripped ...]