about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog362
-rw-r--r--MakeTAGS191
-rw-r--r--Makeconfig6
-rw-r--r--Makefile13
-rw-r--r--Makerules30
-rw-r--r--Rules6
-rw-r--r--WUR-REPORT2
-rwxr-xr-xconfigure8
-rw-r--r--configure.in6
-rw-r--r--elf/tst-tls8.c4
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in17
-rw-r--r--include/sys/sysinfo.h3
-rw-r--r--manual/Makefile7
-rw-r--r--manual/maint.texi10
-rw-r--r--nptl/ChangeLog32
-rw-r--r--nptl/sysdeps/pthread/aio_misc.h5
-rw-r--r--nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h2
-rw-r--r--po/.cvsignore65
-rw-r--r--po/Makefile27
-rw-r--r--po/libc.pot6202
-rw-r--r--posix/Makefile3
-rw-r--r--posix/get_child_max.c29
-rwxr-xr-xscripts/check-c++-types.sh11
-rw-r--r--scripts/data/c++-types-alpha-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-i386-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-ia64-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-powerpc-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-powerpc64-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-s390-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-s390x-linux-gnu.data9
-rw-r--r--scripts/data/c++-types-sparc-linux-gnu.data67
-rw-r--r--scripts/data/c++-types-sparc64-linux-gnu.data67
-rw-r--r--scripts/data/c++-types-x86_64-linux-gnu.data9
-rwxr-xr-xscripts/list-sources.sh35
-rw-r--r--stdio-common/printf-parsemb.c5
-rw-r--r--stdio-common/tst-fmemopen2.c2
-rw-r--r--stdio-common/tstdiomisc.c21
-rw-r--r--sysdeps/alpha/Dist11
-rw-r--r--sysdeps/alpha/soft-fp/Dist14
-rw-r--r--sysdeps/generic/Dist23
-rw-r--r--sysdeps/generic/sysdep.h2
-rw-r--r--sysdeps/gnu/Dist8
-rw-r--r--sysdeps/hppa/Dist5
-rw-r--r--sysdeps/i386/Dist4
-rw-r--r--sysdeps/i386/i686/Dist1
-rw-r--r--sysdeps/i386/soft-fp/Dist1
-rw-r--r--sysdeps/ia64/Dist9
-rw-r--r--sysdeps/ia64/fpu/Dist11
-rw-r--r--sysdeps/ieee754/Dist2
-rw-r--r--sysdeps/ieee754/dbl-64/Dist33
-rw-r--r--sysdeps/ieee754/flt-32/Dist1
-rw-r--r--sysdeps/ieee754/ldbl-128/Dist2
-rw-r--r--sysdeps/m68k/fpu/Dist1
-rw-r--r--sysdeps/m68k/fpu/switch/Dist2
-rw-r--r--sysdeps/mach/hurd/Dist17
-rw-r--r--sysdeps/mach/hurd/alpha/Dist1
-rw-r--r--sysdeps/mach/hurd/bits/ioctls.h1
-rw-r--r--sysdeps/mach/hurd/i386/Dist3
-rw-r--r--sysdeps/mach/hurd/mips/Dist3
-rw-r--r--sysdeps/mach/hurd/powerpc/Dist1
-rw-r--r--sysdeps/mach/mips/Dist1
-rw-r--r--sysdeps/mips/Dist8
-rw-r--r--sysdeps/mips/mips64/Dist1
-rw-r--r--sysdeps/mips/mips64/soft-fp/Dist1
-rw-r--r--sysdeps/mips/soft-fp/Dist1
-rw-r--r--sysdeps/posix/Dist1
-rw-r--r--sysdeps/posix/sysconf.c6
-rw-r--r--sysdeps/powerpc/Dist2
-rw-r--r--sysdeps/powerpc/fpu/Dist4
-rw-r--r--sysdeps/powerpc/powerpc32/Dist9
-rw-r--r--sysdeps/powerpc/powerpc32/dl-trampoline.S22
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/Dist2
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S9
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_ceil.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_ceilf.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_copysign.S7
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_floor.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_floorf.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_lround.S15
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_rint.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_rintf.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_round.S8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_roundf.S8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_trunc.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_truncf.S11
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/setjmp-common.S11
-rw-r--r--sysdeps/powerpc/powerpc32/lshift.S10
-rw-r--r--sysdeps/powerpc/powerpc32/ppc-mcount.S8
-rw-r--r--sysdeps/powerpc/powerpc64/Dist4
-rw-r--r--sysdeps/powerpc/powerpc64/dl-trampoline.S10
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/s_copysign.S4
-rw-r--r--sysdeps/powerpc/powerpc64/ppc-mcount.S8
-rw-r--r--sysdeps/powerpc/soft-fp/Dist28
-rw-r--r--sysdeps/s390/Dist3
-rw-r--r--sysdeps/s390/s390-32/Dist1
-rw-r--r--sysdeps/s390/s390-64/Dist1
-rw-r--r--sysdeps/sh/Dist2
-rw-r--r--sysdeps/sparc/Dist1
-rw-r--r--sysdeps/sparc/sparc32/Dist9
-rw-r--r--sysdeps/sparc/sparc32/soft-fp/Dist28
-rw-r--r--sysdeps/sparc/sparc32/sparcv8/Dist6
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/Dist7
-rw-r--r--sysdeps/sparc/sparc64/Dist1
-rw-r--r--sysdeps/sparc/sparc64/soft-fp/Dist32
-rw-r--r--sysdeps/unix/Dist14
-rw-r--r--sysdeps/unix/bsd/Dist5
-rw-r--r--sysdeps/unix/bsd/bsd4.4/Dist1
-rw-r--r--sysdeps/unix/common/Dist1
-rw-r--r--sysdeps/unix/get_child_max.c37
-rw-r--r--sysdeps/unix/sysv/Dist2
-rw-r--r--sysdeps/unix/sysv/linux/Dist85
-rw-r--r--sysdeps/unix/sysv/linux/alpha/Dist19
-rw-r--r--sysdeps/unix/sysv/linux/alpha/adjtime.c4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/dl-sysdep.c9
-rw-r--r--sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/getitimer.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/getrusage.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/gettimeofday.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/msgctl.c4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/select.S6
-rw-r--r--sysdeps/unix/sysv/linux/alpha/semctl.c5
-rw-r--r--sysdeps/unix/sysv/linux/alpha/setitimer.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/settimeofday.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/shmctl.c4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/utimes.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/wait4.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/xstatconv.h4
-rw-r--r--sysdeps/unix/sysv/linux/check_pf.c4
-rw-r--r--sysdeps/unix/sysv/linux/clock_getcpuclockid.c4
-rw-r--r--sysdeps/unix/sysv/linux/clock_getres.c5
-rw-r--r--sysdeps/unix/sysv/linux/clock_gettime.c4
-rw-r--r--sysdeps/unix/sysv/linux/clock_nanosleep.c4
-rw-r--r--sysdeps/unix/sysv/linux/clock_settime.c4
-rw-r--r--sysdeps/unix/sysv/linux/dl-execstack.c4
-rw-r--r--sysdeps/unix/sysv/linux/dl-osinfo.h4
-rw-r--r--sysdeps/unix/sysv/linux/dl-sysdep.c4
-rw-r--r--sysdeps/unix/sysv/linux/fstatvfs64.c5
-rw-r--r--sysdeps/unix/sysv/linux/ftruncate64.c5
-rw-r--r--sysdeps/unix/sysv/linux/futimes.c7
-rw-r--r--sysdeps/unix/sysv/linux/futimesat.c4
-rw-r--r--sysdeps/unix/sysv/linux/fxstat64.c4
-rw-r--r--sysdeps/unix/sysv/linux/fxstatat64.c4
-rw-r--r--sysdeps/unix/sysv/linux/getcwd.c5
-rw-r--r--sysdeps/unix/sysv/linux/getdents.c4
-rw-r--r--sysdeps/unix/sysv/linux/hppa/Dist5
-rw-r--r--sysdeps/unix/sysv/linux/i386/Dist17
-rw-r--r--sysdeps/unix/sysv/linux/i386/chown.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/fchown.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/fchownat.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/fcntl.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/fxstat.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/fxstatat.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getegid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/geteuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getgid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getresgid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getresuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getrlimit.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/getuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/lchown.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/lockf64.c6
-rw-r--r--sysdeps/unix/sysv/linux/i386/lxstat.c6
-rw-r--r--sysdeps/unix/sysv/linux/i386/mmap.S5
-rw-r--r--sysdeps/unix/sysv/linux/i386/mmap64.S5
-rw-r--r--sysdeps/unix/sysv/linux/i386/msgctl.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/posix_fadvise64.S5
-rw-r--r--sysdeps/unix/sysv/linux/i386/semctl.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/setegid.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/seteuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setfsgid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setfsuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setgid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setgroups.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setregid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresgid.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/setresuid.c5
-rw-r--r--sysdeps/unix/sysv/linux/i386/setreuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setrlimit.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/setuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/shmctl.c4
-rw-r--r--sysdeps/unix/sysv/linux/i386/xstat.c5
-rw-r--r--sysdeps/unix/sysv/linux/ia64/Dist13
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sysdep.h5
-rw-r--r--sysdeps/unix/sysv/linux/ifreq.c4
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h9
-rw-r--r--sysdeps/unix/sysv/linux/ldsodefs.h4
-rw-r--r--sysdeps/unix/sysv/linux/lxstat64.c4
-rw-r--r--sysdeps/unix/sysv/linux/m68k/Dist9
-rw-r--r--sysdeps/unix/sysv/linux/m68k/chown.c4
-rw-r--r--sysdeps/unix/sysv/linux/m68k/fchownat.c4
-rw-r--r--sysdeps/unix/sysv/linux/mips/Dist13
-rw-r--r--sysdeps/unix/sysv/linux/mips/ftruncate64.c6
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/mips/sigaction.c6
-rw-r--r--sysdeps/unix/sysv/linux/mips/truncate64.c6
-rw-r--r--sysdeps/unix/sysv/linux/mmap64.c4
-rw-r--r--sysdeps/unix/sysv/linux/msgctl.c6
-rw-r--r--sysdeps/unix/sysv/linux/netlinkaccess.h4
-rw-r--r--sysdeps/unix/sysv/linux/opendir.c4
-rw-r--r--sysdeps/unix/sysv/linux/poll.c5
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/Dist8
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/aix/Dist7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S16
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S10
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c8
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S9
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c5
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S15
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S12
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c8
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S14
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S12
-rw-r--r--sysdeps/unix/sysv/linux/pread.c4
-rw-r--r--sysdeps/unix/sysv/linux/pread64.c5
-rw-r--r--sysdeps/unix/sysv/linux/prof-freq.c4
-rw-r--r--sysdeps/unix/sysv/linux/pwrite.c4
-rw-r--r--sysdeps/unix/sysv/linux/pwrite64.c5
-rw-r--r--sysdeps/unix/sysv/linux/s390/Dist4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/Dist7
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/chown.c4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/lchown.c4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/Dist2
-rw-r--r--sysdeps/unix/sysv/linux/semctl.c6
-rw-r--r--sysdeps/unix/sysv/linux/setegid.c4
-rw-r--r--sysdeps/unix/sysv/linux/seteuid.c4
-rw-r--r--sysdeps/unix/sysv/linux/sh/Dist8
-rw-r--r--sysdeps/unix/sysv/linux/shmctl.c6
-rw-r--r--sysdeps/unix/sysv/linux/sigaction.c4
-rw-r--r--sysdeps/unix/sysv/linux/sigpending.c5
-rw-r--r--sysdeps/unix/sysv/linux/sigprocmask.c4
-rw-r--r--sysdeps/unix/sysv/linux/sigsuspend.c6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/Dist4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/setjmp.h2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/stat.h41
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/Dist4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/Dist7
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h46
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h10
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c9
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c127
-rw-r--r--sysdeps/unix/sysv/linux/statvfs64.c4
-rw-r--r--sysdeps/unix/sysv/linux/syslog.c2
-rw-r--r--sysdeps/unix/sysv/linux/testrtsig.h4
-rw-r--r--sysdeps/unix/sysv/linux/truncate64.c5
-rw-r--r--sysdeps/unix/sysv/linux/utimes.c4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/Dist11
-rw-r--r--sysdeps/unix/sysv/linux/xstat64.c4
-rw-r--r--sysdeps/unix/sysv/linux/xstatconv.h5
-rw-r--r--sysdeps/wordsize-32/Dist1
-rw-r--r--sysdeps/x86_64/Dist4
-rw-r--r--sysdeps/x86_64/soft-fp/Dist1
280 files changed, 4732 insertions, 4341 deletions
diff --git a/ChangeLog b/ChangeLog
index ef35a95bcf..fd1b7aec42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,367 @@
+2006-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/bits/setjmp.h (_JMPBUF_UNWINDS): Add
+	stack bias to mc_fp field.
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
+	(struct kernel_stat): Rename st_[amc]time fields to st_[amc]time_sec.
+	(struct kernel_stat64): New type.
+	(_HAVE___UNUSED1, _HAVE___UNUSED2, _HAVE_STAT___UNUSED1,
+	_HAVE_STAT___UNUSED2, _HAVE_STAT___UNUSED3, _HAVE_STAT___UNUSED4,
+	_HAVE_STAT___UNUSED5, _HAVE_STAT___PAD1, _HAVE_STAT___PAD2,
+	_HAVE_STAT64___UNUSED1, _HAVE_STAT64___UNUSED2,
+	_HAVE_STAT64___UNUSED3, _HAVE_STAT64___UNUSED4,
+	_HAVE_STAT64___UNUSED5, _HAVE_STAT64___PAD1, _HAVE_STAT64___PAD2):
+	Remove.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c: Use i386/xstat.c.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c:
+	Use i386/fxstatat.c.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c: Use i386/lxstat.c.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: New file.
+	* sysdeps/unix/sysv/linux/sparc/bits/stat.h (struct stat,
+	struct stat64): Add nsec resolution for 64-bit code like already done
+	for 32-bit code.
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	(__ASSUME_TRUNCATE64_SYSCALL, __ASSUME_MMAP2_SYSCALL): Don't define
+	for sparc64.
+	(__ASSUME_STAT64_SYSCALL): Only define for sparc64 for >= 2.6.12
+	kernels.
+
+	* scripts/data/c++-types-sparc-linux-gnu.data: New file.
+	* scripts/data/c++-types-sparc64-linux-gnu.data: New file.
+	* scripts/data/c++-types-alpha-linux-gnu.data: Adjust.
+
+2006-01-08  Roland McGrath  <roland@redhat.com>
+
+	[BZ #1535]
+	* sysdeps/unix/get_child_max.c: New file.
+	* posix/get_child_max.c: New file.
+	* posix/Makefile (routines): Add it.
+	* include/sys/sysinfo.h (__get_child_max): Declare it.
+	* sysdeps/posix/sysconf.c (__sysconf) [! CHILD_MAX]: Use it.
+
+	* sysdeps/unix/sysv/linux/futimes.c [!__NR_fcntl && __NR_fcntl64]: Use
+	fcntl64 syscall instead.
+
+	* stdio-common/tst-fmemopen2.c (do_test): Add a cast.
+	* stdio-common/printf-parsemb.c (__find_specmb): Likewise.
+
+	* sysdeps/unix/sysv/linux/alpha/adjtime.c: Use <> instead of "" in
+	#include for kernel-features.h.
+	* sysdeps/unix/sysv/linux/alpha/dl-sysdep.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/getitimer.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/getrusage.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/gettimeofday.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/msgctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/select.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/semctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/setitimer.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/settimeofday.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/shmctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/utimes.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/wait4.S: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise.
+	* sysdeps/unix/sysv/linux/check_pf.c: Likewise.
+	* sysdeps/unix/sysv/linux/clock_getcpuclockid.c: Likewise.
+	* sysdeps/unix/sysv/linux/clock_getres.c: Likewise.
+	* sysdeps/unix/sysv/linux/clock_gettime.c: Likewise.
+	* sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise.
+	* sysdeps/unix/sysv/linux/clock_settime.c: Likewise.
+	* sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
+	* sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise.
+	* sysdeps/unix/sysv/linux/dl-sysdep.c: Likewise.
+	* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
+	* sysdeps/unix/sysv/linux/ftruncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/futimes.c: Likewise.
+	* sysdeps/unix/sysv/linux/futimesat.c: Likewise.
+	* sysdeps/unix/sysv/linux/fxstat64.c: Likewise.
+	* sysdeps/unix/sysv/linux/fxstatat64.c: Likewise.
+	* sysdeps/unix/sysv/linux/getcwd.c: Likewise.
+	* sysdeps/unix/sysv/linux/getdents.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/chown.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fchown.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fchownat.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fxstatat.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getegid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/geteuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getresgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getresuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getrlimit.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/getuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/lchown.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/lockf64.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/mmap.S: Likewise.
+	* sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise.
+	* sysdeps/unix/sysv/linux/i386/msgctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Likewise.
+	* sysdeps/unix/sysv/linux/i386/semctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setegid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/seteuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setfsuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setregid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setresgid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setreuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setrlimit.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/shmctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/xstat.c: Likewise.
+	* sysdeps/unix/sysv/linux/ifreq.c: Likewise.
+	* sysdeps/unix/sysv/linux/ldsodefs.h: Likewise.
+	* sysdeps/unix/sysv/linux/lxstat64.c: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/chown.c: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/fchownat.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/ftruncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/mmap64.c: Likewise.
+	* sysdeps/unix/sysv/linux/msgctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/netlinkaccess.h: Likewise.
+	* sysdeps/unix/sysv/linux/opendir.c: Likewise.
+	* sysdeps/unix/sysv/linux/poll.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise.
+	* sysdeps/unix/sysv/linux/pread.c: Likewise.
+	* sysdeps/unix/sysv/linux/pread64.c: Likewise.
+	* sysdeps/unix/sysv/linux/prof-freq.c: Likewise.
+	* sysdeps/unix/sysv/linux/pwrite.c: Likewise.
+	* sysdeps/unix/sysv/linux/pwrite64.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/chown.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/lchown.c: Likewise.
+	* sysdeps/unix/sysv/linux/semctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/setegid.c: Likewise.
+	* sysdeps/unix/sysv/linux/seteuid.c: Likewise.
+	* sysdeps/unix/sysv/linux/shmctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/sigaction.c: Likewise.
+	* sysdeps/unix/sysv/linux/sigpending.c: Likewise.
+	* sysdeps/unix/sysv/linux/sigprocmask.c: Likewise.
+	* sysdeps/unix/sysv/linux/sigsuspend.c: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c: Likewise.
+	* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
+	* sysdeps/unix/sysv/linux/syslog.c: Likewise.
+	* sysdeps/unix/sysv/linux/testrtsig.h: Likewise.
+	* sysdeps/unix/sysv/linux/truncate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/utimes.c: Likewise.
+	* sysdeps/unix/sysv/linux/xstat64.c: Likewise.
+	* sysdeps/unix/sysv/linux/xstatconv.h: Likewise.
+
+2006-01-07  Roland McGrath  <roland@redhat.com>
+
+	* po/libc.pot: Regenerated.
+
+	* po/.cvsignore: List libc.pot.files, and not any .pot names.
+
+	* manual/maint.texi (Porting): Don't mention Dist files.
+	* sysdeps/alpha/soft-fp/Dist: File removed.
+	* sysdeps/alpha/Dist: File removed.
+	* sysdeps/i386/i686/Dist: File removed.
+	* sysdeps/i386/soft-fp/Dist: File removed.
+	* sysdeps/i386/Dist: File removed.
+	* sysdeps/mips/soft-fp/Dist: File removed.
+	* sysdeps/mips/mips64/soft-fp/Dist: File removed.
+	* sysdeps/mips/mips64/Dist: File removed.
+	* sysdeps/mips/Dist: File removed.
+	* sysdeps/wordsize-32/Dist: File removed.
+	* sysdeps/m68k/fpu/switch/Dist: File removed.
+	* sysdeps/m68k/fpu/Dist: File removed.
+	* sysdeps/powerpc/powerpc64/Dist: File removed.
+	* sysdeps/powerpc/soft-fp/Dist: File removed.
+	* sysdeps/powerpc/powerpc32/fpu/Dist: File removed.
+	* sysdeps/powerpc/powerpc32/Dist: File removed.
+	* sysdeps/powerpc/fpu/Dist: File removed.
+	* sysdeps/powerpc/Dist: File removed.
+	* sysdeps/unix/common/Dist: File removed.
+	* sysdeps/unix/bsd/bsd4.4/Dist: File removed.
+	* sysdeps/unix/bsd/Dist: File removed.
+	* sysdeps/unix/sysv/linux/alpha/Dist: File removed.
+	* sysdeps/unix/sysv/linux/i386/Dist: File removed.
+	* sysdeps/unix/sysv/linux/mips/mips64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/mips/Dist: File removed.
+	* sysdeps/unix/sysv/linux/m68k/Dist: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/aix/Dist: File removed.
+	* sysdeps/unix/sysv/linux/powerpc/Dist: File removed.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/Dist: File removed.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/sparc/Dist: File removed.
+	* sysdeps/unix/sysv/linux/ia64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/s390/Dist: File removed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/Dist: File removed.
+	* sysdeps/unix/sysv/linux/sh/Dist: File removed.
+	* sysdeps/unix/sysv/linux/x86_64/Dist: File removed.
+	* sysdeps/unix/sysv/linux/hppa/Dist: File removed.
+	* sysdeps/unix/sysv/linux/Dist: File removed.
+	* sysdeps/unix/sysv/Dist: File removed.
+	* sysdeps/unix/Dist: File removed.
+	* sysdeps/generic/Dist: File removed.
+	* sysdeps/sparc/sparc32/soft-fp/Dist: File removed.
+	* sysdeps/sparc/sparc32/sparcv9/Dist: File removed.
+	* sysdeps/sparc/sparc32/sparcv8/Dist: File removed.
+	* sysdeps/sparc/sparc32/Dist: File removed.
+	* sysdeps/sparc/sparc64/soft-fp/Dist: File removed.
+	* sysdeps/sparc/sparc64/Dist: File removed.
+	* sysdeps/sparc/Dist: File removed.
+	* sysdeps/gnu/Dist: File removed.
+	* sysdeps/ia64/fpu/Dist: File removed.
+	* sysdeps/ia64/Dist: File removed.
+	* sysdeps/mach/mips/Dist: File removed.
+	* sysdeps/mach/hurd/alpha/Dist: File removed.
+	* sysdeps/mach/hurd/i386/Dist: File removed.
+	* sysdeps/mach/hurd/mips/Dist: File removed.
+	* sysdeps/mach/hurd/powerpc/Dist: File removed.
+	* sysdeps/mach/hurd/Dist: File removed.
+	* sysdeps/s390/s390-64/Dist: File removed.
+	* sysdeps/s390/Dist: File removed.
+	* sysdeps/s390/s390-32/Dist: File removed.
+	* sysdeps/sh/Dist: File removed.
+	* sysdeps/posix/Dist: File removed.
+	* sysdeps/ieee754/dbl-64/Dist: File removed.
+	* sysdeps/ieee754/ldbl-128/Dist: File removed.
+	* sysdeps/ieee754/flt-32/Dist: File removed.
+	* sysdeps/ieee754/Dist: File removed.
+	* sysdeps/x86_64/soft-fp/Dist: File removed.
+	* sysdeps/x86_64/Dist: File removed.
+	* sysdeps/hppa/Dist: File removed.
+
+	* Makerules (common-clean): Don't remove distinfo file.
+	($(objpfx)distinfo): Target removed.
+	* manual/Makefile (mostlyclean): Don't remove distinfo file.
+	(glibc-targets): Remove echo-distinfo.
+
+	* scripts/list-sources.sh: New file.
+	* Makefile (TAGS): New target.
+	* po/Makefile (libc.pot, libc.pot.files): New targets.
+	* Makeconfig (XGETTEXT): New variable.
+	* Makerules ($(..)po/%.pot): Rule removed.
+	(TAGS): Target removed.
+	* Rules (subdir_TAGS): Target removed.
+	* MakeTAGS: File removed.
+
+	* Makefile (iconvdata/% localedata/% po/% manual/%): Depend on FORCE.
+	* Makeconfig ($(all-Depend-files)): New targets with no-op commands.
+
+2004-08-03  Marco Gerards  <marco@gnu.org>
+
+	[BZ #2119]
+	* sysdeps/mach/hurd/bits/ioctls.h (SIOCGIFHWADDR): New macro.
+
+2006-01-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/tstdiomisc.c (F): Use NAN to get NaN value.
+
 2006-01-06  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/tst-tls8.c (do_test): Use $ORIGIN in module names.
+
+2006-01-03  Steven Munroe  <sjmunroe@us.ibm.com>
+
+	* sysdeps/generic/sysdep.h (cfi_same_value): Define macro.
+
+	* sysdeps/powerpc/powerpc32/dl-trampoline.S (_dl_runtime_resolve,
+	_dl_profile_resolve): Add CFI directives for stack and LR save.
+	Save LR in LRSAVE of previous frame per ABI.
+	* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Add CFI directives
+	for LR save.
+	* sysdeps/powerpc/powerpc32/lshift.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
+	(__makecontext, __novec_makecontext): Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_ceil.S: Add CFI directive
+	for LR save to register.
+	* sysdeps/powerpc/powerpc32/fpu/s_ceilf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_floor.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_floorf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_rint.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_rintf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_round.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_roundf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_trunc.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_truncf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_copysign.S: Add CFI directive
+	for stack.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise.
+	* sysdeps/powerpc/powerpc32/ppc-mcount.S: Add CFI directives for stack
+	and LR save.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/fpu/s_lround.S:  Likewise.  Don't use
+	negative stack addressing.
+
+	* sysdeps/powerpc/powerpc64/dl-trampoline.S (_dl_runtime_resolve,
+	_dl_profile_resolve): Add CFI directives for stack and LR save.
+	* sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Add CFI directives
+	for stack.
+	* sysdeps/powerpc/powerpc64/ppc-mcount.S (_mcount): Add CFI
+	directives for stack and LR save.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S (__brk): Add CFI
+	directives for stack.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S (__clone): Add CFI
+	directives for stack.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S
+	(__getcontext, __novec_getcontext): Add CFI directives for stack
+	and LR save.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
+	(__makecontext): Add CFI directives for stack and LR save.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
+	(__setcontext, __novec_setcontext): Add CFI directives for stack
+	and LR save.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
+	(__swapcontext, __novec_swapcontext):  Add CFI directives for stack
+	and LR save.
+
+2006-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Include tls.h.
+	(SYSCALL_ERROR_HANDLER_ENTRY): Use %g4 instead of %g2, to avoid
+	the need of .register directive for it.
+	* configure.in (libc_cv_asm_cfi_directives): Use CFI rel offset
+	2047 instead of 0 in the test on sparc64.
+
+2006-01-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* scripts/check-c++-types.sh: Add more pthread types.
+	* scripts/data//c++-types-i386-linux-gnu.data: Adjust.
+	* scripts/data//c++-types-ia64-linux-gnu.data: Likewise.
+	* scripts/data//c++-types-powerpc-linux-gnu.data: Likewise.
+	* scripts/data//c++-types-powerpc64-linux-gnu.data: Likewise.
+	* scripts/data//c++-types-s390-linux-gnu.data: Likewise.
+	* scripts/data//c++-types-s390x-linux-gnu.data: Likewise.
+	* scripts/data//c++-types-x86_64-linux-gnu.data: Likewise.
+
+	* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL_NCS):
+	Adjust for private->__private rename in tcbhead_t.
+
 	[BZ #2114]
 	* ncsd/aicache.c: Don't use sendfile for records on the stack.
 	* nscd/grpcache.c: Likewise.
diff --git a/MakeTAGS b/MakeTAGS
deleted file mode 100644
index 1ffdd64000..0000000000
--- a/MakeTAGS
+++ /dev/null
@@ -1,191 +0,0 @@
-# Make the TAGS files.
-# Copyright (C) 1992,1994,1995,1996,1998,2002,2003,2005
-#	Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-# Make this the default goal.
-TAGS:
-
-ifdef subdir
-.. := ../
-endif
-
-include $(..)Makeconfig
-
-# Pass these to $(MAKE) calls to avoid source generation and such.
-sub-make-vars = generating=t no_deps=t
-
-ifndef tags_sources
-ifeq ($(subdir),ctype)
-# In most cases, we want the C source files to come before
-# the header files so tags for optimizing #define's in the
-# headers won't be put in the tags files, but for ctype,
-# the functions are just backup for the #define's in the header.
-tags_sources = $(all-headers) $(all-sources) $(all-dist)
-else	# Not ctype.
-tags_sources = $(all-sources) $(all-headers) $(all-dist)
-endif	# ctype
-endif	# No tags_sources
-
-sysdep-dirs := $(full_config_sysdirs)
-
-ifndef sysdep_dirs
-# Find all sysdep directories.
-sysdep_dirs := $(shell find $(..)sysdeps \
-			    $(wildcard \
-				$(patsubst %,$(..)%/sysdeps,$(add-ons))) \
-			    -type d ! -name RCS ! -name CVS \
-			    ! -name SCCS -print)
-endif
-
-# Find all sysdep dirs there are, but putting the ones
-# we are configured to use first and preserving their order.
-all-dirs := $(subdir-dirs) \
-	    $(objdir) \
-	    $(sysdep-dirs) \
-	    $(source_dirs) \
-	    $(filter-out $(sysdep-dirs),$(sysdep_dirs))
-
-# Find all the subdirs there are, but putting the ones
-# we are configured to use first and preserving their order.
-ifndef subdir
-subdirs := $(subdirs) \
-	   $(filter-out $(subdirs),\
-			$(sort \
-			  $(shell sed -e 's/\#.*$$//' \
-				      $(wildcard $(addsuffix /Subdirs,\
-							     $(all-dirs)))\
-				      /dev/null)))
-all-dist = $(foreach Dist,$(wildcard $(all-dirs:%=%/Dist)),\
-		     $(addprefix $(Dist:%/Dist=%)/,\
-				 $(filter %.c %.h %.S %.s,\
-					  $(shell cat $(Dist)))))
-tags_sources = $(all-sources) $(all-headers) $(all-dist)
-else
-all-dist = $(distribute)
-endif
-
-# sources and headers must be simply expanded variables
-sources := $(sources) $(filter %.c %.s %.S,$(all-dist))
-headers := $(headers) $(filter %.h,$(all-dist))
-all-dist := $(filter-out %.h %.c %.s %.S,$(all-dist))
-
-sources += $(foreach lib,$(extra-libs),$($(lib)-routines:=.c))
-
-# All different versions of $(sources), preserving the configured sysdep
-# directory order.
-# Files that are found in the current directory cannot occur in
-# sysdep directories, so don't bother searching them.
-sysdep-sources := $(filter-out $(wildcard $(sources)), $(sources))
-all-sources = $(wildcard $(sort $(sources) $(sources:.c=.S) $(sources:.c=.s)  \
-				$(others:=.c) $(tests:=.c) $(xtests:=.c) \
-				$(test-srcs:=.c))) \
-	      $(foreach dir,$(all-dirs),\
-			$(wildcard \
-			   $(addprefix $(dir)/,\
-				       $(sort $(sysdep-sources) \
-					      $(sysdep-sources:.c=.S) \
-					      $(sysdep-sources:.c=.s)))))
-
-sysdep-headers := $(filter-out $(wildcard $(headers)), $(headers))
-all-headers = $(wildcard $(headers)) \
-	      $(foreach dir,$(all-dirs),\
-			$(wildcard $(addprefix $(dir)/,$(sysdep-headers))))
-
-tags_sources := $(strip $(tags_sources))
-
-TAGS: $(tags_sources)
-ifdef subdir
-ifdef tags_sources
-	$(ETAGS) -o $@ $^
-else
-# No sources.  Create a dummy file.
-	touch $@
-endif # tags_sources
-else # parent
-TAGS: subdir_TAGS
-# Note that this uses the -i switch, and thus requires v19 etags.
-	$(ETAGS) -o $@ \
-		 $(subdirs:%=-i %/TAGS) \
-		 $(filter-out subdir_TAGS,$^)
-
-.PHONY: subdir_TAGS $(subdirs:%=%/TAGS)
-subdir_TAGS: $(subdirs:%=%/TAGS)
-$(subdirs:%=%/TAGS):
-	$(MAKE) -C $(@D) $(sub-make-vars) $(@F)
-
-endif # subdir
-
-ifndef XGETTEXT
-XGETTEXT = xgettext
-endif
-
-P = $(..)po
-
-ifdef subdir
-domain = $(subdir)
-else
-domain = libc-top
-endif
-
-define extract
-@rm -f $@.new
-$(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-by-file \
-	    --omit-header -E -n -d -  --flag=error:3:c-format \
-	    $(XGETTEXTFLAGS-$(@F)) > $@.new \
-	    $(filter-out tst-%,$(filter-out $(objpfx)distinfo,$^)) /dev/null
-mv -f $@.new $@
-endef
-
-text-srcs := $(filter %.c %.h %.cc %.C %.bash.in,$(tags_sources))
-$P/$(domain).pot: $(objpfx)distinfo $(text-srcs)
-ifeq (,$(text-srcs))
-	cp /dev/null $@
-else
-	$(extract)
-endif
-
-all-pot = $P/libc-top.pot $P/subdirs.pot
-
-ifndef subdir
-# Collect all the subdir messages, massaging the file names in comments
-# to include the subdir name.
-$P/subdirs.pot: $(subdirs:%=$P/%.pot)
-	@rm -f $@.new
-	(for d in $(subdirs); \
-	 do sed "/^#:/s% % $$d/%g" $P/$$d.pot; done) > $@.new
-	mv -f $@.new $@
-
-# Combine all the messages into the final sorted template translation file.
-# The following code requires GNU date.
-$P/libc.pot: $(all-pot)
-	@rm -f $@.new
-	set `date -R`; disp="$$6"; \
-	sed -e 's/VERSION/$(version)/' \
-	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
-	    po/header.pot > $@.new
-	$(XGETTEXT) -d - --omit-header -E -n $^ >> $@.new
-	mv -f $@.new $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
-endif
-
-$(subdirs:%=$P/%.pot): $P/%.pot: FORCE
-	$(MAKE) -C $* $(sub-make-vars) ../$@
-FORCE:
-endif
diff --git a/Makeconfig b/Makeconfig
index 20b79b1ae2..64ab926666 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -572,6 +572,11 @@ endif
 # The program that makes Emacs-style TAGS files.
 ETAGS	:= etags
 
+# The `xgettext' program for producing .pot files from sources.
+ifndef XGETTEXT
+XGETTEXT = xgettext
+endif
+
 # The `m4' macro processor; this is used by sysdeps/sparc/Makefile (and
 # perhaps others) to preprocess assembly code in some cases.
 M4 = m4
@@ -934,6 +939,7 @@ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \
 	  echo sysd-sorted-done = t;					  \
 	} > $@-tmp
 	mv -f $@-tmp $@
+$(all-Depend-files): ;
 endif
 
 # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here.
diff --git a/Makefile b/Makefile
index 3a20a7fc22..061e68da81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002,2003,2004,2005,2006 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
@@ -324,6 +324,15 @@ ifdef objdir
 endif
 	-rm -f $(sysdep-$(distclean-1))
 
+# Make the TAGS file for Emacs users.
+
+.PHONY: TAGS
+TAGS:
+	scripts/list-sources.sh | sed -n '/Makefile/p;\
+	  $(foreach S,[chsSyl] cxx sh bash pl,\
+		    $(subst .,\.,/.$S\(.in\)*$$/p;))' \
+	| $(ETAGS) -o $@ -
+
 # Make the distribution tarfile.
 .PHONY: dist tag-for-dist
 
@@ -397,7 +406,7 @@ ifeq ($(with-cvs),yes)
 endif
 FORCE:
 
-iconvdata/% localedata/% po/% manual/%:
+iconvdata/% localedata/% po/% manual/%: FORCE
 	$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
 # glibc 2.0 contains some header files which aren't used with glibc 2.1
diff --git a/Makerules b/Makerules
index 31939838d3..36e2441be0 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002,2003,2004,2005,2006 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
@@ -1343,15 +1343,8 @@ ifndef no_deps
 endif
 common-generated += bits/stdio_lim.h bits/stdio_lim.d bits/stdio_lim.st
 
-.PHONY: TAGS
-TAGS: $(objpfx)distinfo $(..)MakeTAGS
-	$(MAKE) $(addprefix -f ,$^) $@
-
-$(..)po/%.pot: $(objpfx)distinfo $(..)MakeTAGS FORCE
-	$(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@
 FORCE:
 
-
 .PHONY: echo-headers
 echo-headers:
 	@echo $(headers)
@@ -1401,7 +1394,6 @@ common-clean: common-mostlyclean
 	-rm -f $(objpfx)*.d $(objpfx)*.dt
 	-rm -fr $(addprefix $(objpfx),$(generated-dirs))
 	-rm -f $(addprefix $(common-objpfx),$(common-generated))
-	-rm -f $(objpfx)distinfo
 
 # Produce a file `stubs' which contains `#define __stub_FUNCTION'
 # for each function which is a stub.  We grovel over all the .d files
@@ -1426,26 +1418,6 @@ else
 	> $@
 endif
 
-# This information is not used for making distributions any more.
-# But it's used by MakeTAGS for making TAGS files and the .pot files.
-$(objpfx)distinfo: Makefile $(..)Makerules \
-		   $(wildcard $(foreach dir,$(sysdirs),$(dir)/Makefile))
-	$(make-target-directory)
-	$(distinfo-vars)
-	mv -f $@.new $@
-
-define distinfo-vars
-rm -f $@.new
-echo > $@.new 'subdir := $(subdir)'
-$(foreach var,subdir-dirs sources elided-routines sysdep_routines \
-	      headers sysdep_headers distribute dont_distribute generated \
-	      others tests xtests test-srcs extra-libs versioned \
-	      $(extra-libs:%=%-routines) \
-	      $(addprefix install-,lib lib.so data bin bin-script sbin others),
-echo >> $@.new '$(subdir)-$(var) := $($(var))'
-echo >> $@.new '$(var) = $$($(subdir)-$(var))')
-endef
-
 ifneq (,$(strip $(gpl2lgpl)))
 ifneq (,$(wildcard $(..)gpl2lgpl.sed))
 # Snarf from the master source and frob the copying notice.
diff --git a/Rules b/Rules
index 5758611081..74b80e85ed 100644
--- a/Rules
+++ b/Rules
@@ -1,4 +1,5 @@
-# Copyright (C) 1991-2000,2002,2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991-2000,2002,2003,2004,2005,2006
+#	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
@@ -165,10 +166,9 @@ distclean: clean
 .PHONY: subdir_install
 subdir_install: install-no-libc.a lib-noranlib stubs
 
-.PHONY: subdir_objs subdir_stubs subdir_TAGS
+.PHONY: subdir_objs subdir_stubs
 subdir_objs: objs
 subdir_stubs: stubs
-subdir_TAGS: TAGS
 
 # Target required by the Hurd to ensure that all the MiG-generated
 # headers are in place before building a subdirectory.
diff --git a/WUR-REPORT b/WUR-REPORT
index 52c4a812d9..ef407cfdbe 100644
--- a/WUR-REPORT
+++ b/WUR-REPORT
@@ -27,7 +27,7 @@ fsetpos:   likewise
 
 <stdlib.h>:
 
-atext:     it is guaranteed that a certain number of handlers can be
+atexit:    it is guaranteed that a certain number of handlers can be
            registered, so some calls might need not be checked
 on_exit:   same
 random functions:  one might want to discard a number of results.  In any
diff --git a/configure b/configure
index 224322a62b..448ef5b4f0 100755
--- a/configure
+++ b/configure
@@ -6135,13 +6135,17 @@ echo $ECHO_N "checking whether CFI directives are supported... $ECHO_C" >&6
 if test "${libc_cv_asm_cfi_directives+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.s <<EOF
+  case $machine in
+  sparc/sparc64*) cfi_offset=2047;;
+  *) cfi_offset=0;;
+esac
+cat > conftest.s <<EOF
         .text
         .type   func,%function
 func:
         .cfi_startproc
 	.cfi_remember_state
-	.cfi_rel_offset 1, 0
+	.cfi_rel_offset 1, $cfi_offset
         .cfi_endproc
 EOF
 if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
diff --git a/configure.in b/configure.in
index 1199ac00ea..b5d4e3ff4b 100644
--- a/configure.in
+++ b/configure.in
@@ -1676,13 +1676,17 @@ elif test $libc_cv_asm_weakext_directive = yes; then
 fi
 
 AC_CACHE_CHECK(whether CFI directives are supported, libc_cv_asm_cfi_directives, [dnl
+case $machine in
+  sparc/sparc64*) cfi_offset=2047;;
+  *) cfi_offset=0;;
+esac
 cat > conftest.s <<EOF
         .text
         .type   func,%function
 func:
         .cfi_startproc
 	.cfi_remember_state
-	.cfi_rel_offset 1, 0
+	.cfi_rel_offset 1, $cfi_offset
         .cfi_endproc
 EOF
 if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
diff --git a/elf/tst-tls8.c b/elf/tst-tls8.c
index dd896c4937..ccc4e9f6fa 100644
--- a/elf/tst-tls8.c
+++ b/elf/tst-tls8.c
@@ -11,8 +11,8 @@ static int
 do_test (void)
 {
 #ifdef USE_TLS
-  static const char modname1[] = "tst-tlsmod3.so";
-  static const char modname2[] = "tst-tlsmod4.so";
+  static const char modname1[] = "$ORIGIN/tst-tlsmod3.so";
+  static const char modname2[] = "$ORIGIN/tst-tlsmod4.so";
   int result = 0;
   int (*fp1) (void);
   int (*fp2) (int, int *);
diff --git a/fedora/branch.mk b/fedora/branch.mk
index eca618c0c3..422e153c10 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-fc4
-fedora-sync-date := 2006-01-06 21:48 UTC
-fedora-sync-tag := fedora-glibc-20060106T2148
+fedora-sync-date := 2006-01-09 21:52 UTC
+fedora-sync-tag := fedora-glibc-20060109T2152
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 10f39c4593..a3660edbef 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 29
+%define glibcrelease 30
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -42,7 +42,7 @@ Prereq: basesystem, libgcc
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
 BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1
-BuildPreReq: sed >= 3.95
+BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95
 %ifarch %{prelinkarches}
 BuildPreReq: prelink >= 0.2.0-5
 %endif
@@ -166,7 +166,7 @@ libraries, as well as national language (locale) support.
 Summary: A Name Service Caching Daemon (nscd).
 Group: System Environment/Daemons
 Conflicts: kernel < 2.2.0
-Requires: libselinux >= 1.17.10-1
+Requires: libselinux >= 1.17.10-1, audit-libs >= 1.1.3
 Conflicts: selinux-policy-targeted < 1.17.30-2.2
 Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils
 Autoreq: true
@@ -408,6 +408,11 @@ cat > override_headers/asm/unistd.h <<EOF
 #ifndef __NR_waitid
 #define __NR_waitid		279
 #endif
+#ifndef __NR_stat64
+#define __NR_fstat64		63
+#define __NR_lstat64		132
+#define __NR_stat64		139
+#endif
 %endif
 %ifarch x86_64
 #ifndef __NR_mq_open
@@ -1128,6 +1133,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Jan  9 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-30
+- update from CVS
+  - <pthread.h> initializer fixes for -std=c{8,9}9 on 32-bit
+    arches
+  - 
+
 * Fri Jan  6 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-29
 - update from CVS
   - make pthread_mutex_t an unnamed union again, as it affects
diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
index e126bcb0e9..d33055a2b3 100644
--- a/include/sys/sysinfo.h
+++ b/include/sys/sysinfo.h
@@ -15,4 +15,7 @@ extern long int __get_phys_pages (void);
 /* Return number of available physical pages of memory in the system.  */
 extern long int __get_avphys_pages (void);
 
+/* Return maximum number of processes this real user ID can have.  */
+extern long int __get_child_max (void);
+
 #endif /* sys/sysinfo.h */
diff --git a/manual/Makefile b/manual/Makefile
index c007b2cc4e..c5866eb9de 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992-1999,2000,2001,2002,2003,2004
+# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -166,7 +166,7 @@ glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
 .PHONY: mostlyclean distclean realclean clean
 mostlyclean:
 	-rm -f libc.dvi libc.pdf libc.tmp libc.info*
-	-rm -f $(objpfx)stubs $(objpfx)distinfo
+	-rm -f $(objpfx)stubs
 	-rm -f $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
 clean: mostlyclean
 distclean: clean
@@ -220,8 +220,7 @@ subdir_%: ;
 # ../Rules defines them for code subdirectories; for us, they are no-ops.
 # None of these should be `subdir_TARGET'; those targets are transformed
 # by the implicit rule above into `TARGET' deps.
-glibc-targets	:= lib objects objs others tests xtests lint.out \
-		   echo-headers echo-distinfo
+glibc-targets	:= lib objects objs others tests xtests lint.out echo-headers
 .PHONY: $(glibc-targets)
 $(glibc-targets):
 
diff --git a/manual/maint.texi b/manual/maint.texi
index 3d8d24f16a..2b9221233a 100644
--- a/manual/maint.texi
+++ b/manual/maint.texi
@@ -232,16 +232,6 @@ of @file{sysdeps} implements.  For example,
 directory contains various network-oriented operations which only make
 sense to put in the library on systems that support the Internet.@refill
 
-@item Dist
-
-This file contains the names of files (relative to the subdirectory of
-@file{sysdeps} in which it appears) which should be included in the
-distribution.  List any new files used by rules in the @file{Makefile}
-in the same directory, or header files used by the source files in that
-directory.  You don't need to list files that are implementations
-(either C or assembly source) of routines whose names are given in the
-machine-independent makefiles in the main source tree.
-
 @item configure
 
 This file is a shell script fragment to be run at configuration time.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a3d46cbf60..0c54b30247 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,36 @@
+2006-01-09  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_mutex_t):
+	Use __extension__ on anonymous union definition.
+	* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h: Likewise.
+
+2006-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/sparc/sparc64/jmpbuf-unwind.h (_JMPBUF_UNWINDS_ADJ): Add
+	stack bias to mc_ftp field.
+
+2006-01-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/aio_misc.h (AIO_MISC_WAIT): Work around gcc
+	being too clever and reloading the futex value where it shouldn't.
+
+2006-01-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* descr.h [!__PTHREAD_MUTEX_HAVE_PREV] (DEQUEUE_MUTEX): Use
+	correct type.
+
+2006-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h (PSEUDO):
+	Add cfi directives.
+
 2006-01-06  Ulrich Drepper  <drepper@redhat.com>
 
-	* sysdeps/ia64/tls.h (tcbhead_t): Rename private membe to __private.
+	* sysdeps/ia64/tls.h (tcbhead_t): Rename private member to __private.
 	* sysdeps/ia64/tcb-offsets.sym: Adjust for private->__private
 	rename in tcbhead_t.
 
diff --git a/nptl/sysdeps/pthread/aio_misc.h b/nptl/sysdeps/pthread/aio_misc.h
index 5aeb34eb98..f285083883 100644
--- a/nptl/sysdeps/pthread/aio_misc.h
+++ b/nptl/sysdeps/pthread/aio_misc.h
@@ -35,6 +35,7 @@
 
 #define AIO_MISC_WAIT(result, futex, timeout, cancel)			      \
   do {									      \
+    volatile int *futexaddr = &futex;					      \
     int oldval = futex;							      \
 									      \
     if (oldval != 0)							      \
@@ -48,11 +49,11 @@
 	int status;							      \
 	do								      \
 	  {								      \
-	    status = lll_futex_timed_wait (&futex, oldval, timeout);	      \
+	    status = lll_futex_timed_wait (futexaddr, oldval, timeout);	      \
 	    if (status != -EWOULDBLOCK)					      \
 	      break;							      \
 									      \
-	    oldval = futex;						      \
+	    oldval = *futexaddr;					      \
 	  }								      \
 	while (oldval != 0);						      \
 									      \
diff --git a/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h b/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h
index 92c296b0cf..efb6918c14 100644
--- a/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h
+++ b/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h
@@ -25,7 +25,8 @@
   _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
 
 #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
-  ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[0].uc_mcontext.mc_fp - (_adj))
+  ((uintptr_t) (_address) - (_adj) \
+   < (uintptr_t) (_jmpbuf)[0].uc_mcontext.mc_fp + 2047 - (_adj))
 
 /* We use the normal lobngjmp for unwinding.  */
 #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
index 2341a9c650..662f3e54a8 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
@@ -56,7 +56,7 @@ typedef union
        binary compatibility.  */
     int __kind;
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       struct __pthread_mutex_s *__next;
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
index 56ffef3d0b..493c2ab557 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
@@ -80,7 +80,7 @@ typedef union
 # define __PTHREAD_MUTEX_HAVE_PREV	1
 #else
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       struct __pthread_mutex_s *__next;
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
index a2ad05dd54..df8beeb685 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
@@ -79,7 +79,7 @@ typedef union
 # define __PTHREAD_MUTEX_HAVE_PREV	1
 #else
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       struct __pthread_mutex_s *__next;
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
index 727ab811c0..211c3fb08e 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -57,7 +57,7 @@ typedef union __pthread_mutex_u
        binary compatibility.  */
     int __kind;
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       union __pthread_mutex_u *__next;
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
index 0f4691025e..e948ca10a8 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
@@ -1,5 +1,5 @@
 /* Machine-specific pthread type layouts.  SPARC version.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -80,7 +80,7 @@ typedef union __pthread_mutex_u
 # define __PTHREAD_MUTEX_HAVE_PREV	1
 #else
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       union __pthread_mutex_u *__next;
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index d8c65aeffd..d69623c145 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -40,7 +40,11 @@ __##syscall_name##_nocancel:						      \
 	 nop;								      \
 .size	__##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	      \
 	.subsection 2;							      \
+	cfi_startproc;							      \
 1:	save %sp, -192, %sp;						      \
+	cfi_def_cfa_register (%fp);					      \
+	cfi_window_save;						      \
+	cfi_register (%o7, %i7);					      \
 	CENABLE;							      \
 	 nop;								      \
 	mov %o0, %l0;							      \
@@ -53,6 +57,7 @@ __##syscall_name##_nocancel:						      \
 	 mov %l0, %o0;							      \
 	jmpl %i7 + 8, %g0;						      \
 	 restore %g0, %l1, %o0;						      \
+	cfi_endproc;							      \
 	.previous;							      \
 	SYSCALL_ERROR_HANDLER						      \
 	SYSCALL_ERROR_HANDLER2
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
index ba940b35e0..81942bc86c 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
@@ -79,7 +79,7 @@ typedef union
 # define __PTHREAD_MUTEX_HAVE_PREV	1
 #else
     unsigned int __nusers;
-    union
+    __extension__ union
     {
       int __spins;
       struct __pthread_mutex_s *__next;
diff --git a/po/.cvsignore b/po/.cvsignore
index 02da896169..37752e3b33 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,65 +1,2 @@
 *.mo
-stdio-common.pot
-libc-top.pot
-csu.pot
-assert.pot
-conform.pot
-ctype.pot
-locale.pot
-intl.pot
-catgets.pot
-math.pot
-setjmp.pot
-signal.pot
-stdlib.pot
-gnulib.pot
-libio.pot
-dlfcn.pot
-malloc.pot
-string.pot
-wcsmbs.pot
-time.pot
-dirent.pot
-grp.pot
-pwd.pot
-posix.pot
-io.pot
-termios.pot
-resource.pot
-misc.pot
-socket.pot
-sysvipc.pot
-gmon.pot
-iconvdata.pot
-iconv.pot
-manual.pot
-wctype.pot
-md5-crypt.pot
-shadow.pot
-po.pot
-crypt.pot
-argp.pot
-linuxthreads_db.pot
-linuxthreads.pot
-nptl_db.pot
-nptl.pot
-libidn.pot
-soft-fp.pot
-resolv.pot
-nss.pot
-localedata.pot
-timezone.pot
-rt.pot
-debug.pot
-hesiod.pot
-inet.pot
-bare.pot
-sunrpc.pot
-nis.pot
-nscd.pot
-streams.pot
-login.pot
-elf.pot
-mach.pot
-hurd.pot
-subdirs.pot
+libc.pot.files
diff --git a/po/Makefile b/po/Makefile
index fa26aeca0c..cbbd9ab848 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2001,2002,2006
+#	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
@@ -21,7 +22,7 @@
 subdir := po
 
 # Add names of the languages with broken .po files here.
-BROKEN_LINGUAS = 
+BROKEN_LINGUAS =
 
 # List of languages for which we have message catalogs of translations.
 ALL_LINGUAS := $(filter-out $(BROKEN_LINGUAS),$(basename $(wildcard *.po)))
@@ -54,6 +55,28 @@ distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
 
 include ../Rules
 
+# Generate the translation template from all the source files.
+libc.pot: header.pot libc.pot.files
+	@rm -f $@.new
+	set `date -R`; disp="$$6"; \
+	sed -e 's/VERSION/$(version)/' \
+	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
+	    $< > $@.new
+	cd ..; $(XGETTEXT) --keyword=_ --keyword=N_ \
+			   --add-comments=TRANS --flag=error:3:c-format \
+			   --sort-by-file --omit-header -E -n -d - \
+			   -f po/$(word 2,$^) >> po/$@.new
+	mv -f $@.new $@
+ifeq ($(with-cvs),yes)
+	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
+endif
+
+# Omit tst-* files, and get only files with the given suffixes.
+libc.pot.files: FORCE
+	$(..)scripts/list-sources.sh .. | sed -n '/\/tst-/d;\
+	  $(foreach S,[ch] cxx sh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))' \
+	  > $@.new
+	mv -f $@.new $@
 
 .SUFFIXES: .mo .po .pot
 
diff --git a/po/libc.pot b/po/libc.pot
index b2024e3c46..c38e554fd2 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.3.90\n"
-"POT-Creation-Date: 2005-05-08 09:40-0700\n"
+"POT-Creation-Date: 2006-01-07 22:50-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,331 +14,1249 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
+#: argp/argp-help.c:226
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
+#: argp/argp-help.c:235
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
+#: argp/argp-help.c:247
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
+#: argp/argp-help.c:1211
+msgid ""
+"Mandatory or optional arguments to long options are also mandatory or "
+"optional for any corresponding short options."
 msgstr ""
 
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
+#: argp/argp-help.c:1598
+msgid "Usage:"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
+#: argp/argp-help.c:1602
+msgid "  or: "
 msgstr ""
 
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
+#: argp/argp-help.c:1614
+msgid " [OPTION...]"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
+#: argp/argp-help.c:1641
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
+#: argp/argp-help.c:1669
+#, c-format
+msgid "Report bugs to %s.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
+#: argp/argp-parse.c:102
+msgid "Give this help list"
 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:359
-#: stdio-common/../sysdeps/unix/siglist.c:39
-msgid "Broken pipe"
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
+#: argp/argp-parse.c:104
+msgid "Set the program name"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
+#: argp/argp-parse.c:167
+msgid "Print program version"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
+#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:96 nss/makedb.c:61
+msgid "NAME"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
+#: catgets/gencat.c:110
+msgid "Create C header file NAME containing symbol definitions"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
+#: catgets/gencat.c:112
+msgid "Do not use existing catalog, force new output file"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
+#: catgets/gencat.c:113 nss/makedb.c:61
+msgid "Write output to file NAME"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
+#: catgets/gencat.c:118
+msgid ""
+"Generate message catalog.\013If INPUT-FILE is -, input is read from standard "
+"input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
+#: catgets/gencat.c:123
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
+#: catgets/gencat.c:231 debug/pcprofiledump.c:199 iconv/iconv_prog.c:410
+#: iconv/iconvconfig.c:379 locale/programs/localedef.c:370
+#: login/programs/pt_chown.c:88 malloc/memusagestat.c:522 nss/makedb.c:231
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
+#: catgets/gencat.c:245 debug/xtrace.sh:64 elf/ldconfig.c:285
+#: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:425
+#: iconv/iconvconfig.c:394 locale/programs/locale.c:274
+#: locale/programs/localedef.c:386 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:71 nscd/nscd.c:383 nss/getent.c:83 nss/makedb.c:245
+#: posix/getconf.c:1006
+#, c-format
+msgid ""
+"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"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
+#: catgets/gencat.c:250 debug/xtrace.sh:68 elf/ldconfig.c:290 elf/sprof.c:361
+#: iconv/iconv_prog.c:430 iconv/iconvconfig.c:399 locale/programs/locale.c:279
+#: locale/programs/localedef.c:391 malloc/memusage.sh:75 nscd/nscd.c:388
+#: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1011
+#, c-format
+msgid "Written by %s.\n"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
+#: catgets/gencat.c:281
+msgid "*standard input*"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:157 iconv/iconv_prog.c:297
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
+#: catgets/gencat.c:416 catgets/gencat.c:493
+msgid "illegal set number"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
+#: catgets/gencat.c:443
+msgid "duplicate set definition"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
+#: catgets/gencat.c:445 catgets/gencat.c:622 catgets/gencat.c:676
+msgid "this is the first definition"
 msgstr ""
 
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
+#: catgets/gencat.c:521
+#, c-format
+msgid "unknown set `%s'"
 msgstr ""
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
+#: catgets/gencat.c:562
+msgid "invalid quote character"
 msgstr ""
 
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
+#: catgets/gencat.c:575
+#, c-format
+msgid "unknown directive `%s': line ignored"
 msgstr ""
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
+#: catgets/gencat.c:620
+msgid "duplicated message number"
+msgstr ""
+
+#: catgets/gencat.c:673
+msgid "duplicated message identifier"
+msgstr ""
+
+#: catgets/gencat.c:730
+msgid "invalid character: message ignored"
+msgstr ""
+
+#: catgets/gencat.c:773
+msgid "invalid line"
+msgstr ""
+
+#: catgets/gencat.c:827
+msgid "malformed line ignored"
+msgstr ""
+
+#: catgets/gencat.c:991 catgets/gencat.c:1032 nss/makedb.c:183
 #, c-format
-msgid "cannot open `%s'"
+msgid "cannot open output file `%s'"
 msgstr ""
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: catgets/gencat.c:1194 locale/programs/linereader.c:565
+msgid "invalid escape sequence"
+msgstr ""
+
+#: catgets/gencat.c:1216
+msgid "unterminated message"
+msgstr ""
+
+#: catgets/gencat.c:1240
 #, c-format
-msgid "cannot read header from `%s'"
+msgid "while opening old catalog file"
 msgstr ""
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:299 catgets/gencat.c:289
+#: catgets/gencat.c:1331
 #, c-format
-msgid "cannot open input file `%s'"
+msgid "conversion modules not available"
+msgstr ""
+
+#: catgets/gencat.c:1357
+#, c-format
+msgid "cannot determine escape character"
+msgstr ""
+
+#: debug/pcprofiledump.c:52
+msgid "Don't buffer output"
+msgstr ""
+
+#: debug/pcprofiledump.c:57
+msgid "Dump information generated by PC profiling."
+msgstr ""
+
+#: debug/pcprofiledump.c:60
+msgid "[FILE]"
+msgstr ""
+
+#: debug/pcprofiledump.c:100
+#, c-format
+msgid "cannot open input file"
+msgstr ""
+
+#: debug/pcprofiledump.c:106
+#, c-format
+msgid "cannot read header"
+msgstr ""
+
+#: debug/pcprofiledump.c:170
+#, c-format
+msgid "invalid pointer size"
+msgstr ""
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr ""
+
+#: debug/xtrace.sh:33
+msgid "Try `xtrace --help' for more information.\\n"
+msgstr ""
+
+#: debug/xtrace.sh:39
+msgid "xtrace: option `$1' requires an argument.\\n"
+msgstr ""
+
+#: debug/xtrace.sh:46
+msgid ""
+"Trace execution of program by printing currently executed function.\n"
+"\n"
+"     --data=FILE          Don't run the program, just print the data from "
+"FILE.\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any "
+"corresponding\n"
+"short options.\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\\n"
+msgstr ""
+
+#: debug/xtrace.sh:125
+msgid "xtrace: unrecognized option `$1'\\n"
+msgstr ""
+
+#: debug/xtrace.sh:138
+msgid "No program name given\\n"
+msgstr ""
+
+#: debug/xtrace.sh:146
+#, sh-format
+msgid "executable `$program' not found\\n"
+msgstr ""
+
+#: debug/xtrace.sh:150
+#, sh-format
+msgid "`$program' is no executable\\n"
+msgstr ""
+
+#: dlfcn/dlinfo.c:63
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr ""
+
+#: dlfcn/dlinfo.c:72
+msgid "unsupported dlinfo request"
+msgstr ""
+
+#: dlfcn/dlmopen.c:63
+msgid "invalid namespace"
+msgstr ""
+
+#: dlfcn/dlopen.c:64
+msgid "invalid mode parameter"
+msgstr ""
+
+#: elf/cache.c:68
+msgid "unknown"
+msgstr ""
+
+#: elf/cache.c:111
+msgid "Unknown OS"
+msgstr ""
+
+#: elf/cache.c:116
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ""
+
+#: elf/cache.c:142 elf/ldconfig.c:1218
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr ""
+
+#: elf/cache.c:154
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr ""
+
+#: elf/cache.c:158 elf/cache.c:168
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr ""
+
+#: elf/cache.c:201 elf/cache.c:211
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr ""
+
+#: elf/cache.c:410
+#, c-format
+msgid "Can't remove old temporary cache file %s"
+msgstr ""
+
+#: elf/cache.c:417
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr ""
+
+#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
+#, c-format
+msgid "Writing of cache data failed"
+msgstr ""
+
+#: elf/cache.c:442
+#, c-format
+msgid "Writing of cache data failed."
+msgstr ""
+
+#: elf/cache.c:449
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr ""
+
+#: elf/cache.c:454
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr ""
+
+#: elf/dl-close.c:116
+msgid "shared object not open"
+msgstr ""
+
+#: elf/dl-deps.c:112 elf/dl-open.c:228
+msgid "DST not allowed in SUID/SGID programs"
+msgstr ""
+
+#: elf/dl-deps.c:125
+msgid "empty dynamics string token substitution"
+msgstr ""
+
+#: elf/dl-deps.c:131
+#, c-format
+msgid ""
+"cannot load auxiliary `%s' because of empty dynamic string token "
+"substitution\n"
+msgstr ""
+
+#: elf/dl-deps.c:470
+msgid "cannot allocate dependency list"
+msgstr ""
+
+#: elf/dl-deps.c:503 elf/dl-deps.c:558
+msgid "cannot allocate symbol search list"
+msgstr ""
+
+#: elf/dl-deps.c:543
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr ""
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr ""
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr ""
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr ""
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr ""
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr ""
+
+#: elf/dl-load.c:365
+msgid "cannot allocate name record"
+msgstr ""
+
+#: elf/dl-load.c:467 elf/dl-load.c:546 elf/dl-load.c:666 elf/dl-load.c:761
+msgid "cannot create cache for search path"
+msgstr ""
+
+#: elf/dl-load.c:569
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr ""
+
+#: elf/dl-load.c:652
+msgid "cannot create search path array"
+msgstr ""
+
+#: elf/dl-load.c:838
+msgid "cannot stat shared object"
+msgstr ""
+
+#: elf/dl-load.c:913
+msgid "cannot open zero fill device"
+msgstr ""
+
+#: elf/dl-load.c:958 elf/dl-load.c:2170
+msgid "cannot create shared object descriptor"
+msgstr ""
+
+#: elf/dl-load.c:977 elf/dl-load.c:1636 elf/dl-load.c:1722
+msgid "cannot read file data"
+msgstr ""
+
+#: elf/dl-load.c:1021
+msgid "ELF load command alignment not page-aligned"
+msgstr ""
+
+#: elf/dl-load.c:1028
+msgid "ELF load command address/offset not properly aligned"
+msgstr ""
+
+#: elf/dl-load.c:1112
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr ""
+
+#: elf/dl-load.c:1136
+msgid "cannot handle TLS data"
+msgstr ""
+
+#: elf/dl-load.c:1155
+msgid "object file has no loadable segments"
+msgstr ""
+
+#: elf/dl-load.c:1191
+msgid "failed to map segment from shared object"
+msgstr ""
+
+#: elf/dl-load.c:1215
+msgid "cannot dynamically load executable"
+msgstr ""
+
+#: elf/dl-load.c:1276
+msgid "cannot change memory protections"
+msgstr ""
+
+#: elf/dl-load.c:1295
+msgid "cannot map zero-fill pages"
+msgstr ""
+
+#: elf/dl-load.c:1309
+msgid "object file has no dynamic section"
+msgstr ""
+
+#: elf/dl-load.c:1332
+msgid "shared object cannot be dlopen()ed"
+msgstr ""
+
+#: elf/dl-load.c:1345
+msgid "cannot allocate memory for program header"
+msgstr ""
+
+#: elf/dl-load.c:1362 elf/dl-open.c:174
+msgid "invalid caller"
+msgstr ""
+
+#: elf/dl-load.c:1401
+msgid "cannot enable executable stack as shared object requires"
+msgstr ""
+
+#: elf/dl-load.c:1416
+msgid "cannot close file descriptor"
+msgstr ""
+
+#: elf/dl-load.c:1458
+msgid "cannot create searchlist"
+msgstr ""
+
+#: elf/dl-load.c:1636
+msgid "file too short"
+msgstr ""
+
+#: elf/dl-load.c:1659
+msgid "invalid ELF header"
+msgstr ""
+
+#: elf/dl-load.c:1671
+msgid "ELF file data encoding not big-endian"
+msgstr ""
+
+#: elf/dl-load.c:1673
+msgid "ELF file data encoding not little-endian"
+msgstr ""
+
+#: elf/dl-load.c:1677
+msgid "ELF file version ident does not match current one"
+msgstr ""
+
+#: elf/dl-load.c:1681
+msgid "ELF file OS ABI invalid"
+msgstr ""
+
+#: elf/dl-load.c:1683
+msgid "ELF file ABI version invalid"
+msgstr ""
+
+#: elf/dl-load.c:1686
+msgid "internal error"
+msgstr ""
+
+#: elf/dl-load.c:1693
+msgid "ELF file version does not match current one"
+msgstr ""
+
+#: elf/dl-load.c:1701
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr ""
+
+#: elf/dl-load.c:1707
+msgid "ELF file's phentsize not the expected size"
+msgstr ""
+
+#: elf/dl-load.c:2185
+msgid "wrong ELF class: ELFCLASS64"
+msgstr ""
+
+#: elf/dl-load.c:2186
+msgid "wrong ELF class: ELFCLASS32"
+msgstr ""
+
+#: elf/dl-load.c:2189
+msgid "cannot open shared object file"
+msgstr ""
+
+#: elf/dl-lookup.c:249
+msgid "relocation error"
+msgstr ""
+
+#: elf/dl-lookup.c:277
+msgid "symbol lookup error"
+msgstr ""
+
+#: elf/dl-open.c:112
+msgid "cannot extend global scope"
+msgstr ""
+
+#: elf/dl-open.c:244
+msgid "empty dynamic string token substitution"
+msgstr ""
+
+#: elf/dl-open.c:410 elf/dl-open.c:421
+msgid "cannot create scope list"
+msgstr ""
+
+#: elf/dl-open.c:465
+msgid "TLS generation counter wrapped!  Please report this."
+msgstr ""
+
+#: elf/dl-open.c:503
+msgid "invalid mode for dlopen()"
+msgstr ""
+
+#: elf/dl-open.c:520
+msgid "no more namespaces available for dlmopen()"
+msgstr ""
+
+#: elf/dl-open.c:533
+msgid "invalid target namespace in dlmopen()"
+msgstr ""
+
+#: elf/dl-reloc.c:55
+msgid "cannot allocate memory in static TLS block"
+msgstr ""
+
+#: elf/dl-reloc.c:198
+msgid "cannot make segment writable for relocation"
+msgstr ""
+
+#: elf/dl-reloc.c:279
+#, c-format
+msgid "%s: no PLTREL found in object %s\n"
+msgstr ""
+
+#: elf/dl-reloc.c:290
+#, c-format
+msgid "%s: out of memory to store relocation results for %s\n"
+msgstr ""
+
+#: elf/dl-reloc.c:306
+msgid "cannot restore segment prot after reloc"
+msgstr ""
+
+#: elf/dl-reloc.c:331
+msgid "cannot apply additional memory protection after relocation"
+msgstr ""
+
+#: elf/dl-sym.c:98
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr ""
+
+#: elf/dl-sysdep.c:495
+msgid "cannot create capability list"
+msgstr ""
+
+#: elf/dl-tls.c:785
+msgid "cannot create TLS data structures"
+msgstr ""
+
+#: elf/dl-version.c:303
+msgid "cannot allocate version reference table"
+msgstr ""
+
+#: elf/ldconfig.c:133
+msgid "Print cache"
 msgstr ""
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:317
+#: elf/ldconfig.c:134
+msgid "Generate verbose messages"
+msgstr ""
+
+#: elf/ldconfig.c:135
+msgid "Don't build cache"
+msgstr ""
+
+#: elf/ldconfig.c:136
+msgid "Don't generate links"
+msgstr ""
+
+#: elf/ldconfig.c:137
+msgid "Change to and use ROOT as root directory"
+msgstr ""
+
+#: elf/ldconfig.c:137
+msgid "ROOT"
+msgstr ""
+
+#: elf/ldconfig.c:138
+msgid "CACHE"
+msgstr ""
+
+#: elf/ldconfig.c:138
+msgid "Use CACHE as cache file"
+msgstr ""
+
+#: elf/ldconfig.c:139
+msgid "CONF"
+msgstr ""
+
+#: elf/ldconfig.c:139
+msgid "Use CONF as configuration file"
+msgstr ""
+
+#: elf/ldconfig.c:140
+msgid ""
+"Only process directories specified on the command line.  Don't build cache."
+msgstr ""
+
+#: elf/ldconfig.c:141
+msgid "Manually link individual libraries."
+msgstr ""
+
+#: elf/ldconfig.c:142
+msgid "FORMAT"
+msgstr ""
+
+#: elf/ldconfig.c:142
+msgid "Format to use: new, old or compat (default)"
+msgstr ""
+
+#: elf/ldconfig.c:150
+msgid "Configure Dynamic Linker Run Time Bindings."
+msgstr ""
+
+#: elf/ldconfig.c:308
+#, c-format
+msgid "Path `%s' given more than once"
+msgstr ""
+
+#: elf/ldconfig.c:348
+#, c-format
+msgid "%s is not a known library type"
+msgstr ""
+
+#: elf/ldconfig.c:373
+#, c-format
+msgid "Can't stat %s"
+msgstr ""
+
+#: elf/ldconfig.c:447
+#, c-format
+msgid "Can't stat %s\n"
+msgstr ""
+
+#: elf/ldconfig.c:457
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr ""
+
+#: elf/ldconfig.c:476
+#, c-format
+msgid "Can't unlink %s"
+msgstr ""
+
+#: elf/ldconfig.c:482
+#, c-format
+msgid "Can't link %s to %s"
+msgstr ""
+
+#: elf/ldconfig.c:488
+msgid " (changed)\n"
+msgstr ""
+
+#: elf/ldconfig.c:490
+msgid " (SKIPPED)\n"
+msgstr ""
+
+#: elf/ldconfig.c:545
+#, c-format
+msgid "Can't find %s"
+msgstr ""
+
+#: elf/ldconfig.c:561
+#, c-format
+msgid "Can't lstat %s"
+msgstr ""
+
+#: elf/ldconfig.c:568
+#, c-format
+msgid "Ignored file %s since it is not a regular file."
+msgstr ""
+
+#: elf/ldconfig.c:576
+#, c-format
+msgid "No link created since soname could not be found for %s"
+msgstr ""
+
+#: elf/ldconfig.c:667
+#, c-format
+msgid "Can't open directory %s"
+msgstr ""
+
+#: elf/ldconfig.c:722 elf/ldconfig.c:769
+#, c-format
+msgid "Cannot lstat %s"
+msgstr ""
+
+#: elf/ldconfig.c:734
+#, c-format
+msgid "Cannot stat %s"
+msgstr ""
+
+#: elf/ldconfig.c:791 elf/readlib.c:90
+#, c-format
+msgid "Input file %s not found.\n"
+msgstr ""
+
+#: elf/ldconfig.c:842
+#, c-format
+msgid "libc5 library %s in wrong directory"
+msgstr ""
+
+#: elf/ldconfig.c:845
+#, c-format
+msgid "libc6 library %s in wrong directory"
+msgstr ""
+
+#: elf/ldconfig.c:848
+#, c-format
+msgid "libc4 library %s in wrong directory"
+msgstr ""
+
+#: elf/ldconfig.c:875
+#, c-format
+msgid ""
+"libraries %s and %s in directory %s have same soname but different type."
+msgstr ""
+
+#: elf/ldconfig.c:982
+#, c-format
+msgid "Can't open configuration file %s"
+msgstr ""
+
+#: elf/ldconfig.c:1046
+#, c-format
+msgid "%s:%u: bad syntax in hwcap line"
+msgstr ""
+
+#: elf/ldconfig.c:1052
+#, c-format
+msgid "%s:%u: hwcap index %lu above maximum %u"
+msgstr ""
+
+#: elf/ldconfig.c:1059 elf/ldconfig.c:1067
+#, c-format
+msgid "%s:%u: hwcap index %lu already defined as %s"
+msgstr ""
+
+#: elf/ldconfig.c:1070
+#, c-format
+msgid "%s:%u: duplicate hwcap %lu %s"
+msgstr ""
+
+#: elf/ldconfig.c:1092
+#, c-format
+msgid "need absolute file name for configuration file when using -r"
+msgstr ""
+
+#: elf/ldconfig.c:1099 locale/programs/xmalloc.c:69 malloc/obstack.c:413
+#: posix/getconf.c:980 posix/getconf.c:1157
+#, c-format
+msgid "memory exhausted"
+msgstr ""
+
+#: elf/ldconfig.c:1129
+#, c-format
+msgid "%s:%u: cannot read directory %s"
+msgstr ""
+
+#: elf/ldconfig.c:1169
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr ""
+
+#: elf/ldconfig.c:1197
+#, c-format
+msgid "Can't chdir to /"
+msgstr ""
+
+#: elf/ldconfig.c:1239
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr ""
+
+#: elf/ldd.bash.in:43
+msgid "Written by %s and %s.\n"
+msgstr ""
+
+#: elf/ldd.bash.in:48
+msgid ""
+"Usage: ldd [OPTION]... FILE...\n"
+"      --help              print this help and exit\n"
+"      --version           print version information and exit\n"
+"  -d, --data-relocs       process data relocations\n"
+"  -r, --function-relocs   process data and function relocations\n"
+"  -u, --unused            print unused direct dependencies\n"
+"  -v, --verbose           print all information\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
+msgstr ""
+
+#: elf/ldd.bash.in:80
+msgid "ldd: option `$1' is ambiguous"
+msgstr ""
+
+#: elf/ldd.bash.in:87
+msgid "unrecognized option"
+msgstr ""
+
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+msgid "Try `ldd --help' for more information."
+msgstr ""
+
+#: elf/ldd.bash.in:125
+msgid "missing file arguments"
+msgstr ""
+
+#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. TRANS for ordinary files that are referenced in contexts where they are
+#. TRANS expected to already exist.
+#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
+msgid "No such file or directory"
+msgstr ""
+
+#: elf/ldd.bash.in:151
+msgid "warning: you do not have execution permission for"
+msgstr ""
+
+#: elf/ldd.bash.in:185
+msgid "\tnot a dynamic executable"
+msgstr ""
+
+#: elf/ldd.bash.in:193
+msgid "exited with unknown exit code"
+msgstr ""
+
+#: elf/ldd.bash.in:198
+msgid "error: you do not have read permission for"
+msgstr ""
+
+#: elf/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
+msgstr ""
+
+#: elf/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr ""
+
+#: elf/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr ""
+
+#: elf/readelflib.c:71
+#, c-format
+msgid "Unknown ELFCLASS in file %s.\n"
+msgstr ""
+
+#: elf/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr ""
+
+#: elf/readelflib.c:109
+#, c-format
+msgid "more than one dynamic segment\n"
+msgstr ""
+
+#: elf/readlib.c:96
+#, c-format
+msgid "Cannot fstat file %s.\n"
+msgstr ""
+
+#: elf/readlib.c:107
+#, c-format
+msgid "File %s is empty, not checked."
+msgstr ""
+
+#: elf/readlib.c:113
+#, c-format
+msgid "File %s is too small, not checked."
+msgstr ""
+
+#: elf/readlib.c:123
+#, c-format
+msgid "Cannot mmap file %s.\n"
+msgstr ""
+
+#: elf/readlib.c:161
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr ""
+
+#: elf/sprof.c:77
+msgid "Output selection:"
+msgstr ""
+
+#: elf/sprof.c:79
+msgid "print list of count paths and their number of use"
+msgstr ""
+
+#: elf/sprof.c:81
+msgid "generate flat profile with counts and ticks"
+msgstr ""
+
+#: elf/sprof.c:82
+msgid "generate call graph"
+msgstr ""
+
+#: elf/sprof.c:89
+msgid ""
+"Read and display shared object profiling data.\013For bug reporting "
+"instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+
+#: elf/sprof.c:94
+msgid "SHOBJ [PROFDATA]"
+msgstr ""
+
+#: elf/sprof.c:400
+#, c-format
+msgid "failed to load shared object `%s'"
+msgstr ""
+
+#: elf/sprof.c:409
+#, c-format
+msgid "cannot create internal descriptors"
+msgstr ""
+
+#: elf/sprof.c:528
+#, c-format
+msgid "Reopening shared object `%s' failed"
+msgstr ""
+
+#: elf/sprof.c:535 elf/sprof.c:629
+#, c-format
+msgid "reading of section headers failed"
+msgstr ""
+
+#: elf/sprof.c:543 elf/sprof.c:637
+#, c-format
+msgid "reading of section header string table failed"
+msgstr ""
+
+#: elf/sprof.c:569
+#, c-format
+msgid "*** Cannot read debuginfo file name: %m\n"
+msgstr ""
+
+#: elf/sprof.c:589
+#, c-format
+msgid "cannot determine file name"
+msgstr ""
+
+#: elf/sprof.c:622
+#, c-format
+msgid "reading of ELF header failed"
+msgstr ""
+
+#: elf/sprof.c:658
+#, c-format
+msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
+msgstr ""
+
+#: elf/sprof.c:688
+#, c-format
+msgid "failed to load symbol data"
+msgstr ""
+
+#: elf/sprof.c:755
+#, c-format
+msgid "cannot load profiling data"
+msgstr ""
+
+#: elf/sprof.c:764
+#, c-format
+msgid "while stat'ing profiling data file"
+msgstr ""
+
+#: elf/sprof.c:772
+#, c-format
+msgid "profiling data file `%s' does not match shared object `%s'"
+msgstr ""
+
+#: elf/sprof.c:783
+#, c-format
+msgid "failed to mmap the profiling data file"
+msgstr ""
+
+#: elf/sprof.c:791
+#, c-format
+msgid "error while closing the profiling data file"
+msgstr ""
+
+#: elf/sprof.c:800 elf/sprof.c:870
+#, c-format
+msgid "cannot create internal descriptor"
+msgstr ""
+
+#: elf/sprof.c:846
+#, c-format
+msgid "`%s' is no correct profile data file for `%s'"
+msgstr ""
+
+#: elf/sprof.c:1027 elf/sprof.c:1085
+#, c-format
+msgid "cannot allocate symbol data"
+msgstr ""
+
+#: iconv/iconv_charmap.c:175 iconv/iconv_prog.c:315
 #, c-format
 msgid "error while closing input `%s'"
 msgstr ""
 
-#: iconv/iconv_charmap.c:443
+#: iconv/iconv_charmap.c:441
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr ""
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:527
+#: iconv/iconv_charmap.c:460 iconv/iconv_prog.c:525
 #, c-format
 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:570
-#: iconv/iconv_prog.c:606
+#: iconv/iconv_charmap.c:505 iconv/iconv_charmap.c:541 iconv/iconv_prog.c:568
+#: iconv/iconv_prog.c:604
 #, c-format
 msgid "error while reading the input"
 msgstr ""
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:588
+#: iconv/iconv_charmap.c:523 iconv/iconv_prog.c:586
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr ""
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:59
 msgid "Input/Output format specification:"
 msgstr ""
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:60
 msgid "encoding of original text"
 msgstr ""
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:61
 msgid "encoding for output"
 msgstr ""
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:62
 msgid "Information:"
 msgstr ""
 
-#: iconv/iconv_prog.c:65
+#: iconv/iconv_prog.c:63
 msgid "list all known coded character sets"
 msgstr ""
 
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:126
 msgid "Output control:"
 msgstr ""
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:65
 msgid "omit invalid characters from output"
 msgstr ""
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:66
 msgid "output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:67
 msgid "suppress warnings"
 msgstr ""
 
-#: iconv/iconv_prog.c:70
+#: iconv/iconv_prog.c:68
 msgid "print progress information"
 msgstr ""
 
-#: iconv/iconv_prog.c:75
+#: iconv/iconv_prog.c:73
 msgid "Convert encoding of given files from one encoding to another."
 msgstr ""
 
-#: iconv/iconv_prog.c:79
+#: iconv/iconv_prog.c:77
 msgid "[FILE...]"
 msgstr ""
 
-#: iconv/iconv_prog.c:201
+#: iconv/iconv_prog.c:199
 #, c-format
 msgid "cannot open output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:243
+#: iconv/iconv_prog.c:241
 #, c-format
 msgid "conversion from `%s' and to `%s' are not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:248
+#: iconv/iconv_prog.c:246
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:255
+#: iconv/iconv_prog.c:253
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:257
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:269
+#: iconv/iconv_prog.c:267
 #, c-format
 msgid "failed to start conversion processing"
 msgstr ""
 
-#: iconv/iconv_prog.c:363
+#: iconv/iconv_prog.c:361
 #, c-format
 msgid "error while closing output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:412 iconv/iconvconfig.c:381
-#: locale/programs/localedef.c:372 catgets/gencat.c:233
-#: malloc/memusagestat.c:524 nss/getent.c:787 debug/pcprofiledump.c:199
-msgid ""
-"For bug reporting instructions, please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>.\n"
-msgstr ""
-
-#: iconv/iconv_prog.c:427 iconv/iconvconfig.c:396 locale/programs/locale.c:276
-#: locale/programs/localedef.c:388 catgets/gencat.c:247 posix/getconf.c:963
-#: nss/getent.c:82 nscd/nscd.c:394 nscd/nscd_nischeck.c:90 elf/ldconfig.c:287
-#: elf/ldd.bash.in:39 elf/sprof.c:355
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#: iconv/iconv_prog.c:432 iconv/iconvconfig.c:401 locale/programs/locale.c:281
-#: locale/programs/localedef.c:393 catgets/gencat.c:252 posix/getconf.c:968
-#: nss/getent.c:87 nscd/nscd.c:399 nscd/nscd_nischeck.c:95 elf/ldconfig.c:292
-#: elf/sprof.c:361
-#, c-format
-msgid "Written by %s.\n"
-msgstr ""
-
-#: iconv/iconv_prog.c:472 iconv/iconv_prog.c:498
+#: iconv/iconv_prog.c:470 iconv/iconv_prog.c:496
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr ""
 
-#: iconv/iconv_prog.c:523
+#: iconv/iconv_prog.c:521
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr ""
 
-#: iconv/iconv_prog.c:531
+#: iconv/iconv_prog.c:529
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: iconv/iconv_prog.c:534
+#: iconv/iconv_prog.c:532
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr ""
 
-#: iconv/iconv_prog.c:780
+#: iconv/iconv_prog.c:778
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -348,459 +1266,554 @@ msgid ""
 "  "
 msgstr ""
 
-#: iconv/iconvconfig.c:111
+#: iconv/iconvconfig.c:109
 msgid "Create fastloading iconv module configuration file."
 msgstr ""
 
-#: iconv/iconvconfig.c:115
+#: iconv/iconvconfig.c:113
 msgid "[DIR...]"
 msgstr ""
 
-#: iconv/iconvconfig.c:128
+#: iconv/iconvconfig.c:126
 msgid "Prefix used for all file accesses"
 msgstr ""
 
-#: iconv/iconvconfig.c:129
+#: iconv/iconvconfig.c:127
 msgid ""
 "Put output in FILE instead of installed location (--prefix does not apply to "
 "FILE)"
 msgstr ""
 
-#: iconv/iconvconfig.c:133
+#: iconv/iconvconfig.c:131
 msgid "Do not search standard directories, only those on the command line"
 msgstr ""
 
-#: iconv/iconvconfig.c:302
+#: iconv/iconvconfig.c:300
 #, c-format
 msgid "Directory arguments required when using --nostdlib"
 msgstr ""
 
-#: iconv/iconvconfig.c:344 locale/programs/localedef.c:292
+#: iconv/iconvconfig.c:342 locale/programs/localedef.c:290
 #, c-format
 msgid "no output file produced because warning were issued"
 msgstr ""
 
-#: iconv/iconvconfig.c:430
+#: iconv/iconvconfig.c:428
 #, c-format
 msgid "while inserting in search tree"
 msgstr ""
 
-#: iconv/iconvconfig.c:1238
+#: iconv/iconvconfig.c:1236
 #, c-format
 msgid "cannot generate output file"
 msgstr ""
 
-#: locale/programs/charmap-dir.c:59
+#: inet/rcmd.c:157
+msgid "rcmd: Cannot allocate memory\n"
+msgstr ""
+
+#: inet/rcmd.c:172
+msgid "rcmd: socket: All ports in use\n"
+msgstr ""
+
+#: inet/rcmd.c:200
+#, c-format
+msgid "connect to address %s: "
+msgstr ""
+
+#: inet/rcmd.c:213
+#, c-format
+msgid "Trying %s...\n"
+msgstr ""
+
+#: inet/rcmd.c:249
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr ""
+
+#: inet/rcmd.c:265
+#, c-format
+msgid "rcmd: poll (setting up stderr): %m\n"
+msgstr ""
+
+#: inet/rcmd.c:268
+msgid "poll: protocol failure in circuit setup\n"
+msgstr ""
+
+#: inet/rcmd.c:301
+msgid "socket: protocol failure in circuit setup\n"
+msgstr ""
+
+#: inet/rcmd.c:325
+#, c-format
+msgid "rcmd: %s: short read"
+msgstr ""
+
+#: inet/rcmd.c:482
+msgid "lstat failed"
+msgstr ""
+
+#: inet/rcmd.c:484
+msgid "not regular file"
+msgstr ""
+
+#: inet/rcmd.c:489
+msgid "cannot open"
+msgstr ""
+
+#: inet/rcmd.c:491
+msgid "fstat failed"
+msgstr ""
+
+#: inet/rcmd.c:493
+msgid "bad owner"
+msgstr ""
+
+#: inet/rcmd.c:495
+msgid "writeable by other than owner"
+msgstr ""
+
+#: inet/rcmd.c:497
+msgid "hard linked somewhere"
+msgstr ""
+
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
+msgid "out of memory"
+msgstr ""
+
+#: inet/ruserpass.c:184
+msgid "Error: .netrc file is readable by others."
+msgstr ""
+
+#: inet/ruserpass.c:185
+msgid "Remove password or make file unreadable by others."
+msgstr ""
+
+#: inet/ruserpass.c:277
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr ""
+
+#: libidn/nfkc.c:464
+msgid "Character out of range for UTF-8"
+msgstr ""
+
+#: locale/programs/charmap-dir.c:57
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr ""
 
-#: locale/programs/charmap.c:139
+#: locale/programs/charmap.c:137
 #, c-format
 msgid "character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:197
+#: locale/programs/charmap.c:195
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:260
+#: locale/programs/charmap.c:258
 #, c-format
 msgid ""
 "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr ""
 
-#: locale/programs/charmap.c:339
+#: locale/programs/charmap.c:337
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr ""
 
-#: locale/programs/charmap.c:359 locale/programs/charmap.c:376
-#: locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
+#: locale/programs/repertoire.c:174
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:360
+#: locale/programs/charmap.c:358
 msgid "invalid definition"
 msgstr ""
 
-#: locale/programs/charmap.c:377 locale/programs/locfile.c:127
-#: locale/programs/locfile.c:154 locale/programs/repertoire.c:177
+#: locale/programs/charmap.c:375 locale/programs/locfile.c:125
+#: locale/programs/locfile.c:152 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr ""
 
-#: locale/programs/charmap.c:405
+#: locale/programs/charmap.c:403
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:412
+#: locale/programs/charmap.c:410
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr ""
 
-#: locale/programs/charmap.c:424
+#: locale/programs/charmap.c:422
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:447 locale/programs/repertoire.c:185
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr ""
 
-#: locale/programs/charmap.c:473
+#: locale/programs/charmap.c:471
 msgid "character sets with locking states are not supported"
 msgstr ""
 
-#: locale/programs/charmap.c:500 locale/programs/charmap.c:554
-#: locale/programs/charmap.c:586 locale/programs/charmap.c:680
-#: locale/programs/charmap.c:735 locale/programs/charmap.c:776
-#: locale/programs/charmap.c:817
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
+#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
+#: locale/programs/charmap.c:815
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:501 locale/programs/charmap.c:681
-#: locale/programs/charmap.c:777 locale/programs/repertoire.c:232
+#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
 msgid "no symbolic name given"
 msgstr ""
 
-#: locale/programs/charmap.c:555
+#: locale/programs/charmap.c:553
 msgid "invalid encoding given"
 msgstr ""
 
-#: locale/programs/charmap.c:564
+#: locale/programs/charmap.c:562
 msgid "too few bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:566
+#: locale/programs/charmap.c:564
 msgid "too many bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:588 locale/programs/charmap.c:736
-#: locale/programs/charmap.c:819 locale/programs/repertoire.c:298
+#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
 msgid "no symbolic name given for end of range"
 msgstr ""
 
-#: locale/programs/charmap.c:612 locale/programs/locfile.c:819
-#: locale/programs/repertoire.c:315
+#: locale/programs/charmap.c:610 locale/programs/locfile.c:817
+#: locale/programs/repertoire.c:313
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/charmap.c:645
+#: locale/programs/charmap.c:643
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/charmap.c:653 locale/programs/charmap.c:716
+#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
 #, c-format
 msgid "value for %s must be an integer"
 msgstr ""
 
-#: locale/programs/charmap.c:844
+#: locale/programs/charmap.c:842
 #, c-format
 msgid "%s: error in state machine"
 msgstr ""
 
-#: locale/programs/charmap.c:852 locale/programs/ld-address.c:605
+#: locale/programs/charmap.c:850 locale/programs/ld-address.c:610
 #: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3818
-#: locale/programs/ld-ctype.c:2226 locale/programs/ld-ctype.c:2995
-#: locale/programs/ld-identification.c:469
-#: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:324
-#: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1220
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:326
+#: locale/programs/ld-ctype.c:2224 locale/programs/ld-ctype.c:2993
+#: locale/programs/ld-identification.c:467
+#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347
+#: locale/programs/ld-monetary.c:956 locale/programs/ld-name.c:322
+#: locale/programs/ld-numeric.c:390 locale/programs/ld-paper.c:256
+#: locale/programs/ld-telephone.c:328 locale/programs/ld-time.c:1218
+#: locale/programs/locfile.c:824 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr ""
 
-#: locale/programs/charmap.c:871 locale/programs/charmap.c:882
+#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
 #, c-format
 msgid "unknown character `%s'"
 msgstr ""
 
-#: locale/programs/charmap.c:890
+#: locale/programs/charmap.c:888
 #, c-format
 msgid ""
 "number of bytes for byte sequence of beginning and end of range not the "
 "same: %d vs %d"
 msgstr ""
 
-#: locale/programs/charmap.c:995 locale/programs/ld-collate.c:2930
-#: locale/programs/repertoire.c:421
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2930
+#: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr ""
 
-#: locale/programs/charmap.c:1007 locale/programs/repertoire.c:433
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: locale/programs/charmap.c:1025
+#: locale/programs/charmap.c:1023
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr ""
 
-#: locale/programs/charmap.c:1031
+#: locale/programs/charmap.c:1029
 msgid "upper limit in range is not higher then lower limit"
 msgstr ""
 
-#: locale/programs/charmap.c:1089
+#: locale/programs/charmap.c:1087
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1534
-#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:134
-#: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
-#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
-#: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
-#: locale/programs/ld-telephone.c:95 locale/programs/ld-time.c:160
+#: locale/programs/ld-address.c:132 locale/programs/ld-collate.c:1532
+#: locale/programs/ld-ctype.c:419 locale/programs/ld-identification.c:132
+#: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:90
+#: locale/programs/ld-telephone.c:93 locale/programs/ld-time.c:158
 #, c-format
 msgid "No definition for %s category found"
 msgstr ""
 
-#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183
-#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:228
-#: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
-#: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
-#: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
-#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:106
-#: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
-#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
-#: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
-#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:176
-#: locale/programs/ld-time.c:197
+#: locale/programs/ld-address.c:143 locale/programs/ld-address.c:181
+#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:226
+#: locale/programs/ld-address.c:295 locale/programs/ld-address.c:314
+#: locale/programs/ld-address.c:327 locale/programs/ld-identification.c:145
+#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:204
+#: locale/programs/ld-monetary.c:248 locale/programs/ld-monetary.c:264
+#: locale/programs/ld-monetary.c:276 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:101
+#: locale/programs/ld-paper.c:110 locale/programs/ld-telephone.c:104
+#: locale/programs/ld-telephone.c:161 locale/programs/ld-time.c:174
+#: locale/programs/ld-time.c:195
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209
-#: locale/programs/ld-address.c:235 locale/programs/ld-address.c:265
-#: locale/programs/ld-name.c:118 locale/programs/ld-telephone.c:118
+#: locale/programs/ld-address.c:155 locale/programs/ld-address.c:207
+#: locale/programs/ld-address.c:233 locale/programs/ld-address.c:270
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:116
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr ""
 
-#: locale/programs/ld-address.c:169
+#: locale/programs/ld-address.c:167
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:220
+#: locale/programs/ld-address.c:218
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276
+#: locale/programs/ld-address.c:238
+#, c-format
+msgid "%s: field `%s' must not be defined"
+msgstr ""
+
+#: locale/programs/ld-address.c:252 locale/programs/ld-address.c:281
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:254 locale/programs/ld-address.c:282
-#: locale/programs/ld-address.c:316 locale/programs/ld-address.c:328
+#: locale/programs/ld-address.c:259 locale/programs/ld-address.c:287
+#: locale/programs/ld-address.c:321 locale/programs/ld-address.c:333
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr ""
 
-#: locale/programs/ld-address.c:301
+#: locale/programs/ld-address.c:306
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr ""
 
-#: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2602
-#: locale/programs/ld-identification.c:365
-#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
-#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:281
-#: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1109
-#: locale/programs/ld-time.c:1151
+#: locale/programs/ld-address.c:502 locale/programs/ld-address.c:539
+#: locale/programs/ld-address.c:577 locale/programs/ld-ctype.c:2600
+#: locale/programs/ld-identification.c:363
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300
+#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-monetary.c:774 locale/programs/ld-name.c:279
+#: locale/programs/ld-numeric.c:262 locale/programs/ld-paper.c:223
+#: locale/programs/ld-telephone.c:287 locale/programs/ld-time.c:1107
+#: locale/programs/ld-time.c:1149
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr ""
 
-#: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
-#: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
-#: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1003
-#: locale/programs/ld-time.c:1072 locale/programs/ld-time.c:1114
+#: locale/programs/ld-address.c:506 locale/programs/ld-address.c:544
+#: locale/programs/ld-identification.c:367 locale/programs/ld-messages.c:310
+#: locale/programs/ld-monetary.c:702 locale/programs/ld-monetary.c:737
+#: locale/programs/ld-name.c:283 locale/programs/ld-numeric.c:266
+#: locale/programs/ld-telephone.c:291 locale/programs/ld-time.c:1001
+#: locale/programs/ld-time.c:1070 locale/programs/ld-time.c:1112
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3800
-#: locale/programs/ld-ctype.c:2975 locale/programs/ld-identification.c:450
-#: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
-#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1202
+#: locale/programs/ld-address.c:591 locale/programs/ld-collate.c:3800
+#: locale/programs/ld-ctype.c:2973 locale/programs/ld-identification.c:448
+#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329
+#: locale/programs/ld-monetary.c:938 locale/programs/ld-name.c:304
+#: locale/programs/ld-numeric.c:372 locale/programs/ld-paper.c:238
+#: locale/programs/ld-telephone.c:310 locale/programs/ld-time.c:1200
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr ""
 
-#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2653
-#: locale/programs/ld-collate.c:3802 locale/programs/ld-ctype.c:2229
-#: locale/programs/ld-ctype.c:2978 locale/programs/ld-identification.c:453
-#: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
-#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:308
-#: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242
-#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1204
+#: locale/programs/ld-address.c:594 locale/programs/ld-collate.c:2653
+#: locale/programs/ld-collate.c:3802 locale/programs/ld-ctype.c:2227
+#: locale/programs/ld-ctype.c:2976 locale/programs/ld-identification.c:451
+#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
+#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
+#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
+#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1202
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:523
-#: locale/programs/ld-collate.c:575 locale/programs/ld-collate.c:871
-#: locale/programs/ld-collate.c:884 locale/programs/ld-collate.c:2640
-#: locale/programs/ld-collate.c:3809 locale/programs/ld-ctype.c:1957
-#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2800
-#: locale/programs/ld-ctype.c:2986 locale/programs/ld-identification.c:460
-#: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340
-#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:315
-#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1211
+#: locale/programs/ld-address.c:601 locale/programs/ld-collate.c:521
+#: locale/programs/ld-collate.c:573 locale/programs/ld-collate.c:869
+#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2640
+#: locale/programs/ld-collate.c:3809 locale/programs/ld-ctype.c:1955
+#: locale/programs/ld-ctype.c:2214 locale/programs/ld-ctype.c:2798
+#: locale/programs/ld-ctype.c:2984 locale/programs/ld-identification.c:458
+#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338
+#: locale/programs/ld-monetary.c:947 locale/programs/ld-name.c:313
+#: locale/programs/ld-numeric.c:381 locale/programs/ld-paper.c:247
+#: locale/programs/ld-telephone.c:319 locale/programs/ld-time.c:1209
 #, c-format
 msgid "%s: syntax error"
 msgstr ""
 
-#: locale/programs/ld-collate.c:398
+#: locale/programs/ld-collate.c:396
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr ""
 
-#: locale/programs/ld-collate.c:407
+#: locale/programs/ld-collate.c:405
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr ""
 
-#: locale/programs/ld-collate.c:414
+#: locale/programs/ld-collate.c:412
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:421
+#: locale/programs/ld-collate.c:419
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
+#: locale/programs/ld-collate.c:450 locale/programs/ld-collate.c:476
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr ""
 
-#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
-#: locale/programs/ld-collate.c:504
+#: locale/programs/ld-collate.c:460 locale/programs/ld-collate.c:486
+#: locale/programs/ld-collate.c:502
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:560
+#: locale/programs/ld-collate.c:558
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:596
+#: locale/programs/ld-collate.c:594
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr ""
 
-#: locale/programs/ld-collate.c:761
+#: locale/programs/ld-collate.c:759
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr ""
 
-#: locale/programs/ld-collate.c:856
+#: locale/programs/ld-collate.c:854
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:912
+#: locale/programs/ld-collate.c:910
 #, c-format
 msgid "%s: too many values"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
+#: locale/programs/ld-collate.c:1029 locale/programs/ld-collate.c:1204
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1079
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1106
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1148
 #, c-format
 msgid ""
 "%s: byte sequence of first character of sequence is not lower than that of "
 "the last character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1275
+#: locale/programs/ld-collate.c:1273
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1279
+#: locale/programs/ld-collate.c:1277
 #, c-format
 msgid ""
 "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1297 locale/programs/ld-ctype.c:1475
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
+#: locale/programs/ld-collate.c:1346 locale/programs/ld-collate.c:3737
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1357
+#: locale/programs/ld-collate.c:1355
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1550
+#: locale/programs/ld-collate.c:1548
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1573
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
+#: locale/programs/ld-collate.c:1649 locale/programs/ld-collate.c:1755
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
+#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
 #, c-format
 msgid "symbol `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1803
+#: locale/programs/ld-collate.c:1801
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1832
+#: locale/programs/ld-collate.c:1830
 #, c-format
 msgid "too many errors; giving up"
 msgstr ""
@@ -915,608 +1928,604 @@ msgstr ""
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-ctype.c:438
 #, c-format
 msgid "No character set name specified in charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:467
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:482
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:496 locale/programs/ld-ctype.c:554
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:525
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:541
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:571 locale/programs/ld-ctype.c:609
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:583 locale/programs/ld-ctype.c:620
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:598
 #, c-format
 msgid "character <SP> not defined in character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:714
+#: locale/programs/ld-ctype.c:712
 #, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:763
+#: locale/programs/ld-ctype.c:761
 #, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:828
+#: locale/programs/ld-ctype.c:826
 #, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:845
+#: locale/programs/ld-ctype.c:843
 #, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1245
+#: locale/programs/ld-ctype.c:1243
 #, c-format
 msgid "character class `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1251
+#: locale/programs/ld-ctype.c:1249
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1277
+#: locale/programs/ld-ctype.c:1275
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1283
+#: locale/programs/ld-ctype.c:1281
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1548 locale/programs/ld-ctype.c:1673
-#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2465
-#: locale/programs/ld-ctype.c:3461
+#: locale/programs/ld-ctype.c:1546 locale/programs/ld-ctype.c:1671
+#: locale/programs/ld-ctype.c:1777 locale/programs/ld-ctype.c:2463
+#: locale/programs/ld-ctype.c:3459
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2147
+#: locale/programs/ld-ctype.c:1574 locale/programs/ld-ctype.c:2145
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1703
+#: locale/programs/ld-ctype.c:1701
 msgid "start and end character sequence of range must have the same length"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1710
+#: locale/programs/ld-ctype.c:1708
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2067 locale/programs/ld-ctype.c:2118
+#: locale/programs/ld-ctype.c:2065 locale/programs/ld-ctype.c:2116
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2073 locale/programs/ld-ctype.c:2124
-#: locale/programs/ld-ctype.c:2166
+#: locale/programs/ld-ctype.c:2071 locale/programs/ld-ctype.c:2122
+#: locale/programs/ld-ctype.c:2164
 msgid "syntax error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2297
+#: locale/programs/ld-ctype.c:2295
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2312
+#: locale/programs/ld-ctype.c:2310
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2487
+#: locale/programs/ld-ctype.c:2485
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2496
+#: locale/programs/ld-ctype.c:2494
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2511
+#: locale/programs/ld-ctype.c:2509
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2525
+#: locale/programs/ld-ctype.c:2523
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2676
+#: locale/programs/ld-ctype.c:2674
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2762 locale/programs/ld-ctype.c:2906
+#: locale/programs/ld-ctype.c:2760 locale/programs/ld-ctype.c:2904
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2857
+#: locale/programs/ld-ctype.c:2855
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2862
+#: locale/programs/ld-ctype.c:2860
 msgid "previous definition was here"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2884
+#: locale/programs/ld-ctype.c:2882
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3037
+#: locale/programs/ld-ctype.c:3035
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3042 locale/programs/ld-ctype.c:3126
-#: locale/programs/ld-ctype.c:3146 locale/programs/ld-ctype.c:3167
-#: locale/programs/ld-ctype.c:3188 locale/programs/ld-ctype.c:3209
-#: locale/programs/ld-ctype.c:3230 locale/programs/ld-ctype.c:3270
-#: locale/programs/ld-ctype.c:3291 locale/programs/ld-ctype.c:3358
+#: locale/programs/ld-ctype.c:3040 locale/programs/ld-ctype.c:3124
+#: locale/programs/ld-ctype.c:3144 locale/programs/ld-ctype.c:3165
+#: locale/programs/ld-ctype.c:3186 locale/programs/ld-ctype.c:3207
+#: locale/programs/ld-ctype.c:3228 locale/programs/ld-ctype.c:3268
+#: locale/programs/ld-ctype.c:3289 locale/programs/ld-ctype.c:3356
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3121 locale/programs/ld-ctype.c:3141
-#: locale/programs/ld-ctype.c:3183 locale/programs/ld-ctype.c:3204
-#: locale/programs/ld-ctype.c:3225 locale/programs/ld-ctype.c:3265
-#: locale/programs/ld-ctype.c:3286 locale/programs/ld-ctype.c:3353
-#: locale/programs/ld-ctype.c:3395 locale/programs/ld-ctype.c:3420
+#: locale/programs/ld-ctype.c:3119 locale/programs/ld-ctype.c:3139
+#: locale/programs/ld-ctype.c:3181 locale/programs/ld-ctype.c:3202
+#: locale/programs/ld-ctype.c:3223 locale/programs/ld-ctype.c:3263
+#: locale/programs/ld-ctype.c:3284 locale/programs/ld-ctype.c:3351
+#: locale/programs/ld-ctype.c:3393 locale/programs/ld-ctype.c:3418
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3162
+#: locale/programs/ld-ctype.c:3160
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3402 locale/programs/ld-ctype.c:3427
+#: locale/programs/ld-ctype.c:3400 locale/programs/ld-ctype.c:3425
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3482
+#: locale/programs/ld-ctype.c:3480
 #, c-format
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3773
+#: locale/programs/ld-ctype.c:3771
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3869
+#: locale/programs/ld-ctype.c:3867
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3938
+#: locale/programs/ld-ctype.c:3936
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:4071
+#: locale/programs/ld-ctype.c:4069
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-identification.c:171
+#: locale/programs/ld-identification.c:169
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-identification.c:436
+#: locale/programs/ld-identification.c:434
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr ""
 
-#: locale/programs/ld-measurement.c:114
+#: locale/programs/ld-measurement.c:112
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr ""
 
-#: locale/programs/ld-messages.c:115 locale/programs/ld-messages.c:149
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:147
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr ""
 
-#: locale/programs/ld-messages.c:122 locale/programs/ld-messages.c:156
+#: locale/programs/ld-messages.c:120 locale/programs/ld-messages.c:154
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr ""
 
-#: locale/programs/ld-messages.c:138 locale/programs/ld-messages.c:172
+#: locale/programs/ld-messages.c:136 locale/programs/ld-messages.c:170
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:224
+#: locale/programs/ld-monetary.c:222
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:237
+#: locale/programs/ld-monetary.c:235
 #, c-format
 msgid ""
 "%s: value of field `int_curr_symbol' does not correspond to a valid name in "
 "ISO 4217"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
+#: locale/programs/ld-monetary.c:254 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be the empty string"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:282 locale/programs/ld-monetary.c:312
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:744 locale/programs/ld-numeric.c:273
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:841 locale/programs/ld-numeric.c:317
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:863 locale/programs/ld-numeric.c:338
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:906
 msgid "conversion rate value cannot be zero"
 msgstr ""
 
-#: locale/programs/ld-name.c:130 locale/programs/ld-telephone.c:127
-#: locale/programs/ld-telephone.c:150
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:125
+#: locale/programs/ld-telephone.c:148
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:246
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr ""
 
-#: locale/programs/ld-time.c:259
+#: locale/programs/ld-time.c:257
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr ""
 
-#: locale/programs/ld-time.c:272
+#: locale/programs/ld-time.c:270
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:280
+#: locale/programs/ld-time.c:278
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:331
+#: locale/programs/ld-time.c:329
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:340
+#: locale/programs/ld-time.c:338
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr ""
 
-#: locale/programs/ld-time.c:359
+#: locale/programs/ld-time.c:357
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:408
+#: locale/programs/ld-time.c:406
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:417
+#: locale/programs/ld-time.c:415
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:436
+#: locale/programs/ld-time.c:434
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:445
+#: locale/programs/ld-time.c:443
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:457
+#: locale/programs/ld-time.c:455
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:484
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:494 locale/programs/ld-time.c:502
+#: locale/programs/ld-time.c:492 locale/programs/ld-time.c:500
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:508
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:987
+#: locale/programs/ld-time.c:985
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:1032
+#: locale/programs/ld-time.c:1030
 msgid "extra trailing semicolon"
 msgstr ""
 
-#: locale/programs/ld-time.c:1035
+#: locale/programs/ld-time.c:1033
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr ""
 
-#: locale/programs/linereader.c:131
+#: locale/programs/linereader.c:129
 msgid "trailing garbage at end of line"
 msgstr ""
 
-#: locale/programs/linereader.c:305
+#: locale/programs/linereader.c:303
 msgid "garbage at end of number"
 msgstr ""
 
-#: locale/programs/linereader.c:417
+#: locale/programs/linereader.c:415
 msgid "garbage at end of character code specification"
 msgstr ""
 
-#: locale/programs/linereader.c:503
+#: locale/programs/linereader.c:501
 msgid "unterminated symbolic name"
 msgstr ""
 
-#: locale/programs/linereader.c:567 catgets/gencat.c:1196
-msgid "invalid escape sequence"
-msgstr ""
-
-#: locale/programs/linereader.c:630
+#: locale/programs/linereader.c:628
 msgid "illegal escape sequence at end of string"
 msgstr ""
 
-#: locale/programs/linereader.c:634 locale/programs/linereader.c:862
+#: locale/programs/linereader.c:632 locale/programs/linereader.c:860
 msgid "unterminated string"
 msgstr ""
 
-#: locale/programs/linereader.c:676
+#: locale/programs/linereader.c:674
 msgid "non-symbolic character value should not be used"
 msgstr ""
 
-#: locale/programs/linereader.c:823
+#: locale/programs/linereader.c:821
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr ""
 
-#: locale/programs/linereader.c:844
+#: locale/programs/linereader.c:842
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr ""
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:73
 msgid "System information:"
 msgstr ""
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:75
 msgid "Write names of available locales"
 msgstr ""
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:77
 msgid "Write names of available charmaps"
 msgstr ""
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:78
 msgid "Modify output format:"
 msgstr ""
 
-#: locale/programs/locale.c:81
+#: locale/programs/locale.c:79
 msgid "Write names of selected categories"
 msgstr ""
 
-#: locale/programs/locale.c:82
+#: locale/programs/locale.c:80
 msgid "Write names of selected keywords"
 msgstr ""
 
-#: locale/programs/locale.c:83
+#: locale/programs/locale.c:81
 msgid "Print more information"
 msgstr ""
 
-#: locale/programs/locale.c:88
+#: locale/programs/locale.c:86
 msgid ""
 "Get locale-specific information.\013For bug reporting instructions, please "
 "see:\n"
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
-#: locale/programs/locale.c:93
+#: locale/programs/locale.c:91
 msgid ""
 "NAME\n"
 "[-a|-m]"
 msgstr ""
 
-#: locale/programs/locale.c:194
+#: locale/programs/locale.c:192
 #, c-format
 msgid "Cannot set LC_CTYPE to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:196
+#: locale/programs/locale.c:194
 #, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:209
+#: locale/programs/locale.c:207
 #, c-format
 msgid "Cannot set LC_COLLATE to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:225
+#: locale/programs/locale.c:223
 #, c-format
 msgid "Cannot set LC_ALL to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:501
+#: locale/programs/locale.c:499
 #, c-format
 msgid "while preparing output"
 msgstr ""
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:119
 msgid "Input Files:"
 msgstr ""
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:121
 msgid "Symbolic character names defined in FILE"
 msgstr ""
 
-#: locale/programs/localedef.c:124
+#: locale/programs/localedef.c:122
 msgid "Source definitions are found in FILE"
 msgstr ""
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:124
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr ""
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:128
 msgid "Create output even if warning messages were issued"
 msgstr ""
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:129
 msgid "Create old-style tables"
 msgstr ""
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:130
 msgid "Optional output file prefix"
 msgstr ""
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:131
 msgid "Be strictly POSIX conform"
 msgstr ""
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:133
 msgid "Suppress warnings and information messages"
 msgstr ""
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:134
 msgid "Print more messages"
 msgstr ""
 
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:135
 msgid "Archive control:"
 msgstr ""
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:137
 msgid "Don't add new data to archive"
 msgstr ""
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:139
 msgid "Add locales named by parameters to archive"
 msgstr ""
 
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:140
 msgid "Replace existing archive content"
 msgstr ""
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:142
 msgid "Remove locales named by parameters from archive"
 msgstr ""
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:143
 msgid "List content of archive"
 msgstr ""
 
-#: locale/programs/localedef.c:147
+#: locale/programs/localedef.c:145
 msgid "locale.alias file to consult when making archive"
 msgstr ""
 
-#: locale/programs/localedef.c:152
+#: locale/programs/localedef.c:150
 msgid "Compile locale specification"
 msgstr ""
 
-#: locale/programs/localedef.c:155
+#: locale/programs/localedef.c:153
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
 "--list-archive [FILE]"
 msgstr ""
 
-#: locale/programs/localedef.c:233
+#: locale/programs/localedef.c:231
 #, c-format
 msgid "cannot create directory for output files"
 msgstr ""
 
-#: locale/programs/localedef.c:244
+#: locale/programs/localedef.c:242
 #, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr ""
 
-#: locale/programs/localedef.c:258 locale/programs/localedef.c:274
-#: locale/programs/localedef.c:600 locale/programs/localedef.c:620
+#: locale/programs/localedef.c:256 locale/programs/localedef.c:272
+#: locale/programs/localedef.c:598 locale/programs/localedef.c:618
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr ""
 
-#: locale/programs/localedef.c:286
+#: locale/programs/localedef.c:284
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr ""
 
-#: locale/programs/localedef.c:367
+#: locale/programs/localedef.c:365
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -1525,1927 +2534,1687 @@ msgid ""
 "%s"
 msgstr ""
 
-#: locale/programs/localedef.c:568
+#: locale/programs/localedef.c:566
 #, c-format
 msgid "circular dependencies between locale definitions"
 msgstr ""
 
-#: locale/programs/localedef.c:574
+#: locale/programs/localedef.c:572
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr ""
 
-#: locale/programs/locarchive.c:89 locale/programs/locarchive.c:258
+#: locale/programs/locarchive.c:87 locale/programs/locarchive.c:256
 #, c-format
 msgid "cannot create temporary file"
 msgstr ""
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:304
+#: locale/programs/locarchive.c:116 locale/programs/locarchive.c:302
 #, c-format
 msgid "cannot initialize archive file"
 msgstr ""
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:311
+#: locale/programs/locarchive.c:123 locale/programs/locarchive.c:309
 #, c-format
 msgid "cannot resize archive file"
 msgstr ""
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:320
-#: locale/programs/locarchive.c:508
+#: locale/programs/locarchive.c:132 locale/programs/locarchive.c:318
+#: locale/programs/locarchive.c:506
 #, c-format
 msgid "cannot map archive header"
 msgstr ""
 
-#: locale/programs/locarchive.c:156
+#: locale/programs/locarchive.c:154
 #, c-format
 msgid "failed to create new locale archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:168
+#: locale/programs/locarchive.c:166
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:252
+#: locale/programs/locarchive.c:250
 #, c-format
 msgid "cannot map locale archive file"
 msgstr ""
 
-#: locale/programs/locarchive.c:328
+#: locale/programs/locarchive.c:326
 #, c-format
 msgid "cannot lock new archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:377
+#: locale/programs/locarchive.c:375
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr ""
 
-#: locale/programs/locarchive.c:386
+#: locale/programs/locarchive.c:384
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:394
+#: locale/programs/locarchive.c:392
 #, c-format
 msgid "cannot rename new archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:447
+#: locale/programs/locarchive.c:445
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr ""
 
-#: locale/programs/locarchive.c:452
+#: locale/programs/locarchive.c:450
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr ""
 
-#: locale/programs/locarchive.c:471
+#: locale/programs/locarchive.c:469
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr ""
 
-#: locale/programs/locarchive.c:494
+#: locale/programs/locarchive.c:492
 #, c-format
 msgid "cannot read archive header"
 msgstr ""
 
-#: locale/programs/locarchive.c:554
+#: locale/programs/locarchive.c:552
 #, c-format
 msgid "locale '%s' already exists"
 msgstr ""
 
-#: locale/programs/locarchive.c:785 locale/programs/locarchive.c:800
-#: locale/programs/locarchive.c:812 locale/programs/locarchive.c:824
-#: locale/programs/locfile.c:344
+#: locale/programs/locarchive.c:783 locale/programs/locarchive.c:798
+#: locale/programs/locarchive.c:810 locale/programs/locarchive.c:822
+#: locale/programs/locfile.c:342
 #, c-format
 msgid "cannot add to locale archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:979
+#: locale/programs/locarchive.c:977
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr ""
 
-#: locale/programs/locarchive.c:1123
+#: locale/programs/locarchive.c:1121
 #, c-format
 msgid "Adding %s\n"
 msgstr ""
 
-#: locale/programs/locarchive.c:1129
+#: locale/programs/locarchive.c:1127
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1135
+#: locale/programs/locarchive.c:1133
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1142
+#: locale/programs/locarchive.c:1140
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1214
+#: locale/programs/locarchive.c:1212
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr ""
 
-#: locale/programs/locarchive.c:1278
+#: locale/programs/locarchive.c:1276
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1348
+#: locale/programs/locarchive.c:1346
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr ""
 
-#: locale/programs/locfile.c:133
+#: locale/programs/locfile.c:131
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr ""
 
-#: locale/programs/locfile.c:252
+#: locale/programs/locfile.c:250
 msgid "syntax error: not inside a locale definition section"
 msgstr ""
 
-#: locale/programs/locfile.c:626
+#: locale/programs/locfile.c:624
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:650
+#: locale/programs/locfile.c:648
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:746
+#: locale/programs/locfile.c:744
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:782
+#: locale/programs/locfile.c:780
 msgid "expect string argument for `copy'"
 msgstr ""
 
-#: locale/programs/locfile.c:786
+#: locale/programs/locfile.c:784
 msgid "locale name should consist only of portable characters"
 msgstr ""
 
-#: locale/programs/locfile.c:805
+#: locale/programs/locfile.c:803
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr ""
 
-#: locale/programs/repertoire.c:231 locale/programs/repertoire.c:272
-#: locale/programs/repertoire.c:297
+#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
+#: locale/programs/repertoire.c:295
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr ""
 
-#: locale/programs/repertoire.c:273
+#: locale/programs/repertoire.c:271
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr ""
 
-#: locale/programs/repertoire.c:333
+#: locale/programs/repertoire.c:331
 #, c-format
 msgid "cannot safe new repertoire map"
 msgstr ""
 
-#: locale/programs/repertoire.c:344
+#: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr ""
 
-#: locale/programs/repertoire.c:451
+#: locale/programs/repertoire.c:449
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr ""
 
-#: locale/programs/repertoire.c:458
+#: locale/programs/repertoire.c:456
 msgid "upper limit in range is not smaller then lower limit"
 msgstr ""
 
-#: locale/programs/xmalloc.c:70 malloc/obstack.c:415 malloc/obstack.c:418
-#: posix/getconf.c:1104 elf/ldconfig.c:1101
+#: login/programs/pt_chown.c:74
 #, c-format
-msgid "memory exhausted"
+msgid ""
+"Set the owner, group and access permission of the slave pseudo terminal "
+"corresponding to the master pseudo terminal passed on file descriptor `%d'.  "
+"This is the helper program for the `grantpt' function.  It is not intended "
+"to be run directly from the command line.\n"
 msgstr ""
 
-#: assert/assert-perr.c:57
+#: login/programs/pt_chown.c:84
 #, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgid ""
+"The owner is set to the current user, the group is set to `%s', and the "
+"access permission is set to `%o'.\n"
+"\n"
+"%s"
 msgstr ""
 
-#: assert/assert.c:56
+#: login/programs/pt_chown.c:161
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr ""
-
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:99
-msgid "NAME"
+msgid "too many arguments"
 msgstr ""
 
-#: catgets/gencat.c:112
-msgid "Create C header file NAME containing symbol definitions"
+#: login/programs/pt_chown.c:169
+#, c-format
+msgid "needs to be installed setuid `root'"
 msgstr ""
 
-#: catgets/gencat.c:114
-msgid "Do not use existing catalog, force new output file"
+#: malloc/mcheck.c:324
+msgid "memory is consistent, library is buggy\n"
 msgstr ""
 
-#: catgets/gencat.c:115
-msgid "Write output to file NAME"
+#: malloc/mcheck.c:327
+msgid "memory clobbered before allocated block\n"
 msgstr ""
 
-#: catgets/gencat.c:120
-msgid ""
-"Generate message catalog.\013If INPUT-FILE is -, input is read from standard "
-"input.  If OUTPUT-FILE\n"
-"is -, output is written to standard output.\n"
+#: malloc/mcheck.c:330
+msgid "memory clobbered past end of allocated block\n"
 msgstr ""
 
-#: catgets/gencat.c:125
-msgid ""
-"-o OUTPUT-FILE [INPUT-FILE]...\n"
-"[OUTPUT-FILE [INPUT-FILE]...]"
+#: malloc/mcheck.c:333
+msgid "block freed twice\n"
 msgstr ""
 
-#: catgets/gencat.c:283
-msgid "*standard input*"
+#: malloc/mcheck.c:336
+msgid "bogus mcheck_status, library is buggy\n"
 msgstr ""
 
-#: catgets/gencat.c:418 catgets/gencat.c:495
-msgid "illegal set number"
+#: malloc/memusage.sh:27
+msgid "Try `memusage --help' for more information."
 msgstr ""
 
-#: catgets/gencat.c:445
-msgid "duplicate set definition"
+#: malloc/memusage.sh:33
+msgid "memusage: option `$1' requires an argument"
 msgstr ""
 
-#: catgets/gencat.c:447 catgets/gencat.c:624 catgets/gencat.c:678
-msgid "this is the first definition"
+#: malloc/memusage.sh:39
+msgid ""
+"Usage: memusage [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
+"Profile memory usage of PROGRAM.\n"
+"\n"
+"   -n,--progname=NAME     Name of the program file to profile\n"
+"   -p,--png=FILE          Generate PNG graphic and store it in FILE\n"
+"   -d,--data=FILE         Generate binary data file and store it in FILE\n"
+"   -u,--unbuffered        Don't buffer output\n"
+"   -b,--buffer=SIZE       Collect SIZE entries before writing them out\n"
+"      --no-timer          Don't collect additional information though timer\n"
+"   -m,--mmap              Also trace mmap & friends\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+" The following options only apply when generating graphical output:\n"
+"   -t,--time-based        Make graph linear in time\n"
+"   -T,--total             Also draw graph of total memory use\n"
+"      --title=STRING      Use STRING as title of the graph\n"
+"   -x,--x-size=SIZE       Make graphic SIZE pixels wide\n"
+"   -y,--y-size=SIZE       Make graphic SIZE pixels high\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any "
+"corresponding\n"
+"short options.\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
 msgstr ""
 
-#: catgets/gencat.c:523
-#, c-format
-msgid "unknown set `%s'"
+#: malloc/memusage.sh:90
+msgid ""
+"Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
+"unbuffered]\n"
+"            [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
+"            [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
+"            PROGRAM [PROGRAMOPTION]..."
 msgstr ""
 
-#: catgets/gencat.c:564
-msgid "invalid quote character"
+#: malloc/memusage.sh:182
+msgid "memusage: option `${1##*=}' is ambiguous"
 msgstr ""
 
-#: catgets/gencat.c:577
-#, c-format
-msgid "unknown directive `%s': line ignored"
+#: malloc/memusage.sh:191
+msgid "memusage: unrecognized option `$1'"
 msgstr ""
 
-#: catgets/gencat.c:622
-msgid "duplicated message number"
+#: malloc/memusage.sh:204
+msgid "No program name given"
 msgstr ""
 
-#: catgets/gencat.c:675
-msgid "duplicated message identifier"
+#: malloc/memusagestat.c:53
+msgid "Name output file"
 msgstr ""
 
-#: catgets/gencat.c:732
-msgid "invalid character: message ignored"
+#: malloc/memusagestat.c:54
+msgid "Title string used in output graphic"
 msgstr ""
 
-#: catgets/gencat.c:775
-msgid "invalid line"
+#: malloc/memusagestat.c:55
+msgid ""
+"Generate output linear to time (default is linear to number of function "
+"calls)"
 msgstr ""
 
-#: catgets/gencat.c:829
-msgid "malformed line ignored"
+#: malloc/memusagestat.c:57
+msgid "Also draw graph for total memory consumption"
 msgstr ""
 
-#: catgets/gencat.c:993 catgets/gencat.c:1034
-#, c-format
-msgid "cannot open output file `%s'"
+#: malloc/memusagestat.c:58
+msgid "make output graphic VALUE pixel wide"
 msgstr ""
 
-#: catgets/gencat.c:1218
-msgid "unterminated message"
+#: malloc/memusagestat.c:59
+msgid "make output graphic VALUE pixel high"
 msgstr ""
 
-#: catgets/gencat.c:1242
-#, c-format
-msgid "while opening old catalog file"
+#: malloc/memusagestat.c:64
+msgid "Generate graphic from memory profiling data"
 msgstr ""
 
-#: catgets/gencat.c:1333
-#, c-format
-msgid "conversion modules not available"
+#: malloc/memusagestat.c:67
+msgid "DATAFILE [OUTFILE]"
 msgstr ""
 
-#: catgets/gencat.c:1359
-#, c-format
-msgid "cannot determine escape character"
+#: misc/error.c:131 misc/error.c:159 timezone/zic.c:396
+msgid "Unknown system error"
 msgstr ""
 
-#: stdlib/../sysdeps/unix/sysv/linux/ia64/makecontext.c:63
-#, c-format
-msgid "makecontext: does not know how to handle more than 8 arguments\n"
+#: nis/nis_callback.c:189
+msgid "unable to free arguments"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:20 posix/regcomp.c:160
-#: nis/nis_error.c:29 nis/ypclnt.c:793 nis/ypclnt.c:860
+#: nis/nis_error.c:29 posix/regcomp.c:132 sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr ""
 
-#. TRANS Operation not permitted; only the owner of the file (or other resource)
-#. TRANS or processes with special privileges can perform the operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:25
-msgid "Operation not permitted"
-msgstr ""
-
-#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
-#. TRANS for ordinary files that are referenced in contexts where they are
-#. TRANS expected to already exist.
-#: stdio-common/../sysdeps/gnu/errlist.c:36 elf/ldd.bash.in:148
-msgid "No such file or directory"
-msgstr ""
-
-#. TRANS No process matches the specified process ID.
-#: stdio-common/../sysdeps/gnu/errlist.c:45
-msgid "No such process"
-msgstr ""
-
-#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
-#. TRANS completion of the call.  When this happens, you should try the call
-#. TRANS again.
-#. TRANS
-#. TRANS You can choose to have functions resume after a signal that is handled,
-#. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
-#. TRANS Primitives}.
-#: stdio-common/../sysdeps/gnu/errlist.c:60
-msgid "Interrupted system call"
+#: nis/nis_error.c:30
+msgid "Probable success"
 msgstr ""
 
-#. TRANS Input/output error; usually used for physical read or write errors.
-#: stdio-common/../sysdeps/gnu/errlist.c:69
-msgid "Input/output error"
+#: nis/nis_error.c:31
+msgid "Not found"
 msgstr ""
 
-#. TRANS No such device or address.  The system tried to use the device
-#. TRANS represented by a file you specified, and it couldn't find the device.
-#. TRANS This can mean that the device file was installed incorrectly, or that
-#. TRANS the physical device is missing or not correctly attached to the
-#. TRANS computer.
-#: stdio-common/../sysdeps/gnu/errlist.c:82
-msgid "No such device or address"
+#: nis/nis_error.c:32
+msgid "Probably not found"
 msgstr ""
 
-#. TRANS Argument list too long; used when the arguments passed to a new program
-#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
-#. TRANS File}) occupy too much memory space.  This condition never arises in the
-#. TRANS GNU system.
-#: stdio-common/../sysdeps/gnu/errlist.c:94
-msgid "Argument list too long"
+#: nis/nis_error.c:33
+msgid "Cache expired"
 msgstr ""
 
-#. TRANS Invalid executable file format.  This condition is detected by the
-#. TRANS @code{exec} functions; see @ref{Executing a File}.
-#: stdio-common/../sysdeps/gnu/errlist.c:104
-msgid "Exec format error"
+#: nis/nis_error.c:34
+msgid "NIS+ servers unreachable"
 msgstr ""
 
-#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
-#. TRANS closed or reading from a descriptor open only for writing (or vice
-#. TRANS versa).
-#: stdio-common/../sysdeps/gnu/errlist.c:115
-msgid "Bad file descriptor"
+#: nis/nis_error.c:35
+msgid "Unknown object"
 msgstr ""
 
-#. TRANS There are no child processes.  This error happens on operations that are
-#. TRANS supposed to manipulate child processes, when there aren't any processes
-#. TRANS to manipulate.
-#: stdio-common/../sysdeps/gnu/errlist.c:126
-msgid "No child processes"
+#: nis/nis_error.c:36
+msgid "Server busy, try again"
 msgstr ""
 
-#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
-#. TRANS deadlock situation.  The system does not guarantee that it will notice
-#. TRANS all such situations.  This error means you got lucky and the system
-#. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
-#: stdio-common/../sysdeps/gnu/errlist.c:138
-msgid "Resource deadlock avoided"
+#: nis/nis_error.c:37
+msgid "Generic system error"
 msgstr ""
 
-#. TRANS No memory available.  The system cannot allocate more virtual memory
-#. TRANS because its capacity is full.
-#: stdio-common/../sysdeps/gnu/errlist.c:148
-msgid "Cannot allocate memory"
+#: nis/nis_error.c:38
+msgid "First/next chain broken"
 msgstr ""
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:157 nis/nis_error.c:39
-#: nis/ypclnt.c:823
+#: nis/nis_error.c:39 sysdeps/gnu/errlist.c:157
 msgid "Permission denied"
 msgstr ""
 
-#. TRANS Bad address; an invalid pointer was detected.
-#. TRANS In the GNU system, this error never happens; you get a signal instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:167
-msgid "Bad address"
-msgstr ""
-
-#. TRANS A file that isn't a block special file was given in a situation that
-#. TRANS requires one.  For example, trying to mount an ordinary file as a file
-#. TRANS system in Unix gives this error.
-#: stdio-common/../sysdeps/gnu/errlist.c:178
-msgid "Block device required"
-msgstr ""
-
-#. TRANS Resource busy; a system resource that can't be shared is already in use.
-#. TRANS For example, if you try to delete a file that is the root of a currently
-#. TRANS mounted filesystem, you get this error.
-#: stdio-common/../sysdeps/gnu/errlist.c:189
-msgid "Device or resource busy"
-msgstr ""
-
-#. TRANS File exists; an existing file was specified in a context where it only
-#. TRANS makes sense to specify a new file.
-#: stdio-common/../sysdeps/gnu/errlist.c:199
-msgid "File exists"
-msgstr ""
-
-#. TRANS An attempt to make an improper link across file systems was detected.
-#. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
-#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
-#: stdio-common/../sysdeps/gnu/errlist.c:210
-msgid "Invalid cross-device link"
-msgstr ""
-
-#. TRANS The wrong type of device was given to a function that expects a
-#. TRANS particular sort of device.
-#: stdio-common/../sysdeps/gnu/errlist.c:220
-msgid "No such device"
+#: nis/nis_error.c:40
+msgid "Not owner"
 msgstr ""
 
-#. TRANS A file that isn't a directory was specified when a directory is required.
-#: stdio-common/../sysdeps/gnu/errlist.c:229
-msgid "Not a directory"
+#: nis/nis_error.c:41
+msgid "Name not served by this server"
 msgstr ""
 
-#. TRANS File is a directory; you cannot open a directory for writing,
-#. TRANS or create or remove hard links to it.
-#: stdio-common/../sysdeps/gnu/errlist.c:239
-msgid "Is a directory"
+#: nis/nis_error.c:42
+msgid "Server out of memory"
 msgstr ""
 
-#. TRANS Invalid argument.  This is used to indicate various kinds of problems
-#. TRANS with passing the wrong argument to a library function.
-#: stdio-common/../sysdeps/gnu/errlist.c:249
-msgid "Invalid argument"
+#: nis/nis_error.c:43
+msgid "Object with same name exists"
 msgstr ""
 
-#. TRANS The current process has too many files open and can't open any more.
-#. TRANS Duplicate descriptors do count toward this limit.
-#. TRANS
-#. TRANS In BSD and GNU, the number of open files is controlled by a resource
-#. TRANS limit that can usually be increased.  If you get this error, you might
-#. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
-#. TRANS @pxref{Limits on Resources}.
-#: stdio-common/../sysdeps/gnu/errlist.c:264
-msgid "Too many open files"
+#: nis/nis_error.c:44
+msgid "Not master server for this domain"
 msgstr ""
 
-#. TRANS There are too many distinct file openings in the entire system.  Note
-#. TRANS that any number of linked channels count as just one file opening; see
-#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
-#: stdio-common/../sysdeps/gnu/errlist.c:275
-msgid "Too many open files in system"
+#: nis/nis_error.c:45
+msgid "Invalid object for operation"
 msgstr ""
 
-#. TRANS Inappropriate I/O control operation, such as trying to set terminal
-#. TRANS modes on an ordinary file.
-#: stdio-common/../sysdeps/gnu/errlist.c:285
-msgid "Inappropriate ioctl for device"
+#: nis/nis_error.c:46
+msgid "Malformed name, or illegal name"
 msgstr ""
 
-#. TRANS An attempt to execute a file that is currently open for writing, or
-#. TRANS write to a file that is currently being executed.  Often using a
-#. TRANS debugger to run a program is considered having it open for writing and
-#. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
-#. TRANS is not an error in the GNU system; the text is copied as necessary.
-#: stdio-common/../sysdeps/gnu/errlist.c:298
-msgid "Text file busy"
+#: nis/nis_error.c:47
+msgid "Unable to create callback"
 msgstr ""
 
-#. TRANS File too big; the size of a file would be larger than allowed by the system.
-#: stdio-common/../sysdeps/gnu/errlist.c:307
-msgid "File too large"
+#: nis/nis_error.c:48
+msgid "Results sent to callback proc"
 msgstr ""
 
-#. TRANS No space left on device; write operation on a file failed because the
-#. TRANS disk is full.
-#: stdio-common/../sysdeps/gnu/errlist.c:317
-msgid "No space left on device"
+#: nis/nis_error.c:49
+msgid "Not found, no such name"
 msgstr ""
 
-#. TRANS Invalid seek operation (such as on a pipe).
-#: stdio-common/../sysdeps/gnu/errlist.c:326
-msgid "Illegal seek"
+#: nis/nis_error.c:50
+msgid "Name/entry isn't unique"
 msgstr ""
 
-#. TRANS An attempt was made to modify something on a read-only file system.
-#: stdio-common/../sysdeps/gnu/errlist.c:335
-msgid "Read-only file system"
+#: nis/nis_error.c:51
+msgid "Modification failed"
 msgstr ""
 
-#. TRANS Too many links; the link count of a single file would become too large.
-#. TRANS @code{rename} can cause this error if the file being renamed already has
-#. TRANS as many links as it can take (@pxref{Renaming Files}).
-#: stdio-common/../sysdeps/gnu/errlist.c:346
-msgid "Too many links"
+#: nis/nis_error.c:52
+msgid "Database for table does not exist"
 msgstr ""
 
-#. TRANS Domain error; used by mathematical functions when an argument value does
-#. TRANS not fall into the domain over which the function is defined.
-#: stdio-common/../sysdeps/gnu/errlist.c:369
-msgid "Numerical argument out of domain"
+#: nis/nis_error.c:53
+msgid "Entry/table type mismatch"
 msgstr ""
 
-#. TRANS Range error; used by mathematical functions when the result value is
-#. TRANS not representable because of overflow or underflow.
-#: stdio-common/../sysdeps/gnu/errlist.c:379
-msgid "Numerical result out of range"
+#: nis/nis_error.c:54
+msgid "Link points to illegal name"
 msgstr ""
 
-#. TRANS Resource temporarily unavailable; the call might work if you try again
-#. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
-#. TRANS they are always the same in the GNU C library.
-#. TRANS
-#. TRANS This error can happen in a few different situations:
-#. TRANS
-#. TRANS @itemize @bullet
-#. TRANS @item
-#. TRANS An operation that would block was attempted on an object that has
-#. TRANS non-blocking mode selected.  Trying the same operation again will block
-#. TRANS until some external condition makes it possible to read, write, or
-#. TRANS connect (whatever the operation).  You can use @code{select} to find out
-#. TRANS when the operation will be possible; @pxref{Waiting for I/O}.
-#. TRANS
-#. TRANS @strong{Portability Note:} In many older Unix systems, this condition
-#. TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
-#. TRANS different from @code{EAGAIN}.  To make your program portable, you should
-#. TRANS check for both codes and treat them the same.
-#. TRANS
-#. TRANS @item
-#. TRANS A temporary resource shortage made an operation impossible.  @code{fork}
-#. TRANS can return this error.  It indicates that the shortage is expected to
-#. TRANS pass, so your program can try the call again later and it may succeed.
-#. TRANS It is probably a good idea to delay for a few seconds before trying it
-#. TRANS again, to allow time for other processes to release scarce resources.
-#. TRANS Such shortages are usually fairly serious and affect the whole system,
-#. TRANS so usually an interactive program should report the error to the user
-#. TRANS and return to its command loop.
-#. TRANS @end itemize
-#: stdio-common/../sysdeps/gnu/errlist.c:416
-msgid "Resource temporarily unavailable"
+#: nis/nis_error.c:55
+msgid "Partial success"
 msgstr ""
 
-#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
-#. TRANS The values are always the same, on every operating system.
-#. TRANS
-#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
-#. TRANS separate error code.
-#: stdio-common/../sysdeps/gnu/errlist.c:429
-msgid "Operation would block"
+#: nis/nis_error.c:56
+msgid "Too many attributes"
 msgstr ""
 
-#. TRANS An operation that cannot complete immediately was initiated on an object
-#. TRANS that has non-blocking mode selected.  Some functions that must always
-#. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
-#. TRANS @code{EAGAIN}.  Instead, they return @code{EINPROGRESS} to indicate that
-#. TRANS the operation has begun and will take some time.  Attempts to manipulate
-#. TRANS the object before the call completes return @code{EALREADY}.  You can
-#. TRANS use the @code{select} function to find out when the pending operation
-#. TRANS has completed; @pxref{Waiting for I/O}.
-#: stdio-common/../sysdeps/gnu/errlist.c:445
-msgid "Operation now in progress"
+#: nis/nis_error.c:57
+msgid "Error in RPC subsystem"
 msgstr ""
 
-#. TRANS An operation is already in progress on an object that has non-blocking
-#. TRANS mode selected.
-#: stdio-common/../sysdeps/gnu/errlist.c:455
-msgid "Operation already in progress"
+#: nis/nis_error.c:58
+msgid "Missing or malformed attribute"
 msgstr ""
 
-#. TRANS A file that isn't a socket was specified when a socket is required.
-#: stdio-common/../sysdeps/gnu/errlist.c:464
-msgid "Socket operation on non-socket"
+#: nis/nis_error.c:59
+msgid "Named object is not searchable"
 msgstr ""
 
-#. TRANS The size of a message sent on a socket was larger than the supported
-#. TRANS maximum size.
-#: stdio-common/../sysdeps/gnu/errlist.c:474
-msgid "Message too long"
+#: nis/nis_error.c:60
+msgid "Error while talking to callback proc"
 msgstr ""
 
-#. TRANS The socket type does not support the requested communications protocol.
-#: stdio-common/../sysdeps/gnu/errlist.c:483
-msgid "Protocol wrong type for socket"
+#: nis/nis_error.c:61
+msgid "Non NIS+ namespace encountered"
 msgstr ""
 
-#. TRANS You specified a socket option that doesn't make sense for the
-#. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
-#: stdio-common/../sysdeps/gnu/errlist.c:493
-msgid "Protocol not available"
+#: nis/nis_error.c:62
+msgid "Illegal object type for operation"
 msgstr ""
 
-#. TRANS The socket domain does not support the requested communications protocol
-#. TRANS (perhaps because the requested protocol is completely invalid).
-#. TRANS @xref{Creating a Socket}.
-#: stdio-common/../sysdeps/gnu/errlist.c:504
-msgid "Protocol not supported"
+#: nis/nis_error.c:63
+msgid "Passed object is not the same object on server"
 msgstr ""
 
-#. TRANS The socket type is not supported.
-#: stdio-common/../sysdeps/gnu/errlist.c:513
-msgid "Socket type not supported"
+#: nis/nis_error.c:64
+msgid "Modify operation failed"
 msgstr ""
 
-#. TRANS The operation you requested is not supported.  Some socket functions
-#. TRANS don't make sense for all types of sockets, and others may not be
-#. TRANS implemented for all communications protocols.  In the GNU system, this
-#. TRANS error can happen for many calls when the object does not support the
-#. TRANS particular operation; it is a generic indication that the server knows
-#. TRANS nothing to do for that call.
-#: stdio-common/../sysdeps/gnu/errlist.c:527
-msgid "Operation not supported"
+#: nis/nis_error.c:65
+msgid "Query illegal for named table"
 msgstr ""
 
-#. TRANS The socket communications protocol family you requested is not supported.
-#: stdio-common/../sysdeps/gnu/errlist.c:536
-msgid "Protocol family not supported"
+#: nis/nis_error.c:66
+msgid "Attempt to remove a non-empty table"
 msgstr ""
 
-#. TRANS The address family specified for a socket is not supported; it is
-#. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
-#: stdio-common/../sysdeps/gnu/errlist.c:546
-msgid "Address family not supported by protocol"
+#: nis/nis_error.c:67
+msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
 msgstr ""
 
-#. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
-#: stdio-common/../sysdeps/gnu/errlist.c:555
-msgid "Address already in use"
+#: nis/nis_error.c:68
+msgid "Full resync required for directory"
 msgstr ""
 
-#. TRANS The requested socket address is not available; for example, you tried
-#. TRANS to give a socket a name that doesn't match the local host name.
-#. TRANS @xref{Socket Addresses}.
-#: stdio-common/../sysdeps/gnu/errlist.c:566
-msgid "Cannot assign requested address"
+#: nis/nis_error.c:69
+msgid "NIS+ operation failed"
 msgstr ""
 
-#. TRANS A socket operation failed because the network was down.
-#: stdio-common/../sysdeps/gnu/errlist.c:575
-msgid "Network is down"
+#: nis/nis_error.c:70
+msgid "NIS+ service is unavailable or not installed"
 msgstr ""
 
-#. TRANS A socket operation failed because the subnet containing the remote host
-#. TRANS was unreachable.
-#: stdio-common/../sysdeps/gnu/errlist.c:585
-msgid "Network is unreachable"
+#: nis/nis_error.c:71
+msgid "Yes, 42 is the meaning of life"
 msgstr ""
 
-#. TRANS A network connection was reset because the remote host crashed.
-#: stdio-common/../sysdeps/gnu/errlist.c:594
-msgid "Network dropped connection on reset"
+#: nis/nis_error.c:72
+msgid "Unable to authenticate NIS+ server"
 msgstr ""
 
-#. TRANS A network connection was aborted locally.
-#: stdio-common/../sysdeps/gnu/errlist.c:603
-msgid "Software caused connection abort"
+#: nis/nis_error.c:73
+msgid "Unable to authenticate NIS+ client"
 msgstr ""
 
-#. TRANS A network connection was closed for reasons outside the control of the
-#. TRANS local host, such as by the remote machine rebooting or an unrecoverable
-#. TRANS protocol violation.
-#: stdio-common/../sysdeps/gnu/errlist.c:614
-msgid "Connection reset by peer"
+#: nis/nis_error.c:74
+msgid "No file space on server"
 msgstr ""
 
-#. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
-#. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
-#. TRANS other from network operations.
-#: stdio-common/../sysdeps/gnu/errlist.c:625
-msgid "No buffer space available"
+#: nis/nis_error.c:75
+msgid "Unable to create process on server"
 msgstr ""
 
-#. TRANS You tried to connect a socket that is already connected.
-#. TRANS @xref{Connecting}.
-#: stdio-common/../sysdeps/gnu/errlist.c:635
-msgid "Transport endpoint is already connected"
+#: nis/nis_error.c:76
+msgid "Master server busy, full dump rescheduled."
 msgstr ""
 
-#. TRANS The socket is not connected to anything.  You get this error when you
-#. TRANS try to transmit data over a socket, without first specifying a
-#. TRANS destination for the data.  For a connectionless socket (for datagram
-#. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:647
-msgid "Transport endpoint is not connected"
+#: nis/nis_local_names.c:122
+#, c-format
+msgid "LOCAL entry for UID %d in directory %s not unique\n"
 msgstr ""
 
-#. TRANS No default destination address was set for the socket.  You get this
-#. TRANS error when you try to transmit data over a connectionless socket,
-#. TRANS without first specifying a destination for the data with @code{connect}.
-#: stdio-common/../sysdeps/gnu/errlist.c:658
-msgid "Destination address required"
+#: nis/nis_print.c:51
+msgid "UNKNOWN"
 msgstr ""
 
-#. TRANS The socket has already been shut down.
-#: stdio-common/../sysdeps/gnu/errlist.c:667
-msgid "Cannot send after transport endpoint shutdown"
+#: nis/nis_print.c:109
+msgid "BOGUS OBJECT\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:676
-msgid "Too many references: cannot splice"
+#: nis/nis_print.c:112
+msgid "NO OBJECT\n"
 msgstr ""
 
-#. TRANS A socket operation with a specified timeout received no response during
-#. TRANS the timeout period.
-#: stdio-common/../sysdeps/gnu/errlist.c:686
-msgid "Connection timed out"
+#: nis/nis_print.c:115
+msgid "DIRECTORY\n"
 msgstr ""
 
-#. TRANS A remote host refused to allow the network connection (typically because
-#. TRANS it is not running the requested service).
-#: stdio-common/../sysdeps/gnu/errlist.c:696
-msgid "Connection refused"
+#: nis/nis_print.c:118
+msgid "GROUP\n"
 msgstr ""
 
-#. TRANS Too many levels of symbolic links were encountered in looking up a file name.
-#. TRANS This often indicates a cycle of symbolic links.
-#: stdio-common/../sysdeps/gnu/errlist.c:706
-msgid "Too many levels of symbolic links"
+#: nis/nis_print.c:121
+msgid "TABLE\n"
 msgstr ""
 
-#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
-#. TRANS Files}) or host name too long (in @code{gethostname} or
-#. TRANS @code{sethostname}; @pxref{Host Identification}).
-#: stdio-common/../sysdeps/gnu/errlist.c:717
-msgid "File name too long"
+#: nis/nis_print.c:124
+msgid "ENTRY\n"
 msgstr ""
 
-#. TRANS The remote host for a requested network connection is down.
-#: stdio-common/../sysdeps/gnu/errlist.c:726
-msgid "Host is down"
+#: nis/nis_print.c:127
+msgid "LINK\n"
 msgstr ""
 
-#. TRANS The remote host for a requested network connection is not reachable.
-#: stdio-common/../sysdeps/gnu/errlist.c:735
-msgid "No route to host"
+#: nis/nis_print.c:130
+msgid "PRIVATE\n"
 msgstr ""
 
-#. TRANS Directory not empty, where an empty directory was expected.  Typically,
-#. TRANS this error occurs when you are trying to delete a directory.
-#: stdio-common/../sysdeps/gnu/errlist.c:745
-msgid "Directory not empty"
+#: nis/nis_print.c:133
+msgid "(Unknown object)\n"
 msgstr ""
 
-#. TRANS This means that the per-user limit on new process would be exceeded by
-#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
-#. TRANS the @code{RLIMIT_NPROC} limit.
-#: stdio-common/../sysdeps/gnu/errlist.c:756
-msgid "Too many processes"
+#: nis/nis_print.c:167
+#, c-format
+msgid "Name : `%s'\n"
 msgstr ""
 
-#. TRANS The file quota system is confused because there are too many users.
-#. TRANS @c This can probably happen in a GNU system when using NFS.
-#: stdio-common/../sysdeps/gnu/errlist.c:766
-msgid "Too many users"
+#: nis/nis_print.c:168
+#, c-format
+msgid "Type : %s\n"
 msgstr ""
 
-#. TRANS The user's disk quota was exceeded.
-#: stdio-common/../sysdeps/gnu/errlist.c:775
-msgid "Disk quota exceeded"
+#: nis/nis_print.c:173
+msgid "Master Server :\n"
 msgstr ""
 
-#. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
-#. TRANS system which is due to file system rearrangements on the server host.
-#. TRANS Repairing this condition usually requires unmounting and remounting
-#. TRANS the NFS file system on the local host.
-#: stdio-common/../sysdeps/gnu/errlist.c:787
-msgid "Stale NFS file handle"
+#: nis/nis_print.c:175
+msgid "Replicate :\n"
 msgstr ""
 
-#. TRANS An attempt was made to NFS-mount a remote file system with a file name that
-#. TRANS already specifies an NFS-mounted file.
-#. TRANS (This is an error on some operating systems, but we expect it to work
-#. TRANS properly on the GNU system, making this error code impossible.)
-#: stdio-common/../sysdeps/gnu/errlist.c:799
-msgid "Object is remote"
+#: nis/nis_print.c:176
+#, c-format
+msgid "\tName       : %s\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:808
-msgid "RPC struct is bad"
+#: nis/nis_print.c:177
+msgid "\tPublic Key : "
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:817
-msgid "RPC version wrong"
+#: nis/nis_print.c:181
+msgid "None.\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:826
-msgid "RPC program not available"
+#: nis/nis_print.c:184
+#, c-format
+msgid "Diffie-Hellmann (%d bits)\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:835
-msgid "RPC program version wrong"
+#: nis/nis_print.c:189
+#, c-format
+msgid "RSA (%d bits)\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:844
-msgid "RPC bad procedure for program"
+#: nis/nis_print.c:192
+msgid "Kerberos.\n"
 msgstr ""
 
-#. TRANS No locks available.  This is used by the file locking facilities; see
-#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
-#. TRANS it can result from an operation to an NFS server running another
-#. TRANS operating system.
-#: stdio-common/../sysdeps/gnu/errlist.c:856
-msgid "No locks available"
+#: nis/nis_print.c:195
+#, c-format
+msgid "Unknown (type = %d, bits = %d)\n"
 msgstr ""
 
-#. TRANS Inappropriate file type or format.  The file was the wrong type for the
-#. TRANS operation, or a data file had the wrong format.
-#. TRANS
-#. TRANS On some systems @code{chmod} returns this error if you try to set the
-#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
-#: stdio-common/../sysdeps/gnu/errlist.c:869
-msgid "Inappropriate file type or format"
+#: nis/nis_print.c:206
+#, c-format
+msgid "\tUniversal addresses (%u)\n"
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:878
-msgid "Authentication error"
+#: nis/nis_print.c:228
+msgid "Time to live : "
 msgstr ""
 
-#. TRANS ???
-#: stdio-common/../sysdeps/gnu/errlist.c:887
-msgid "Need authenticator"
+#: nis/nis_print.c:230
+msgid "Default Access rights :\n"
 msgstr ""
 
-#. TRANS Function not implemented.  This indicates that the function called is
-#. TRANS not implemented at all, either in the C library itself or in the
-#. TRANS operating system.  When you get this error, you can be sure that this
-#. TRANS particular function will always fail with @code{ENOSYS} unless you
-#. TRANS install a new version of the C library or the operating system.
-#: stdio-common/../sysdeps/gnu/errlist.c:900
-msgid "Function not implemented"
+#: nis/nis_print.c:239
+#, c-format
+msgid "\tType         : %s\n"
 msgstr ""
 
-#. TRANS Not supported.  A function returns this error when certain parameter
-#. TRANS values are valid, but the functionality they request is not available.
-#. TRANS This can mean that the function does not implement a particular command
-#. TRANS or option value or flag bit at all.  For functions that operate on some
-#. TRANS object given in a parameter, such as a file descriptor or a port, it
-#. TRANS might instead mean that only @emph{that specific object} (file
-#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
-#. TRANS different file descriptors might support different ranges of parameter
-#. TRANS values.
-#. TRANS
-#. TRANS If the entire function is not available at all in the implementation,
-#. TRANS it returns @code{ENOSYS} instead.
-#: stdio-common/../sysdeps/gnu/errlist.c:920
-msgid "Not supported"
+#: nis/nis_print.c:240
+msgid "\tAccess rights: "
 msgstr ""
 
-#. TRANS While decoding a multibyte character the function came along an invalid
-#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
-#: stdio-common/../sysdeps/gnu/errlist.c:930
-msgid "Invalid or incomplete multibyte or wide character"
+#: nis/nis_print.c:254
+msgid "Group Flags :"
 msgstr ""
 
-#. TRANS In the GNU system, servers supporting the @code{term} protocol return
-#. TRANS this error for certain operations when the caller is not in the
-#. TRANS foreground process group of the terminal.  Users do not usually see this
-#. TRANS error because functions such as @code{read} and @code{write} translate
-#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
-#. TRANS for information on process groups and these signals.
-#: stdio-common/../sysdeps/gnu/errlist.c:944
-msgid "Inappropriate operation for background process"
+#: nis/nis_print.c:257
+msgid ""
+"\n"
+"Group Members :\n"
 msgstr ""
 
-#. TRANS In the GNU system, opening a file returns this error when the file is
-#. TRANS translated by a program and the translator program dies while starting
-#. TRANS up, before it has connected to the file.
-#: stdio-common/../sysdeps/gnu/errlist.c:955
-msgid "Translator died"
+#: nis/nis_print.c:269
+#, c-format
+msgid "Table Type          : %s\n"
 msgstr ""
 
-#. TRANS The experienced user will know what is wrong.
-#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
-#. TRANS @c Don't change it.
-#: stdio-common/../sysdeps/gnu/errlist.c:966
-msgid "?"
+#: nis/nis_print.c:270
+#, c-format
+msgid "Number of Columns   : %d\n"
 msgstr ""
 
-#. TRANS You did @strong{what}?
-#: stdio-common/../sysdeps/gnu/errlist.c:975
-msgid "You really blew it this time"
+#: nis/nis_print.c:271
+#, c-format
+msgid "Character Separator : %c\n"
 msgstr ""
 
-#. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: stdio-common/../sysdeps/gnu/errlist.c:984
-msgid "Computer bought the farm"
+#: nis/nis_print.c:272
+#, c-format
+msgid "Search Path         : %s\n"
 msgstr ""
 
-#. TRANS This error code has no purpose.
-#: stdio-common/../sysdeps/gnu/errlist.c:993
-msgid "Gratuitous error"
+#: nis/nis_print.c:273
+msgid "Columns             :\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1001
-msgid "Bad message"
+#: nis/nis_print.c:276
+#, c-format
+msgid "\t[%d]\tName          : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1009
-msgid "Identifier removed"
+#: nis/nis_print.c:278
+msgid "\t\tAttributes    : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1017
-msgid "Multihop attempted"
+#: nis/nis_print.c:280
+msgid "\t\tAccess Rights : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1025
-msgid "No data available"
+#: nis/nis_print.c:290
+msgid "Linked Object Type : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1033
-msgid "Link has been severed"
+#: nis/nis_print.c:292
+#, c-format
+msgid "Linked to : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1041
-msgid "No message of desired type"
+#: nis/nis_print.c:302
+#, c-format
+msgid "\tEntry data of type %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1049
-msgid "Out of streams resources"
+#: nis/nis_print.c:305
+#, c-format
+msgid "\t[%u] - [%u bytes] "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1057
-msgid "Device not a stream"
+#: nis/nis_print.c:308
+msgid "Encrypted data\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1065
-msgid "Value too large for defined data type"
+#: nis/nis_print.c:310
+msgid "Binary data\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1073
-msgid "Protocol error"
+#: nis/nis_print.c:326
+#, c-format
+msgid "Object Name   : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1081
-msgid "Timer expired"
+#: nis/nis_print.c:327
+#, c-format
+msgid "Directory     : %s\n"
 msgstr ""
 
-#. TRANS Operation canceled; an asynchronous operation was canceled before it
-#. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
-#. TRANS the normal result is for the operations affected to complete with this
-#. TRANS error; @pxref{Cancel AIO Operations}.
-#: stdio-common/../sysdeps/gnu/errlist.c:1093
-msgid "Operation canceled"
+#: nis/nis_print.c:328
+#, c-format
+msgid "Owner         : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1101
-msgid "Interrupted system call should be restarted"
+#: nis/nis_print.c:329
+#, c-format
+msgid "Group         : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1109
-msgid "Channel number out of range"
+#: nis/nis_print.c:330
+msgid "Access Rights : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1117
-msgid "Level 2 not synchronized"
+#: nis/nis_print.c:332
+#, c-format
+msgid ""
+"\n"
+"Time to Live  : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1125
-msgid "Level 3 halted"
+#: nis/nis_print.c:335
+#, c-format
+msgid "Creation Time : %s"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1133
-msgid "Level 3 reset"
+#: nis/nis_print.c:337
+#, c-format
+msgid "Mod. Time     : %s"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1141
-msgid "Link number out of range"
+#: nis/nis_print.c:338
+msgid "Object Type   : "
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1149
-msgid "Protocol driver not attached"
+#: nis/nis_print.c:358
+#, c-format
+msgid "    Data Length = %u\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1157
-msgid "No CSI structure available"
+#: nis/nis_print.c:372
+#, c-format
+msgid "Status            : %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1165
-msgid "Level 2 halted"
+#: nis/nis_print.c:373
+#, c-format
+msgid "Number of objects : %u\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1173
-msgid "Invalid exchange"
+#: nis/nis_print.c:377
+#, c-format
+msgid "Object #%d:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1181
-msgid "Invalid request descriptor"
+#: nis/nis_print_group_entry.c:113
+#, c-format
+msgid "Group entry for \"%s.%s\" group:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1189
-msgid "Exchange full"
+#: nis/nis_print_group_entry.c:121
+msgid "    Explicit members:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1197
-msgid "No anode"
+#: nis/nis_print_group_entry.c:126
+msgid "    No explicit members\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1205
-msgid "Invalid request code"
+#: nis/nis_print_group_entry.c:129
+msgid "    Implicit members:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1213
-msgid "Invalid slot"
+#: nis/nis_print_group_entry.c:134
+msgid "    No implicit members\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1221
-msgid "File locking deadlock error"
+#: nis/nis_print_group_entry.c:137
+msgid "    Recursive members:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1229
-msgid "Bad font file format"
+#: nis/nis_print_group_entry.c:142
+msgid "    No recursive members\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1237
-msgid "Machine is not on the network"
+#: nis/nis_print_group_entry.c:145 nis/nis_print_group_entry.c:161
+msgid "    Explicit nonmembers:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1245
-msgid "Package not installed"
+#: nis/nis_print_group_entry.c:150
+msgid "    No explicit nonmembers\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1253
-msgid "Advertise error"
+#: nis/nis_print_group_entry.c:153
+msgid "    Implicit nonmembers:\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1261
-msgid "Srmount error"
+#: nis/nis_print_group_entry.c:158
+msgid "    No implicit nonmembers\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1269
-msgid "Communication error on send"
+#: nis/nis_print_group_entry.c:166
+msgid "    No recursive nonmembers\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1277
-msgid "RFS specific error"
+#: nis/nss_nisplus/nisplus-publickey.c:101
+#: nis/nss_nisplus/nisplus-publickey.c:182
+#, c-format
+msgid "DES entry for netname %s not unique\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1285
-msgid "Name not unique on network"
+#: nis/nss_nisplus/nisplus-publickey.c:218
+#, c-format
+msgid "netname2user: missing group id list in `%s'."
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1293
-msgid "File descriptor in bad state"
+#: nis/nss_nisplus/nisplus-publickey.c:296
+#: nis/nss_nisplus/nisplus-publickey.c:302
+#: nis/nss_nisplus/nisplus-publickey.c:367
+#: nis/nss_nisplus/nisplus-publickey.c:376
+#, c-format
+msgid "netname2user: (nis+ lookup): %s\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1301
-msgid "Remote address changed"
+#: nis/nss_nisplus/nisplus-publickey.c:315
+#, c-format
+msgid "netname2user: DES entry for %s in directory %s not unique"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1309
-msgid "Can not access a needed shared library"
+#: nis/nss_nisplus/nisplus-publickey.c:333
+#, c-format
+msgid "netname2user: principal name `%s' too long"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1317
-msgid "Accessing a corrupted shared library"
+#: nis/nss_nisplus/nisplus-publickey.c:389
+#, c-format
+msgid "netname2user: LOCAL entry for %s in directory %s not unique"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1325
-msgid ".lib section in a.out corrupted"
+#: nis/nss_nisplus/nisplus-publickey.c:396
+msgid "netname2user: should not have uid 0"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1333
-msgid "Attempting to link in too many shared libraries"
+#: nis/ypclnt.c:963
+msgid "yp_update: cannot convert host to netname\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1341
-msgid "Cannot exec a shared library directly"
+#: nis/ypclnt.c:975
+msgid "yp_update: cannot get server address\n"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1349
-msgid "Streams pipe error"
+#: nscd/aicache.c:76 nscd/hstcache.c:461
+#, c-format
+msgid "Haven't found \"%s\" in hosts cache!"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1357
-msgid "Structure needs cleaning"
+#: nscd/aicache.c:78 nscd/hstcache.c:463
+#, c-format
+msgid "Reloading \"%s\" in hosts cache!"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1365
-msgid "Not a XENIX named type file"
+#: nscd/cache.c:126
+#, c-format
+msgid "add new entry \"%s\" of type %s for %s to cache%s"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1373
-msgid "No XENIX semaphores available"
+#: nscd/cache.c:212 nscd/connections.c:744
+#, c-format
+msgid "cannot stat() file `%s': %s"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1381
-msgid "Is a named type file"
+#: nscd/cache.c:241
+#, c-format
+msgid "pruning %s cache; time %ld"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1389
-msgid "Remote I/O error"
+#: nscd/cache.c:268
+#, c-format
+msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1397
-msgid "No medium found"
+#: nscd/connections.c:463 nscd/connections.c:475 nscd/connections.c:487
+#: nscd/connections.c:506
+#, c-format
+msgid "invalid persistent database file \"%s\": %s"
 msgstr ""
 
-#: stdio-common/../sysdeps/gnu/errlist.c:1405
-msgid "Wrong medium type"
+#: nscd/connections.c:477
+msgid "header size does not match"
 msgstr ""
 
-#: stdio-common/../sysdeps/unix/siglist.c:26
-msgid "Signal 0"
+#: nscd/connections.c:489
+msgid "file size does not match"
 msgstr ""
 
-#: stdio-common/../sysdeps/unix/siglist.c:32
-msgid "IOT trap"
+#: nscd/connections.c:508
+msgid "verification failed"
 msgstr ""
 
-#: stdio-common/psignal.c:60
+#: nscd/connections.c:522
 #, c-format
-msgid "%s%sUnknown signal %d\n"
+msgid ""
+"suggested size of table for database %s larger than the persistent "
+"database's table"
 msgstr ""
 
-#: stdio-common/psignal.c:63 stdio-common/psignal.c:65
-msgid "Unknown signal"
+#: nscd/connections.c:532 nscd/connections.c:613
+#, c-format
+msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr ""
 
-#: dlfcn/dlinfo.c:63
-msgid "RTLD_SELF used in code not dynamically loaded"
+#: nscd/connections.c:592
+#, c-format
+msgid ""
+"database for %s corrupted or simultaneously used; remove %s manually if "
+"necessary and restart"
 msgstr ""
 
-#: dlfcn/dlinfo.c:72
-msgid "unsupported dlinfo request"
+#: nscd/connections.c:599
+#, c-format
+msgid "cannot create %s; no persistent database used"
 msgstr ""
 
-#: dlfcn/dlmopen.c:63
-msgid "invalid namespace"
+#: nscd/connections.c:602
+#, c-format
+msgid "cannot create %s; no sharing possible"
 msgstr ""
 
-#: dlfcn/dlopen.c:64
-msgid "invalid mode parameter"
+#: nscd/connections.c:673
+#, c-format
+msgid "cannot write to database file %s: %s"
 msgstr ""
 
-#: malloc/mcheck.c:324
-msgid "memory is consistent, library is buggy\n"
+#: nscd/connections.c:707
+#, c-format
+msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr ""
 
-#: malloc/mcheck.c:327
-msgid "memory clobbered before allocated block\n"
+#: nscd/connections.c:757
+#, c-format
+msgid "cannot open socket: %s"
 msgstr ""
 
-#: malloc/mcheck.c:330
-msgid "memory clobbered past end of allocated block\n"
+#: nscd/connections.c:774
+#, c-format
+msgid "cannot change socket to nonblocking mode: %s"
 msgstr ""
 
-#: malloc/mcheck.c:333
-msgid "block freed twice\n"
+#: nscd/connections.c:782
+#, c-format
+msgid "cannot set socket to close on exec: %s"
 msgstr ""
 
-#: malloc/mcheck.c:336
-msgid "bogus mcheck_status, library is buggy\n"
+#: nscd/connections.c:793
+#, c-format
+msgid "cannot enable socket to accept connections: %s"
 msgstr ""
 
-#: malloc/memusagestat.c:55
-msgid "Name output file"
+#: nscd/connections.c:876
+#, c-format
+msgid "provide access to FD %d, for %s"
 msgstr ""
 
-#: malloc/memusagestat.c:56
-msgid "Title string used in output graphic"
+#: nscd/connections.c:888
+#, c-format
+msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
 
-#: malloc/memusagestat.c:57
-msgid ""
-"Generate output linear to time (default is linear to number of function "
-"calls)"
+#: nscd/connections.c:938 nscd/connections.c:991
+#, c-format
+msgid "cannot write result: %s"
 msgstr ""
 
-#: malloc/memusagestat.c:59
-msgid "Also draw graph for total memory consumption"
+#: nscd/connections.c:1066
+#, c-format
+msgid "error getting callers id: %s"
 msgstr ""
 
-#: malloc/memusagestat.c:60
-msgid "make output graphic VALUE pixel wide"
+#: nscd/connections.c:1124 nscd/connections.c:1138
+#, c-format
+msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: malloc/memusagestat.c:61
-msgid "make output graphic VALUE pixel high"
+#: nscd/connections.c:1178
+#, c-format
+msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr ""
 
-#: malloc/memusagestat.c:66
-msgid "Generate graphic from memory profiling data"
+#: nscd/connections.c:1188
+#, c-format
+msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr ""
 
-#: malloc/memusagestat.c:69
-msgid "DATAFILE [OUTFILE]"
+#: nscd/connections.c:1201
+#, c-format
+msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr ""
 
-#: string/strerror.c:43 posix/../sysdeps/posix/gai_strerror.c:58
-msgid "Unknown error"
+#: nscd/connections.c:1229
+#, c-format
+msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr ""
 
-#: string/strsignal.c:69
+#: nscd/connections.c:1238
 #, c-format
-msgid "Real-time signal %d"
+msgid "cannot change current working directory to \"/\": %s"
 msgstr ""
 
-#: string/strsignal.c:73
+#: nscd/connections.c:1356
 #, c-format
-msgid "Unknown signal %d"
+msgid "short read while reading request: %s"
 msgstr ""
 
-#: timezone/zdump.c:240
+#: nscd/connections.c:1388
 #, c-format
-msgid ""
-"%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+msgid "key length in request too long: %d"
 msgstr ""
 
-#: timezone/zdump.c:257
+#: nscd/connections.c:1401
 #, c-format
-msgid "%s: wild -c argument %s\n"
+msgid "short read while reading request key: %s"
 msgstr ""
 
-#: timezone/zdump.c:347
-msgid "Error writing standard output"
+#: nscd/connections.c:1410
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr ""
 
-#: timezone/zdump.c:370
+#: nscd/connections.c:1415
 #, c-format
-msgid ""
-"%s: use of -v on system with floating time_t other than float or double\n"
+msgid "handle_request: request received (Version = %d)"
 msgstr ""
 
-#: timezone/zic.c:367
+#: nscd/connections.c:1770
 #, c-format
-msgid "%s: Memory exhausted: %s\n"
+msgid "could only start %d threads; terminating"
 msgstr ""
 
-#: timezone/zic.c:392 misc/error.c:129 misc/error.c:157
-msgid "Unknown system error"
+#: nscd/connections.c:1818 nscd/connections.c:1819 nscd/connections.c:1836
+#: nscd/connections.c:1845 nscd/connections.c:1858 nscd/connections.c:1864
+#: nscd/connections.c:1871
+#, c-format
+msgid "Failed to run nscd as user '%s'"
 msgstr ""
 
-#: timezone/zic.c:426
+#: nscd/connections.c:1837
 #, c-format
-msgid "\"%s\", line %d: %s"
+msgid "initial getgrouplist failed"
 msgstr ""
 
-#: timezone/zic.c:429
+#: nscd/connections.c:1846
 #, c-format
-msgid " (rule from \"%s\", line %d)"
+msgid "getgrouplist failed"
 msgstr ""
 
-#: timezone/zic.c:441
-msgid "warning: "
+#: nscd/connections.c:1859
+#, c-format
+msgid "setgroups failed"
 msgstr ""
 
-#: timezone/zic.c:451
+#: nscd/grpcache.c:396 nscd/hstcache.c:411 nscd/initgrcache.c:408
+#: nscd/pwdcache.c:392
 #, c-format
-msgid ""
-"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p "
-"posixrules ] \\\n"
-"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+msgid "short write in %s: %s"
 msgstr ""
 
-#: timezone/zic.c:500
+#: nscd/grpcache.c:439 nscd/initgrcache.c:77
 #, c-format
-msgid "%s: More than one -d option specified\n"
+msgid "Haven't found \"%s\" in group cache!"
 msgstr ""
 
-#: timezone/zic.c:510
+#: nscd/grpcache.c:441 nscd/initgrcache.c:79
 #, c-format
-msgid "%s: More than one -l option specified\n"
+msgid "Reloading \"%s\" in group cache!"
 msgstr ""
 
-#: timezone/zic.c:520
+#: nscd/grpcache.c:532
 #, c-format
-msgid "%s: More than one -p option specified\n"
+msgid "Invalid numeric gid \"%s\"!"
 msgstr ""
 
-#: timezone/zic.c:530
+#: nscd/mem.c:382
 #, c-format
-msgid "%s: More than one -y option specified\n"
+msgid "freed %zu bytes in %s cache"
 msgstr ""
 
-#: timezone/zic.c:540
+#: nscd/mem.c:511
 #, c-format
-msgid "%s: More than one -L option specified\n"
+msgid "no more memory for database '%s'"
 msgstr ""
 
-#: timezone/zic.c:589
-msgid "link to link"
+#: nscd/nscd.c:97
+msgid "Read configuration data from NAME"
 msgstr ""
 
-#: timezone/zic.c:654
-msgid "hard link failed, symbolic link used"
+#: nscd/nscd.c:99
+msgid "Do not fork and display messages on the current tty"
 msgstr ""
 
-#: timezone/zic.c:662
-#, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
+#: nscd/nscd.c:100
+msgid "NUMBER"
 msgstr ""
 
-#: timezone/zic.c:771 timezone/zic.c:773
-msgid "same rule name in multiple files"
+#: nscd/nscd.c:100
+msgid "Start NUMBER threads"
 msgstr ""
 
-#: timezone/zic.c:814
-msgid "unruly zone"
+#: nscd/nscd.c:101
+msgid "Shut the server down"
 msgstr ""
 
-#: timezone/zic.c:821
-#, c-format
-msgid "%s in ruleless zone"
+#: nscd/nscd.c:102
+msgid "Print current configuration statistic"
 msgstr ""
 
-#: timezone/zic.c:842
-msgid "standard input"
+#: nscd/nscd.c:103
+msgid "TABLE"
 msgstr ""
 
-#: timezone/zic.c:847
-#, c-format
-msgid "%s: Can't open %s: %s\n"
+#: nscd/nscd.c:104
+msgid "Invalidate the specified cache"
 msgstr ""
 
-#: timezone/zic.c:858
-msgid "line too long"
+#: nscd/nscd.c:105
+msgid "TABLE,yes"
 msgstr ""
 
-#: timezone/zic.c:878
-msgid "input line of unknown type"
+#: nscd/nscd.c:106
+msgid "Use separate cache for each user"
 msgstr ""
 
-#: timezone/zic.c:894
-#, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
+#: nscd/nscd.c:111
+msgid "Name Service Cache Daemon."
 msgstr ""
 
-#: timezone/zic.c:901 timezone/zic.c:1322 timezone/zic.c:1347
+#: nscd/nscd.c:143 nss/getent.c:858 nss/makedb.c:123
 #, c-format
-msgid "%s: panic: Invalid l_value %d\n"
+msgid "wrong number of arguments"
 msgstr ""
 
-#: timezone/zic.c:909
+#: nscd/nscd.c:153
 #, c-format
-msgid "%s: Error reading %s\n"
+msgid "failure while reading configuration file; this is fatal"
 msgstr ""
 
-#: timezone/zic.c:916
+#: nscd/nscd.c:162
 #, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr ""
-
-#: timezone/zic.c:921
-msgid "expected continuation line not found"
-msgstr ""
-
-#: timezone/zic.c:965
-msgid "24:00 not handled by pre-1998 versions of zic"
-msgstr ""
-
-#: timezone/zic.c:979
-msgid "wrong number of fields on Rule line"
+msgid "already running"
 msgstr ""
 
-#: timezone/zic.c:983
-msgid "nameless rule"
+#: nscd/nscd.c:177 nscd/nscd.c:232
+#, c-format
+msgid "cannot fork"
 msgstr ""
 
-#: timezone/zic.c:988
-msgid "invalid saved time"
+#: nscd/nscd.c:240
+#, c-format
+msgid "cannot change current working cirectory to \"/\""
 msgstr ""
 
-#: timezone/zic.c:1007
-msgid "wrong number of fields on Zone line"
+#: nscd/nscd.c:248
+msgid "Could not create log file"
 msgstr ""
 
-#: timezone/zic.c:1013
+#: nscd/nscd.c:301 nscd/nscd.c:326 nscd/nscd_stat.c:172
 #, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgid "Only root is allowed to use this option!"
 msgstr ""
 
-#: timezone/zic.c:1021
+#: nscd/nscd.c:368
 #, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgid "secure services not implemented anymore"
 msgstr ""
 
-#: timezone/zic.c:1033
+#: nscd/nscd_conf.c:55
 #, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
-msgstr ""
-
-#: timezone/zic.c:1049
-msgid "wrong number of fields on Zone continuation line"
-msgstr ""
-
-#: timezone/zic.c:1089
-msgid "invalid UTC offset"
+msgid "database %s is not supported\n"
 msgstr ""
 
-#: timezone/zic.c:1092
-msgid "invalid abbreviation format"
-msgstr ""
-
-#: timezone/zic.c:1119
-msgid "Zone continuation line end time is not after end time of previous line"
-msgstr ""
-
-#: timezone/zic.c:1147
-msgid "wrong number of fields on Leap line"
+#: nscd/nscd_conf.c:106
+#, c-format
+msgid "Parse error: %s"
 msgstr ""
 
-#: timezone/zic.c:1156
-msgid "invalid leaping year"
+#: nscd/nscd_conf.c:191
+#, c-format
+msgid "Must specify user name for server-user option"
 msgstr ""
 
-#: timezone/zic.c:1171 timezone/zic.c:1277
-msgid "invalid month name"
+#: nscd/nscd_conf.c:198
+#, c-format
+msgid "Must specify user name for stat-user option"
 msgstr ""
 
-#: timezone/zic.c:1184 timezone/zic.c:1399 timezone/zic.c:1413
-msgid "invalid day of month"
+#: nscd/nscd_conf.c:242
+#, c-format
+msgid "invalid value for 'reload-count': %u"
 msgstr ""
 
-#: timezone/zic.c:1189
-msgid "time before zero"
+#: nscd/nscd_conf.c:257
+#, c-format
+msgid "Must specify value for restart-interval option"
 msgstr ""
 
-#: timezone/zic.c:1193
-msgid "time too small"
+#: nscd/nscd_conf.c:260
+#, c-format
+msgid "Unknown option: %s %s %s"
 msgstr ""
 
-#: timezone/zic.c:1197
-msgid "time too large"
+#: nscd/nscd_conf.c:273
+#, c-format
+msgid "cannot get current working directory: %s; disabling paranoia mode"
 msgstr ""
 
-#: timezone/zic.c:1201 timezone/zic.c:1306
-msgid "invalid time of day"
+#: nscd/nscd_conf.c:293
+#, c-format
+msgid "maximum file size for %s database too small"
 msgstr ""
 
-#: timezone/zic.c:1220
-msgid "illegal CORRECTION field on Leap line"
+#: nscd/nscd_stat.c:141
+#, c-format
+msgid "cannot write statistics: %s"
 msgstr ""
 
-#: timezone/zic.c:1225
-msgid "illegal Rolling/Stationary field on Leap line"
+#: nscd/nscd_stat.c:156
+msgid "yes"
 msgstr ""
 
-#: timezone/zic.c:1241
-msgid "wrong number of fields on Link line"
+#: nscd/nscd_stat.c:157
+msgid "no"
 msgstr ""
 
-#: timezone/zic.c:1245
-msgid "blank FROM field on Link line"
+#: nscd/nscd_stat.c:168
+#, c-format
+msgid "Only root or %s is allowed to use this option!"
 msgstr ""
 
-#: timezone/zic.c:1249
-msgid "blank TO field on Link line"
+#: nscd/nscd_stat.c:179
+#, c-format
+msgid "nscd not running!\n"
 msgstr ""
 
-#: timezone/zic.c:1326
-msgid "invalid starting year"
+#: nscd/nscd_stat.c:191
+#, c-format
+msgid "write incomplete"
 msgstr ""
 
-#: timezone/zic.c:1330
-msgid "starting year too low to be represented"
+#: nscd/nscd_stat.c:203
+#, c-format
+msgid "cannot read statistics data"
 msgstr ""
 
-#: timezone/zic.c:1332
-msgid "starting year too high to be represented"
+#: nscd/nscd_stat.c:206
+#, c-format
+msgid ""
+"nscd configuration:\n"
+"\n"
+"%15d  server debug level\n"
 msgstr ""
 
-#: timezone/zic.c:1351
-msgid "invalid ending year"
+#: nscd/nscd_stat.c:230
+#, c-format
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr ""
 
-#: timezone/zic.c:1355
-msgid "ending year too low to be represented"
+#: nscd/nscd_stat.c:233
+#, c-format
+msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr ""
 
-#: timezone/zic.c:1357
-msgid "ending year too high to be represented"
+#: nscd/nscd_stat.c:235
+#, c-format
+msgid "        %2um %2lus  server runtime\n"
 msgstr ""
 
-#: timezone/zic.c:1360
-msgid "starting year greater than ending year"
+#: nscd/nscd_stat.c:237
+#, c-format
+msgid "            %2lus  server runtime\n"
 msgstr ""
 
-#: timezone/zic.c:1367
-msgid "typed single year"
+#: nscd/nscd_stat.c:239
+#, c-format
+msgid ""
+"%15d  current number of threads\n"
+"%15d  maximum number of threads\n"
+"%15lu  number of times clients had to wait\n"
+"%15s  paranoia mode enabled\n"
+"%15lu  restart internal\n"
 msgstr ""
 
-#: timezone/zic.c:1404
-msgid "invalid weekday name"
+#: nscd/nscd_stat.c:273
+#, c-format
+msgid ""
+"\n"
+"%s cache:\n"
+"\n"
+"%15s  cache is enabled\n"
+"%15s  cache is persistent\n"
+"%15s  cache is shared\n"
+"%15zu  suggested size\n"
+"%15zu  total data pool size\n"
+"%15zu  used data pool size\n"
+"%15lu  seconds time to live for positive entries\n"
+"%15lu  seconds time to live for negative entries\n"
+"%15<PRIuMAX>  cache hits on positive entries\n"
+"%15<PRIuMAX>  cache hits on negative entries\n"
+"%15<PRIuMAX>  cache misses on positive entries\n"
+"%15<PRIuMAX>  cache misses on negative entries\n"
+"%15lu%% cache hit rate\n"
+"%15zu  current number of cached values\n"
+"%15zu  maximum number of cached values\n"
+"%15zu  maximum chain length searched\n"
+"%15<PRIuMAX>  number of delays on rdlock\n"
+"%15<PRIuMAX>  number of delays on wrlock\n"
+"%15<PRIuMAX>  memory allocations failed\n"
+"%15s  check /etc/%s for changes\n"
 msgstr ""
 
-#: timezone/zic.c:1518
+#: nscd/pwdcache.c:435
 #, c-format
-msgid "%s: Can't remove %s: %s\n"
+msgid "Haven't found \"%s\" in password cache!"
 msgstr ""
 
-#: timezone/zic.c:1528
+#: nscd/pwdcache.c:437
 #, c-format
-msgid "%s: Can't create %s: %s\n"
+msgid "Reloading \"%s\" in password cache!"
 msgstr ""
 
-#: timezone/zic.c:1595
+#: nscd/pwdcache.c:529
 #, c-format
-msgid "%s: Error writing %s\n"
+msgid "Invalid numeric uid \"%s\"!"
 msgstr ""
 
-#: timezone/zic.c:1786
-msgid "can't determine time zone abbreviation to use just after until time"
+#: nscd/selinux.c:150
+msgid "Failed opening connection to the audit subsystem"
 msgstr ""
 
-#: timezone/zic.c:1829
-msgid "too many transitions?!"
+#: nscd/selinux.c:162
+msgid "Failed to determine if kernel supports SELinux"
 msgstr ""
 
-#: timezone/zic.c:1848
-msgid "internal error - addtype called with bad isdst"
+#: nscd/selinux.c:177
+#, c-format
+msgid "Failed to start AVC thread"
 msgstr ""
 
-#: timezone/zic.c:1852
-msgid "internal error - addtype called with bad ttisstd"
+#: nscd/selinux.c:199
+#, c-format
+msgid "Failed to create AVC lock"
 msgstr ""
 
-#: timezone/zic.c:1856
-msgid "internal error - addtype called with bad ttisgmt"
+#: nscd/selinux.c:239
+#, c-format
+msgid "Failed to start AVC"
 msgstr ""
 
-#: timezone/zic.c:1875
-msgid "too many local time types"
+#: nscd/selinux.c:241
+msgid "Access Vector Cache (AVC) started"
 msgstr ""
 
-#: timezone/zic.c:1903
-msgid "too many leap seconds"
+#: nscd/selinux.c:262
+msgid "Error getting context of socket peer"
 msgstr ""
 
-#: timezone/zic.c:1909
-msgid "repeated leap second moment"
+#: nscd/selinux.c:267
+msgid "Error getting context of nscd"
 msgstr ""
 
-#: timezone/zic.c:1961
-msgid "Wild result from command execution"
+#: nscd/selinux.c:273
+msgid "Error getting sid from context"
 msgstr ""
 
-#: timezone/zic.c:1962
+#: nscd/selinux.c:305
 #, c-format
-msgid "%s: command was '%s', result was %d\n"
-msgstr ""
-
-#: timezone/zic.c:2058
-msgid "Odd number of quotation marks"
+msgid ""
+"\n"
+"SELinux AVC Statistics:\n"
+"\n"
+"%15u  entry lookups\n"
+"%15u  entry hits\n"
+"%15u  entry misses\n"
+"%15u  entry discards\n"
+"%15u  CAV lookups\n"
+"%15u  CAV hits\n"
+"%15u  CAV probes\n"
+"%15u  CAV misses\n"
 msgstr ""
 
-#: timezone/zic.c:2079 timezone/zic.c:2098
-msgid "time overflow"
+#: nss/getent.c:52
+msgid "database [key ...]"
 msgstr ""
 
-#: timezone/zic.c:2145
-msgid "use of 2/29 in non leap-year"
+#: nss/getent.c:57
+msgid "Service configuration to be used"
 msgstr ""
 
-#: timezone/zic.c:2180
+#: nss/getent.c:62
 msgid ""
-"rule goes past start/end of month--will not work with pre-2004 versions of "
-"zic"
-msgstr ""
-
-#: timezone/zic.c:2202
-msgid "too many, or too long, time zone abbreviations"
+"Get entries from administrative database.\013For bug reporting instructions, "
+"please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
-#: timezone/zic.c:2243
+#: nss/getent.c:145 nss/getent.c:394
 #, c-format
-msgid "%s: Can't create directory %s: %s\n"
+msgid "Enumeration not supported on %s\n"
 msgstr ""
 
-#: timezone/zic.c:2265
+#: nss/getent.c:782
 #, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr ""
-
-#: posix/../sysdeps/generic/wordexp.c:1799
-msgid "parameter null or not set"
+msgid "Unknown database name"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:31
-msgid "Address family for hostname not supported"
+#: nss/getent.c:808
+msgid "Supported databases:\n"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:32
-msgid "Temporary failure in name resolution"
-msgstr ""
-
-#: posix/../sysdeps/posix/gai_strerror.c:33
-msgid "Bad value for ai_flags"
+#: nss/getent.c:868
+#, c-format
+msgid "Unknown database: %s\n"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:34
-msgid "Non-recoverable failure in name resolution"
+#: nss/makedb.c:60
+msgid "Convert key to lower case"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:35
-msgid "ai_family not supported"
+#: nss/makedb.c:63
+msgid "Do not print messages while building database"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:36
-msgid "Memory allocation failure"
+#: nss/makedb.c:65
+msgid "Print content of database file, one entry a line"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:37
-msgid "No address associated with hostname"
+#: nss/makedb.c:70
+msgid "Create simple DB database from textual input."
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:38
-msgid "Name or service not known"
-msgstr ""
-
-#: posix/../sysdeps/posix/gai_strerror.c:39
-msgid "Servname not supported for ai_socktype"
+#: nss/makedb.c:73
+msgid ""
+"INPUT-FILE OUTPUT-FILE\n"
+"-o OUTPUT-FILE INPUT-FILE\n"
+"-u INPUT-FILE"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:40
-msgid "ai_socktype not supported"
+#: nss/makedb.c:142
+#, c-format
+msgid "No usable database library found."
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:41
-msgid "System error"
+#: nss/makedb.c:149
+#, c-format
+msgid "cannot open database file `%s': %s"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:42
-msgid "Processing request in progress"
+#: nss/makedb.c:151
+msgid "incorrectly formatted file"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:43
-msgid "Request canceled"
+#: nss/makedb.c:331
+msgid "duplicate key"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:44
-msgid "Request not canceled"
+#: nss/makedb.c:337
+#, c-format
+msgid "while writing database file"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:45
-msgid "All requests done"
+#: nss/makedb.c:348
+#, c-format
+msgid "problems while reading `%s'"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:46
-msgid "Interrupted by a signal"
+#: nss/makedb.c:368 nss/makedb.c:385
+#, c-format
+msgid "while reading database"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:47
-msgid "Parameter string not correctly encoded"
+#: posix/getconf.c:940
+#, c-format
+msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr ""
 
-#: posix/getconf.c:942
+#: posix/getconf.c:943
 #, c-format
-msgid "Usage: %s [-v specification] variable_name [pathname]\n"
+msgid "       %s -a [pathname]\n"
 msgstr ""
 
-#: posix/getconf.c:1018
+#: posix/getconf.c:1061
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr ""
 
-#: posix/getconf.c:1046
+#: posix/getconf.c:1089
 #, c-format
 msgid "Couldn't execute %s"
 msgstr ""
 
-#: posix/getconf.c:1076 posix/getconf.c:1092
+#: posix/getconf.c:1129 posix/getconf.c:1145
 msgid "undefined"
 msgstr ""
 
-#: posix/getconf.c:1114
+#: posix/getconf.c:1167
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr ""
 
-#: posix/getopt.c:571 posix/getopt.c:590
+#: posix/getopt.c:571 posix/getopt.c:587
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:623 posix/getopt.c:627
+#: posix/getopt.c:620 posix/getopt.c:624
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:636 posix/getopt.c:641
+#: posix/getopt.c:633 posix/getopt.c:638
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:687 posix/getopt.c:709 posix/getopt.c:1040
-#: posix/getopt.c:1062
+#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
+#: posix/getopt.c:1035
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: posix/getopt.c:747 posix/getopt.c:750
+#: posix/getopt.c:738 posix/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: posix/getopt.c:758 posix/getopt.c:761
+#: posix/getopt.c:749 posix/getopt.c:752
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: posix/getopt.c:816 posix/getopt.c:819
+#: posix/getopt.c:804 posix/getopt.c:807
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: posix/getopt.c:825 posix/getopt.c:828
+#: posix/getopt.c:813 posix/getopt.c:816
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: posix/getopt.c:883 posix/getopt.c:902 posix/getopt.c:1115
-#: posix/getopt.c:1136
+#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
+#: posix/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: posix/getopt.c:955 posix/getopt.c:974
+#: posix/getopt.c:937 posix/getopt.c:953
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:998 posix/getopt.c:1019
+#: posix/getopt.c:977 posix/getopt.c:995
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:135
 msgid "No match"
 msgstr ""
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
 msgstr ""
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
 msgstr ""
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
 msgstr ""
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr ""
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
 msgstr ""
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: posix/regcomp.c:184
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: posix/regcomp.c:187
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr ""
 
-#: posix/regcomp.c:190
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
-#: posix/regcomp.c:193
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr ""
 
-#: posix/regcomp.c:196
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
 msgstr ""
 
-#: posix/regcomp.c:199
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: posix/regcomp.c:202
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: posix/regcomp.c:205
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
 msgstr ""
 
-#: posix/regcomp.c:208
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: posix/regcomp.c:692
+#: posix/regcomp.c:660
 msgid "No previous regular expression"
 msgstr ""
 
-#: argp/argp-help.c:225
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: argp/argp-help.c:234
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: argp/argp-help.c:246
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: argp/argp-help.c:1210
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-
-#: argp/argp-help.c:1597
-msgid "Usage:"
-msgstr ""
-
-#: argp/argp-help.c:1601
-msgid "  or: "
-msgstr ""
-
-#: argp/argp-help.c:1613
-msgid " [OPTION...]"
-msgstr ""
-
-#: argp/argp-help.c:1640
-#, c-format
-msgid "Try `%s --help' or `%s --usage' for more information.\n"
-msgstr ""
-
-#: argp/argp-help.c:1668
-#, c-format
-msgid "Report bugs to %s.\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: argp/argp-parse.c:766
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: libidn/nfkc.c:464
-msgid "Character out of range for UTF-8"
+#: posix/wordexp.c:1799
+msgid "parameter null or not set"
 msgstr ""
 
 #: resolv/herror.c:68
@@ -3468,11 +4237,11 @@ msgstr ""
 msgid "No address associated with name"
 msgstr ""
 
-#: resolv/herror.c:108
+#: resolv/herror.c:107
 msgid "Resolver internal error"
 msgstr ""
 
-#: resolv/herror.c:111
+#: resolv/herror.c:110
 msgid "Unknown resolver error"
 msgstr ""
 
@@ -3481,193 +4250,74 @@ msgstr ""
 msgid "%s: line %d: expected service, found `%s'\n"
 msgstr ""
 
-#: resolv/res_hconf.c:167
+#: resolv/res_hconf.c:162
 #, c-format
 msgid "%s: line %d: cannot specify more than %d services"
 msgstr ""
 
-#: resolv/res_hconf.c:195
+#: resolv/res_hconf.c:185
 #, c-format
 msgid "%s: line %d: list delimiter not followed by keyword"
 msgstr ""
 
-#: resolv/res_hconf.c:236
+#: resolv/res_hconf.c:221
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr ""
 
-#: resolv/res_hconf.c:262
+#: resolv/res_hconf.c:242
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr ""
 
-#: resolv/res_hconf.c:326
+#: resolv/res_hconf.c:301
 #, c-format
 msgid "%s: line %d: expected `on' or `off', found `%s'\n"
 msgstr ""
 
-#: resolv/res_hconf.c:374
+#: resolv/res_hconf.c:344
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
 msgstr ""
 
-#: resolv/res_hconf.c:404
+#: resolv/res_hconf.c:369
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr ""
 
-#: nss/getent.c:51
-msgid "database [key ...]"
-msgstr ""
-
-#: nss/getent.c:56
-msgid "Service configuration to be used"
-msgstr ""
-
-#: nss/getent.c:61
-msgid ""
-"Get entries from administrative database.\013For bug reporting instructions, "
-"please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>.\n"
-msgstr ""
-
-#: nss/getent.c:144 nss/getent.c:393
-#, c-format
-msgid "Enumeration not supported on %s\n"
-msgstr ""
-
-#: nss/getent.c:791
-msgid "Supported databases:"
-msgstr ""
-
-#: nss/getent.c:848 nscd/nscd.c:146 nscd/nscd_nischeck.c:64
-#, c-format
-msgid "wrong number of arguments"
-msgstr ""
-
-#: nss/getent.c:858
-#, c-format
-msgid "Unknown database: %s\n"
-msgstr ""
-
-#: debug/pcprofiledump.c:52
-msgid "Don't buffer output"
-msgstr ""
-
-#: debug/pcprofiledump.c:57
-msgid "Dump information generated by PC profiling."
-msgstr ""
-
-#: debug/pcprofiledump.c:60
-msgid "[FILE]"
-msgstr ""
-
-#: debug/pcprofiledump.c:100
-#, c-format
-msgid "cannot open input file"
-msgstr ""
-
-#: debug/pcprofiledump.c:106
-#, c-format
-msgid "cannot read header"
-msgstr ""
-
-#: debug/pcprofiledump.c:170
+#: stdio-common/psignal.c:51
 #, c-format
-msgid "invalid pointer size"
-msgstr ""
-
-#: inet/rcmd.c:166 inet/rcmd.c:168
-msgid "rcmd: Cannot allocate memory\n"
-msgstr ""
-
-#: inet/rcmd.c:186 inet/rcmd.c:188
-msgid "rcmd: socket: All ports in use\n"
-msgstr ""
-
-#: inet/rcmd.c:220
-#, c-format
-msgid "connect to address %s: "
-msgstr ""
-
-#: inet/rcmd.c:236
-#, c-format
-msgid "Trying %s...\n"
-msgstr ""
-
-#: inet/rcmd.c:281
-#, c-format
-msgid "rcmd: write (setting up stderr): %m\n"
+msgid "%s%sUnknown signal %d\n"
 msgstr ""
 
-#: inet/rcmd.c:300
-#, c-format
-msgid "rcmd: poll (setting up stderr): %m\n"
+#: stdio-common/psignal.c:52
+msgid "Unknown signal"
 msgstr ""
 
-#: inet/rcmd.c:303
-msgid "poll: protocol failure in circuit setup\n"
+#: string/_strerror.c:44 sysdeps/mach/_strerror.c:87
+#: sysdeps/mach/hurd/mips/dl-machine.c:83
+msgid "Unknown error "
 msgstr ""
 
-#: inet/rcmd.c:344
-msgid "socket: protocol failure in circuit setup\n"
+#: string/strerror.c:43
+msgid "Unknown error"
 msgstr ""
 
-#: inet/rcmd.c:371
+#: string/strsignal.c:65
 #, c-format
-msgid "rcmd: %s: short read"
-msgstr ""
-
-#: inet/rcmd.c:531
-msgid "lstat failed"
-msgstr ""
-
-#: inet/rcmd.c:533
-msgid "not regular file"
-msgstr ""
-
-#: inet/rcmd.c:538
-msgid "cannot open"
-msgstr ""
-
-#: inet/rcmd.c:540
-msgid "fstat failed"
-msgstr ""
-
-#: inet/rcmd.c:542
-msgid "bad owner"
-msgstr ""
-
-#: inet/rcmd.c:544
-msgid "writeable by other than owner"
-msgstr ""
-
-#: inet/rcmd.c:546
-msgid "hard linked somewhere"
-msgstr ""
-
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
-msgid "out of memory"
-msgstr ""
-
-#: inet/ruserpass.c:184
-msgid "Error: .netrc file is readable by others."
-msgstr ""
-
-#: inet/ruserpass.c:185
-msgid "Remove password or make file unreadable by others."
+msgid "Real-time signal %d"
 msgstr ""
 
-#: inet/ruserpass.c:277
+#: string/strsignal.c:69
 #, c-format
-msgid "Unknown .netrc keyword %s"
+msgid "Unknown signal %d"
 msgstr ""
 
-#: sunrpc/auth_unix.c:117 sunrpc/auth_unix.c:120
+#: sunrpc/auth_unix.c:114
 msgid "authunix_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/auth_unix.c:356
+#: sunrpc/auth_unix.c:350
 msgid "auth_none.c - Fatal marshalling problem"
 msgstr ""
 
@@ -3685,111 +4335,111 @@ msgstr ""
 msgid "(unknown authentication error - %d)"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:177
+#: sunrpc/clnt_perr.c:172
 msgid "RPC: Success"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Can't encode arguments"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Can't decode result"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Unable to send"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Unable to receive"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Timed out"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Incompatible versions of RPC"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Authentication error"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Program unavailable"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Program/version mismatch"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Procedure unavailable"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Server can't decode arguments"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:224
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Remote system error"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:228
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Unknown host"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:232
+#: sunrpc/clnt_perr.c:227
 msgid "RPC: Unknown protocol"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:236
+#: sunrpc/clnt_perr.c:231
 msgid "RPC: Port mapper failure"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:240
+#: sunrpc/clnt_perr.c:235
 msgid "RPC: Program not registered"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:244
+#: sunrpc/clnt_perr.c:239
 msgid "RPC: Failed (unspecified error)"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:285
+#: sunrpc/clnt_perr.c:280
 msgid "RPC: (unknown error code)"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:342
 msgid "Authentication OK"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:345
 msgid "Invalid client credential"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:364
+#: sunrpc/clnt_perr.c:349
 msgid "Server rejected credential"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:368
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid client verifier"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:372
+#: sunrpc/clnt_perr.c:357
 msgid "Server rejected verifier"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:376
+#: sunrpc/clnt_perr.c:361
 msgid "Client credential too weak"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:380
+#: sunrpc/clnt_perr.c:365
 msgid "Invalid server verifier"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:384
+#: sunrpc/clnt_perr.c:369
 msgid "Failed (unspecified error)"
 msgstr ""
 
@@ -3797,19 +4447,19 @@ msgstr ""
 msgid "clnt_raw.c - Fatal header serialization error."
 msgstr ""
 
-#: sunrpc/clnt_tcp.c:134 sunrpc/clnt_tcp.c:137
+#: sunrpc/clnt_tcp.c:131
 msgid "clnttcp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/clnt_udp.c:142 sunrpc/clnt_udp.c:145
+#: sunrpc/clnt_udp.c:139
 msgid "clntudp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/clnt_unix.c:131 sunrpc/clnt_unix.c:134
+#: sunrpc/clnt_unix.c:128
 msgid "clntunix_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/pm_getmaps.c:74
+#: sunrpc/pm_getmaps.c:83
 msgid "pmap_getmaps rpc problem"
 msgstr ""
 
@@ -3837,138 +4487,138 @@ msgstr ""
 msgid "Cannot receive reply to broadcast"
 msgstr ""
 
-#: sunrpc/rpc_main.c:290
+#: sunrpc/rpc_main.c:286
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:297
+#: sunrpc/rpc_main.c:293
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:309
+#: sunrpc/rpc_main.c:305
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr ""
 
-#: sunrpc/rpc_main.c:344
+#: sunrpc/rpc_main.c:340
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:352
+#: sunrpc/rpc_main.c:348
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:421
+#: sunrpc/rpc_main.c:417
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:424
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:464
+#: sunrpc/rpc_main.c:460
 #, c-format
 msgid "illegal nettype :`%s'\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1104
+#: sunrpc/rpc_main.c:1100
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1116
+#: sunrpc/rpc_main.c:1112
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr ""
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1149
+#: sunrpc/rpc_main.c:1145
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1194
+#: sunrpc/rpc_main.c:1190
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1364
+#: sunrpc/rpc_main.c:1360
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1373
+#: sunrpc/rpc_main.c:1369
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1385
+#: sunrpc/rpc_main.c:1381
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1392
+#: sunrpc/rpc_main.c:1388
 msgid "Cannot use table flags with newstyle!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1411
+#: sunrpc/rpc_main.c:1407
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1412
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1421
 #, c-format
 msgid "usage: %s infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1426
+#: sunrpc/rpc_main.c:1422
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1428
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1426
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1431
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:118
+#: sunrpc/rpc_scan.c:114
 msgid "constant or identifier expected"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:314
+#: sunrpc/rpc_scan.c:310
 msgid "illegal character in file: "
 msgstr ""
 
-#: sunrpc/rpc_scan.c:353 sunrpc/rpc_scan.c:379
+#: sunrpc/rpc_scan.c:349 sunrpc/rpc_scan.c:375
 msgid "unterminated string constant"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:385
+#: sunrpc/rpc_scan.c:381
 msgid "empty char string"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:527 sunrpc/rpc_scan.c:537
+#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
 msgid "preprocessor error"
 msgstr ""
 
@@ -4071,12 +4721,12 @@ msgstr ""
 msgid "registerrpc: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_simple.c:178
+#: sunrpc/svc_simple.c:173
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr ""
 
-#: sunrpc/svc_simple.c:187
+#: sunrpc/svc_simple.c:182
 #, c-format
 msgid "never registered prog %d\n"
 msgstr ""
@@ -4089,11 +4739,11 @@ msgstr ""
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:181 sunrpc/svc_tcp.c:184
+#: sunrpc/svc_tcp.c:179
 msgid "svctcp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:225 sunrpc/svc_tcp.c:228
+#: sunrpc/svc_tcp.c:218
 msgid "svc_tcp: makefd_xprt: out of memory\n"
 msgstr ""
 
@@ -4105,39 +4755,39 @@ msgstr ""
 msgid "svcudp_create - cannot getsockname"
 msgstr ""
 
-#: sunrpc/svc_udp.c:154 sunrpc/svc_udp.c:157
+#: sunrpc/svc_udp.c:152
 msgid "svcudp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_udp.c:182 sunrpc/svc_udp.c:185
+#: sunrpc/svc_udp.c:174
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr ""
 
-#: sunrpc/svc_udp.c:493
+#: sunrpc/svc_udp.c:474
 msgid "enablecache: cache already enabled"
 msgstr ""
 
-#: sunrpc/svc_udp.c:499
+#: sunrpc/svc_udp.c:480
 msgid "enablecache: could not allocate cache"
 msgstr ""
 
-#: sunrpc/svc_udp.c:507
+#: sunrpc/svc_udp.c:488
 msgid "enablecache: could not allocate cache data"
 msgstr ""
 
-#: sunrpc/svc_udp.c:514
+#: sunrpc/svc_udp.c:495
 msgid "enablecache: could not allocate cache fifo"
 msgstr ""
 
-#: sunrpc/svc_udp.c:550
+#: sunrpc/svc_udp.c:531
 msgid "cache_set: victim not found"
 msgstr ""
 
-#: sunrpc/svc_udp.c:561
+#: sunrpc/svc_udp.c:542
 msgid "cache_set: victim alloc failed"
 msgstr ""
 
-#: sunrpc/svc_udp.c:567
+#: sunrpc/svc_udp.c:548
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr ""
 
@@ -4149,1904 +4799,1500 @@ msgstr ""
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_unix.c:178 sunrpc/svc_unix.c:181
+#: sunrpc/svc_unix.c:176
 msgid "svcunix_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_unix.c:222 sunrpc/svc_unix.c:225
+#: sunrpc/svc_unix.c:215
 msgid "svc_unix: makefd_xprt: out of memory\n"
 msgstr ""
 
-#: sunrpc/xdr.c:568 sunrpc/xdr.c:571
+#: sunrpc/xdr.c:566
 msgid "xdr_bytes: out of memory\n"
 msgstr ""
 
-#: sunrpc/xdr.c:726 sunrpc/xdr.c:729
+#: sunrpc/xdr.c:718
 msgid "xdr_string: out of memory\n"
 msgstr ""
 
-#: sunrpc/xdr_array.c:111 sunrpc/xdr_array.c:114
+#: sunrpc/xdr_array.c:108
 msgid "xdr_array: out of memory\n"
 msgstr ""
 
-#: sunrpc/xdr_rec.c:158 sunrpc/xdr_rec.c:161
+#: sunrpc/xdr_rec.c:156
 msgid "xdrrec_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/xdr_ref.c:88 sunrpc/xdr_ref.c:91
+#: sunrpc/xdr_ref.c:86
 msgid "xdr_reference: out of memory\n"
 msgstr ""
 
-#: nis/nis_callback.c:189
-msgid "unable to free arguments"
-msgstr ""
-
-#: nis/nis_error.c:30
-msgid "Probable success"
-msgstr ""
-
-#: nis/nis_error.c:31
-msgid "Not found"
-msgstr ""
-
-#: nis/nis_error.c:32
-msgid "Probably not found"
-msgstr ""
-
-#: nis/nis_error.c:33
-msgid "Cache expired"
-msgstr ""
-
-#: nis/nis_error.c:34
-msgid "NIS+ servers unreachable"
-msgstr ""
-
-#: nis/nis_error.c:35
-msgid "Unknown object"
-msgstr ""
-
-#: nis/nis_error.c:36
-msgid "Server busy, try again"
-msgstr ""
-
-#: nis/nis_error.c:37
-msgid "Generic system error"
-msgstr ""
-
-#: nis/nis_error.c:38
-msgid "First/next chain broken"
-msgstr ""
-
-#: nis/nis_error.c:40
-msgid "Not owner"
-msgstr ""
-
-#: nis/nis_error.c:41
-msgid "Name not served by this server"
+#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
+msgid "Hangup"
 msgstr ""
 
-#: nis/nis_error.c:42
-msgid "Server out of memory"
+#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
+msgid "Interrupt"
 msgstr ""
 
-#: nis/nis_error.c:43
-msgid "Object with same name exists"
+#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
+msgid "Quit"
 msgstr ""
 
-#: nis/nis_error.c:44
-msgid "Not master server for this domain"
+#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
 msgstr ""
 
-#: nis/nis_error.c:45
-msgid "Invalid object for operation"
+#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
 msgstr ""
 
-#: nis/nis_error.c:46
-msgid "Malformed name, or illegal name"
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
 msgstr ""
 
-#: nis/nis_error.c:47
-msgid "Unable to create callback"
+#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
 msgstr ""
 
-#: nis/nis_error.c:48
-msgid "Results sent to callback proc"
+#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
+msgid "Killed"
 msgstr ""
 
-#: nis/nis_error.c:49
-msgid "Not found, no such name"
+#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36
+msgid "Bus error"
 msgstr ""
 
-#: nis/nis_error.c:50
-msgid "Name/entry isn't unique"
+#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
 msgstr ""
 
-#: nis/nis_error.c:51
-msgid "Modification failed"
+#. 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 sysdeps/gnu/errlist.c:359
+#: sysdeps/unix/siglist.c:39
+msgid "Broken pipe"
 msgstr ""
 
-#: nis/nis_error.c:52
-msgid "Database for table does not exist"
+#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
 msgstr ""
 
-#: nis/nis_error.c:53
-msgid "Entry/table type mismatch"
+#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
+msgid "Terminated"
 msgstr ""
 
-#: nis/nis_error.c:54
-msgid "Link points to illegal name"
+#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
 msgstr ""
 
-#: nis/nis_error.c:55
-msgid "Partial success"
+#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
 msgstr ""
 
-#: nis/nis_error.c:56
-msgid "Too many attributes"
+#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
+msgid "Stopped"
 msgstr ""
 
-#: nis/nis_error.c:57
-msgid "Error in RPC subsystem"
+#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
+msgid "Continued"
 msgstr ""
 
-#: nis/nis_error.c:58
-msgid "Missing or malformed attribute"
+#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
+msgid "Child exited"
 msgstr ""
 
-#: nis/nis_error.c:59
-msgid "Named object is not searchable"
+#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
 msgstr ""
 
-#: nis/nis_error.c:60
-msgid "Error while talking to callback proc"
+#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
 msgstr ""
 
-#: nis/nis_error.c:61
-msgid "Non NIS+ namespace encountered"
+#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
+msgid "I/O possible"
 msgstr ""
 
-#: nis/nis_error.c:62
-msgid "Illegal object type for operation"
+#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
 msgstr ""
 
-#: nis/nis_error.c:63
-msgid "Passed object is not the same object on server"
+#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
 msgstr ""
 
-#: nis/nis_error.c:64
-msgid "Modify operation failed"
+#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
 msgstr ""
 
-#: nis/nis_error.c:65
-msgid "Query illegal for named table"
+#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
 msgstr ""
 
-#: nis/nis_error.c:66
-msgid "Attempt to remove a non-empty table"
+#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54
+msgid "Window changed"
 msgstr ""
 
-#: nis/nis_error.c:67
-msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
+#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
 msgstr ""
 
-#: nis/nis_error.c:68
-msgid "Full resync required for directory"
+#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
 msgstr ""
 
-#: nis/nis_error.c:69
-msgid "NIS+ operation failed"
+#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
+msgid "EMT trap"
 msgstr ""
 
-#: nis/nis_error.c:70
-msgid "NIS+ service is unavailable or not installed"
+#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38
+msgid "Bad system call"
 msgstr ""
 
-#: nis/nis_error.c:71
-msgid "Yes, 42 is the meaning of life"
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
 msgstr ""
 
-#: nis/nis_error.c:72
-msgid "Unable to authenticate NIS+ server"
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
 msgstr ""
 
-#: nis/nis_error.c:73
-msgid "Unable to authenticate NIS+ client"
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
 msgstr ""
 
-#: nis/nis_error.c:74
-msgid "No file space on server"
+#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55
+msgid "Resource lost"
 msgstr ""
 
-#: nis/nis_error.c:75
-msgid "Unable to create process on server"
+#. TRANS Operation not permitted; only the owner of the file (or other resource)
+#. TRANS or processes with special privileges can perform the operation.
+#: sysdeps/gnu/errlist.c:25
+msgid "Operation not permitted"
 msgstr ""
 
-#: nis/nis_error.c:76
-msgid "Master server busy, full dump rescheduled."
+#. TRANS No process matches the specified process ID.
+#: sysdeps/gnu/errlist.c:45
+msgid "No such process"
 msgstr ""
 
-#: nis/nis_local_names.c:122
-#, c-format
-msgid "LOCAL entry for UID %d in directory %s not unique\n"
+#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
+#. TRANS completion of the call.  When this happens, you should try the call
+#. TRANS again.
+#. TRANS
+#. TRANS You can choose to have functions resume after a signal that is handled,
+#. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
+#. TRANS Primitives}.
+#: sysdeps/gnu/errlist.c:60
+msgid "Interrupted system call"
 msgstr ""
 
-#: nis/nis_print.c:51
-msgid "UNKNOWN"
+#. TRANS Input/output error; usually used for physical read or write errors.
+#: sysdeps/gnu/errlist.c:69
+msgid "Input/output error"
 msgstr ""
 
-#: nis/nis_print.c:109
-msgid "BOGUS OBJECT\n"
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: sysdeps/gnu/errlist.c:82
+msgid "No such device or address"
 msgstr ""
 
-#: nis/nis_print.c:112
-msgid "NO OBJECT\n"
+#. TRANS Argument list too long; used when the arguments passed to a new program
+#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
+#. TRANS File}) occupy too much memory space.  This condition never arises in the
+#. TRANS GNU system.
+#: sysdeps/gnu/errlist.c:94
+msgid "Argument list too long"
 msgstr ""
 
-#: nis/nis_print.c:115
-msgid "DIRECTORY\n"
+#. TRANS Invalid executable file format.  This condition is detected by the
+#. TRANS @code{exec} functions; see @ref{Executing a File}.
+#: sysdeps/gnu/errlist.c:104
+msgid "Exec format error"
 msgstr ""
 
-#: nis/nis_print.c:118
-msgid "GROUP\n"
+#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
+#. TRANS closed or reading from a descriptor open only for writing (or vice
+#. TRANS versa).
+#: sysdeps/gnu/errlist.c:115
+msgid "Bad file descriptor"
 msgstr ""
 
-#: nis/nis_print.c:121
-msgid "TABLE\n"
+#. TRANS There are no child processes.  This error happens on operations that are
+#. TRANS supposed to manipulate child processes, when there aren't any processes
+#. TRANS to manipulate.
+#: sysdeps/gnu/errlist.c:126
+msgid "No child processes"
 msgstr ""
 
-#: nis/nis_print.c:124
-msgid "ENTRY\n"
+#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
+#. TRANS deadlock situation.  The system does not guarantee that it will notice
+#. TRANS all such situations.  This error means you got lucky and the system
+#. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
+#: sysdeps/gnu/errlist.c:138
+msgid "Resource deadlock avoided"
 msgstr ""
 
-#: nis/nis_print.c:127
-msgid "LINK\n"
+#. TRANS No memory available.  The system cannot allocate more virtual memory
+#. TRANS because its capacity is full.
+#: sysdeps/gnu/errlist.c:148
+msgid "Cannot allocate memory"
 msgstr ""
 
-#: nis/nis_print.c:130
-msgid "PRIVATE\n"
+#. TRANS Bad address; an invalid pointer was detected.
+#. TRANS In the GNU system, this error never happens; you get a signal instead.
+#: sysdeps/gnu/errlist.c:167
+msgid "Bad address"
 msgstr ""
 
-#: nis/nis_print.c:133
-msgid "(Unknown object)\n"
+#. TRANS A file that isn't a block special file was given in a situation that
+#. TRANS requires one.  For example, trying to mount an ordinary file as a file
+#. TRANS system in Unix gives this error.
+#: sysdeps/gnu/errlist.c:178
+msgid "Block device required"
 msgstr ""
 
-#: nis/nis_print.c:167
-#, c-format
-msgid "Name : `%s'\n"
+#. TRANS Resource busy; a system resource that can't be shared is already in use.
+#. TRANS For example, if you try to delete a file that is the root of a currently
+#. TRANS mounted filesystem, you get this error.
+#: sysdeps/gnu/errlist.c:189
+msgid "Device or resource busy"
 msgstr ""
 
-#: nis/nis_print.c:168
-#, c-format
-msgid "Type : %s\n"
+#. TRANS File exists; an existing file was specified in a context where it only
+#. TRANS makes sense to specify a new file.
+#: sysdeps/gnu/errlist.c:199
+msgid "File exists"
 msgstr ""
 
-#: nis/nis_print.c:173
-msgid "Master Server :\n"
+#. TRANS An attempt to make an improper link across file systems was detected.
+#. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
+#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
+#: sysdeps/gnu/errlist.c:210
+msgid "Invalid cross-device link"
 msgstr ""
 
-#: nis/nis_print.c:175
-msgid "Replicate :\n"
+#. TRANS The wrong type of device was given to a function that expects a
+#. TRANS particular sort of device.
+#: sysdeps/gnu/errlist.c:220
+msgid "No such device"
 msgstr ""
 
-#: nis/nis_print.c:176
-#, c-format
-msgid "\tName       : %s\n"
+#. TRANS A file that isn't a directory was specified when a directory is required.
+#: sysdeps/gnu/errlist.c:229
+msgid "Not a directory"
 msgstr ""
 
-#: nis/nis_print.c:177
-msgid "\tPublic Key : "
+#. TRANS File is a directory; you cannot open a directory for writing,
+#. TRANS or create or remove hard links to it.
+#: sysdeps/gnu/errlist.c:239
+msgid "Is a directory"
 msgstr ""
 
-#: nis/nis_print.c:181
-msgid "None.\n"
+#. TRANS Invalid argument.  This is used to indicate various kinds of problems
+#. TRANS with passing the wrong argument to a library function.
+#: sysdeps/gnu/errlist.c:249
+msgid "Invalid argument"
 msgstr ""
 
-#: nis/nis_print.c:184
-#, c-format
-msgid "Diffie-Hellmann (%d bits)\n"
+#. TRANS The current process has too many files open and can't open any more.
+#. TRANS Duplicate descriptors do count toward this limit.
+#. TRANS
+#. TRANS In BSD and GNU, the number of open files is controlled by a resource
+#. TRANS limit that can usually be increased.  If you get this error, you might
+#. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
+#. TRANS @pxref{Limits on Resources}.
+#: sysdeps/gnu/errlist.c:264
+msgid "Too many open files"
 msgstr ""
 
-#: nis/nis_print.c:189
-#, c-format
-msgid "RSA (%d bits)\n"
+#. TRANS There are too many distinct file openings in the entire system.  Note
+#. TRANS that any number of linked channels count as just one file opening; see
+#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
+#: sysdeps/gnu/errlist.c:275
+msgid "Too many open files in system"
 msgstr ""
 
-#: nis/nis_print.c:192
-msgid "Kerberos.\n"
+#. TRANS Inappropriate I/O control operation, such as trying to set terminal
+#. TRANS modes on an ordinary file.
+#: sysdeps/gnu/errlist.c:285
+msgid "Inappropriate ioctl for device"
 msgstr ""
 
-#: nis/nis_print.c:195
-#, c-format
-msgid "Unknown (type = %d, bits = %d)\n"
+#. TRANS An attempt to execute a file that is currently open for writing, or
+#. TRANS write to a file that is currently being executed.  Often using a
+#. TRANS debugger to run a program is considered having it open for writing and
+#. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
+#. TRANS is not an error in the GNU system; the text is copied as necessary.
+#: sysdeps/gnu/errlist.c:298
+msgid "Text file busy"
 msgstr ""
 
-#: nis/nis_print.c:206
-#, c-format
-msgid "\tUniversal addresses (%u)\n"
+#. TRANS File too big; the size of a file would be larger than allowed by the system.
+#: sysdeps/gnu/errlist.c:307
+msgid "File too large"
 msgstr ""
 
-#: nis/nis_print.c:228
-msgid "Time to live : "
+#. TRANS No space left on device; write operation on a file failed because the
+#. TRANS disk is full.
+#: sysdeps/gnu/errlist.c:317
+msgid "No space left on device"
 msgstr ""
 
-#: nis/nis_print.c:230
-msgid "Default Access rights :\n"
+#. TRANS Invalid seek operation (such as on a pipe).
+#: sysdeps/gnu/errlist.c:326
+msgid "Illegal seek"
 msgstr ""
 
-#: nis/nis_print.c:239
-#, c-format
-msgid "\tType         : %s\n"
+#. TRANS An attempt was made to modify something on a read-only file system.
+#: sysdeps/gnu/errlist.c:335
+msgid "Read-only file system"
 msgstr ""
 
-#: nis/nis_print.c:240
-msgid "\tAccess rights: "
+#. TRANS Too many links; the link count of a single file would become too large.
+#. TRANS @code{rename} can cause this error if the file being renamed already has
+#. TRANS as many links as it can take (@pxref{Renaming Files}).
+#: sysdeps/gnu/errlist.c:346
+msgid "Too many links"
 msgstr ""
 
-#: nis/nis_print.c:254
-msgid "Group Flags :"
+#. TRANS Domain error; used by mathematical functions when an argument value does
+#. TRANS not fall into the domain over which the function is defined.
+#: sysdeps/gnu/errlist.c:369
+msgid "Numerical argument out of domain"
 msgstr ""
 
-#: nis/nis_print.c:257
-msgid ""
-"\n"
-"Group Members :\n"
+#. TRANS Range error; used by mathematical functions when the result value is
+#. TRANS not representable because of overflow or underflow.
+#: sysdeps/gnu/errlist.c:379
+msgid "Numerical result out of range"
 msgstr ""
 
-#: nis/nis_print.c:269
-#, c-format
-msgid "Table Type          : %s\n"
+#. TRANS Resource temporarily unavailable; the call might work if you try again
+#. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
+#. TRANS they are always the same in the GNU C library.
+#. TRANS
+#. TRANS This error can happen in a few different situations:
+#. TRANS
+#. TRANS @itemize @bullet
+#. TRANS @item
+#. TRANS An operation that would block was attempted on an object that has
+#. TRANS non-blocking mode selected.  Trying the same operation again will block
+#. TRANS until some external condition makes it possible to read, write, or
+#. TRANS connect (whatever the operation).  You can use @code{select} to find out
+#. TRANS when the operation will be possible; @pxref{Waiting for I/O}.
+#. TRANS
+#. TRANS @strong{Portability Note:} In many older Unix systems, this condition
+#. TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
+#. TRANS different from @code{EAGAIN}.  To make your program portable, you should
+#. TRANS check for both codes and treat them the same.
+#. TRANS
+#. TRANS @item
+#. TRANS A temporary resource shortage made an operation impossible.  @code{fork}
+#. TRANS can return this error.  It indicates that the shortage is expected to
+#. TRANS pass, so your program can try the call again later and it may succeed.
+#. TRANS It is probably a good idea to delay for a few seconds before trying it
+#. TRANS again, to allow time for other processes to release scarce resources.
+#. TRANS Such shortages are usually fairly serious and affect the whole system,
+#. TRANS so usually an interactive program should report the error to the user
+#. TRANS and return to its command loop.
+#. TRANS @end itemize
+#: sysdeps/gnu/errlist.c:416
+msgid "Resource temporarily unavailable"
 msgstr ""
 
-#: nis/nis_print.c:270
-#, c-format
-msgid "Number of Columns   : %d\n"
+#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
+#. TRANS The values are always the same, on every operating system.
+#. TRANS
+#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
+#. TRANS separate error code.
+#: sysdeps/gnu/errlist.c:429
+msgid "Operation would block"
 msgstr ""
 
-#: nis/nis_print.c:271
-#, c-format
-msgid "Character Separator : %c\n"
+#. TRANS An operation that cannot complete immediately was initiated on an object
+#. TRANS that has non-blocking mode selected.  Some functions that must always
+#. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
+#. TRANS @code{EAGAIN}.  Instead, they return @code{EINPROGRESS} to indicate that
+#. TRANS the operation has begun and will take some time.  Attempts to manipulate
+#. TRANS the object before the call completes return @code{EALREADY}.  You can
+#. TRANS use the @code{select} function to find out when the pending operation
+#. TRANS has completed; @pxref{Waiting for I/O}.
+#: sysdeps/gnu/errlist.c:445
+msgid "Operation now in progress"
 msgstr ""
 
-#: nis/nis_print.c:272
-#, c-format
-msgid "Search Path         : %s\n"
+#. TRANS An operation is already in progress on an object that has non-blocking
+#. TRANS mode selected.
+#: sysdeps/gnu/errlist.c:455
+msgid "Operation already in progress"
 msgstr ""
 
-#: nis/nis_print.c:273
-msgid "Columns             :\n"
+#. TRANS A file that isn't a socket was specified when a socket is required.
+#: sysdeps/gnu/errlist.c:464
+msgid "Socket operation on non-socket"
 msgstr ""
 
-#: nis/nis_print.c:276
-#, c-format
-msgid "\t[%d]\tName          : %s\n"
+#. TRANS The size of a message sent on a socket was larger than the supported
+#. TRANS maximum size.
+#: sysdeps/gnu/errlist.c:474
+msgid "Message too long"
 msgstr ""
 
-#: nis/nis_print.c:278
-msgid "\t\tAttributes    : "
+#. TRANS The socket type does not support the requested communications protocol.
+#: sysdeps/gnu/errlist.c:483
+msgid "Protocol wrong type for socket"
 msgstr ""
 
-#: nis/nis_print.c:280
-msgid "\t\tAccess Rights : "
+#. TRANS You specified a socket option that doesn't make sense for the
+#. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
+#: sysdeps/gnu/errlist.c:493
+msgid "Protocol not available"
 msgstr ""
 
-#: nis/nis_print.c:290
-msgid "Linked Object Type : "
+#. TRANS The socket domain does not support the requested communications protocol
+#. TRANS (perhaps because the requested protocol is completely invalid).
+#. TRANS @xref{Creating a Socket}.
+#: sysdeps/gnu/errlist.c:504
+msgid "Protocol not supported"
 msgstr ""
 
-#: nis/nis_print.c:292
-#, c-format
-msgid "Linked to : %s\n"
+#. TRANS The socket type is not supported.
+#: sysdeps/gnu/errlist.c:513
+msgid "Socket type not supported"
 msgstr ""
 
-#: nis/nis_print.c:302
-#, c-format
-msgid "\tEntry data of type %s\n"
+#. TRANS The operation you requested is not supported.  Some socket functions
+#. TRANS don't make sense for all types of sockets, and others may not be
+#. TRANS implemented for all communications protocols.  In the GNU system, this
+#. TRANS error can happen for many calls when the object does not support the
+#. TRANS particular operation; it is a generic indication that the server knows
+#. TRANS nothing to do for that call.
+#: sysdeps/gnu/errlist.c:527
+msgid "Operation not supported"
 msgstr ""
 
-#: nis/nis_print.c:305
-#, c-format
-msgid "\t[%u] - [%u bytes] "
+#. TRANS The socket communications protocol family you requested is not supported.
+#: sysdeps/gnu/errlist.c:536
+msgid "Protocol family not supported"
 msgstr ""
 
-#: nis/nis_print.c:308
-msgid "Encrypted data\n"
+#. TRANS The address family specified for a socket is not supported; it is
+#. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
+#: sysdeps/gnu/errlist.c:546
+msgid "Address family not supported by protocol"
 msgstr ""
 
-#: nis/nis_print.c:310
-msgid "Binary data\n"
+#. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
+#: sysdeps/gnu/errlist.c:555
+msgid "Address already in use"
 msgstr ""
 
-#: nis/nis_print.c:326
-#, c-format
-msgid "Object Name   : %s\n"
+#. TRANS The requested socket address is not available; for example, you tried
+#. TRANS to give a socket a name that doesn't match the local host name.
+#. TRANS @xref{Socket Addresses}.
+#: sysdeps/gnu/errlist.c:566
+msgid "Cannot assign requested address"
 msgstr ""
 
-#: nis/nis_print.c:327
-#, c-format
-msgid "Directory     : %s\n"
+#. TRANS A socket operation failed because the network was down.
+#: sysdeps/gnu/errlist.c:575
+msgid "Network is down"
 msgstr ""
 
-#: nis/nis_print.c:328
-#, c-format
-msgid "Owner         : %s\n"
+#. TRANS A socket operation failed because the subnet containing the remote host
+#. TRANS was unreachable.
+#: sysdeps/gnu/errlist.c:585
+msgid "Network is unreachable"
 msgstr ""
 
-#: nis/nis_print.c:329
-#, c-format
-msgid "Group         : %s\n"
+#. TRANS A network connection was reset because the remote host crashed.
+#: sysdeps/gnu/errlist.c:594
+msgid "Network dropped connection on reset"
 msgstr ""
 
-#: nis/nis_print.c:330
-msgid "Access Rights : "
+#. TRANS A network connection was aborted locally.
+#: sysdeps/gnu/errlist.c:603
+msgid "Software caused connection abort"
 msgstr ""
 
-#: nis/nis_print.c:332
-#, c-format
-msgid ""
-"\n"
-"Time to Live  : "
+#. TRANS A network connection was closed for reasons outside the control of the
+#. TRANS local host, such as by the remote machine rebooting or an unrecoverable
+#. TRANS protocol violation.
+#: sysdeps/gnu/errlist.c:614
+msgid "Connection reset by peer"
 msgstr ""
 
-#: nis/nis_print.c:335
-#, c-format
-msgid "Creation Time : %s"
+#. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
+#. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
+#. TRANS other from network operations.
+#: sysdeps/gnu/errlist.c:625
+msgid "No buffer space available"
 msgstr ""
 
-#: nis/nis_print.c:337
-#, c-format
-msgid "Mod. Time     : %s"
+#. TRANS You tried to connect a socket that is already connected.
+#. TRANS @xref{Connecting}.
+#: sysdeps/gnu/errlist.c:635
+msgid "Transport endpoint is already connected"
 msgstr ""
 
-#: nis/nis_print.c:338
-msgid "Object Type   : "
+#. TRANS The socket is not connected to anything.  You get this error when you
+#. TRANS try to transmit data over a socket, without first specifying a
+#. TRANS destination for the data.  For a connectionless socket (for datagram
+#. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
+#: sysdeps/gnu/errlist.c:647
+msgid "Transport endpoint is not connected"
 msgstr ""
 
-#: nis/nis_print.c:358
-#, c-format
-msgid "    Data Length = %u\n"
+#. TRANS No default destination address was set for the socket.  You get this
+#. TRANS error when you try to transmit data over a connectionless socket,
+#. TRANS without first specifying a destination for the data with @code{connect}.
+#: sysdeps/gnu/errlist.c:658
+msgid "Destination address required"
 msgstr ""
 
-#: nis/nis_print.c:372
-#, c-format
-msgid "Status            : %s\n"
+#. TRANS The socket has already been shut down.
+#: sysdeps/gnu/errlist.c:667
+msgid "Cannot send after transport endpoint shutdown"
 msgstr ""
 
-#: nis/nis_print.c:373
-#, c-format
-msgid "Number of objects : %u\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:676
+msgid "Too many references: cannot splice"
 msgstr ""
 
-#: nis/nis_print.c:377
-#, c-format
-msgid "Object #%d:\n"
+#. TRANS A socket operation with a specified timeout received no response during
+#. TRANS the timeout period.
+#: sysdeps/gnu/errlist.c:686
+msgid "Connection timed out"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:113
-#, c-format
-msgid "Group entry for \"%s.%s\" group:\n"
+#. TRANS A remote host refused to allow the network connection (typically because
+#. TRANS it is not running the requested service).
+#: sysdeps/gnu/errlist.c:696
+msgid "Connection refused"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:121
-msgid "    Explicit members:\n"
+#. TRANS Too many levels of symbolic links were encountered in looking up a file name.
+#. TRANS This often indicates a cycle of symbolic links.
+#: sysdeps/gnu/errlist.c:706
+msgid "Too many levels of symbolic links"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:126
-msgid "    No explicit members\n"
+#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
+#. TRANS Files}) or host name too long (in @code{gethostname} or
+#. TRANS @code{sethostname}; @pxref{Host Identification}).
+#: sysdeps/gnu/errlist.c:717
+msgid "File name too long"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:129
-msgid "    Implicit members:\n"
+#. TRANS The remote host for a requested network connection is down.
+#: sysdeps/gnu/errlist.c:726
+msgid "Host is down"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:134
-msgid "    No implicit members\n"
+#. TRANS The remote host for a requested network connection is not reachable.
+#: sysdeps/gnu/errlist.c:735
+msgid "No route to host"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:137
-msgid "    Recursive members:\n"
+#. TRANS Directory not empty, where an empty directory was expected.  Typically,
+#. TRANS this error occurs when you are trying to delete a directory.
+#: sysdeps/gnu/errlist.c:745
+msgid "Directory not empty"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:142
-msgid "    No recursive members\n"
+#. TRANS This means that the per-user limit on new process would be exceeded by
+#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
+#. TRANS the @code{RLIMIT_NPROC} limit.
+#: sysdeps/gnu/errlist.c:756
+msgid "Too many processes"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:145 nis/nis_print_group_entry.c:161
-msgid "    Explicit nonmembers:\n"
+#. TRANS The file quota system is confused because there are too many users.
+#. TRANS @c This can probably happen in a GNU system when using NFS.
+#: sysdeps/gnu/errlist.c:766
+msgid "Too many users"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:150
-msgid "    No explicit nonmembers\n"
+#. TRANS The user's disk quota was exceeded.
+#: sysdeps/gnu/errlist.c:775
+msgid "Disk quota exceeded"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:153
-msgid "    Implicit nonmembers:\n"
+#. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
+#. TRANS system which is due to file system rearrangements on the server host.
+#. TRANS Repairing this condition usually requires unmounting and remounting
+#. TRANS the NFS file system on the local host.
+#: sysdeps/gnu/errlist.c:787
+msgid "Stale NFS file handle"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:158
-msgid "    No implicit nonmembers\n"
+#. TRANS An attempt was made to NFS-mount a remote file system with a file name that
+#. TRANS already specifies an NFS-mounted file.
+#. TRANS (This is an error on some operating systems, but we expect it to work
+#. TRANS properly on the GNU system, making this error code impossible.)
+#: sysdeps/gnu/errlist.c:799
+msgid "Object is remote"
 msgstr ""
 
-#: nis/nis_print_group_entry.c:166
-msgid "    No recursive nonmembers\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:808
+msgid "RPC struct is bad"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:101
-#: nis/nss_nisplus/nisplus-publickey.c:182
-#, c-format
-msgid "DES entry for netname %s not unique\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:817
+msgid "RPC version wrong"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:218
-#, c-format
-msgid "netname2user: missing group id list in `%s'."
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:826
+msgid "RPC program not available"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:300
-#: nis/nss_nisplus/nisplus-publickey.c:306
-#: nis/nss_nisplus/nisplus-publickey.c:370
-#: nis/nss_nisplus/nisplus-publickey.c:379
-#, c-format
-msgid "netname2user: (nis+ lookup): %s\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:835
+msgid "RPC program version wrong"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:319
-#, c-format
-msgid "netname2user: DES entry for %s in directory %s not unique"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:844
+msgid "RPC bad procedure for program"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:337
-#, c-format
-msgid "netname2user: principal name `%s' too long"
+#. TRANS No locks available.  This is used by the file locking facilities; see
+#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
+#. TRANS it can result from an operation to an NFS server running another
+#. TRANS operating system.
+#: sysdeps/gnu/errlist.c:856
+msgid "No locks available"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:392
-#, c-format
-msgid "netname2user: LOCAL entry for %s in directory %s not unique"
+#. TRANS Inappropriate file type or format.  The file was the wrong type for the
+#. TRANS operation, or a data file had the wrong format.
+#. TRANS
+#. TRANS On some systems @code{chmod} returns this error if you try to set the
+#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
+#: sysdeps/gnu/errlist.c:869
+msgid "Inappropriate file type or format"
 msgstr ""
 
-#: nis/nss_nisplus/nisplus-publickey.c:399
-msgid "netname2user: should not have uid 0"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:878
+msgid "Authentication error"
 msgstr ""
 
-#: nis/ypclnt.c:145
-#, c-format
-msgid "YPBINDPROC_DOMAIN: %s\n"
+#. TRANS ???
+#: sysdeps/gnu/errlist.c:887
+msgid "Need authenticator"
 msgstr ""
 
-#: nis/ypclnt.c:795
-msgid "Request arguments bad"
+#. TRANS Function not implemented.  This indicates that the function called is
+#. TRANS not implemented at all, either in the C library itself or in the
+#. TRANS operating system.  When you get this error, you can be sure that this
+#. TRANS particular function will always fail with @code{ENOSYS} unless you
+#. TRANS install a new version of the C library or the operating system.
+#: sysdeps/gnu/errlist.c:900
+msgid "Function not implemented"
 msgstr ""
 
-#: nis/ypclnt.c:797
-msgid "RPC failure on NIS operation"
+#. TRANS Not supported.  A function returns this error when certain parameter
+#. TRANS values are valid, but the functionality they request is not available.
+#. TRANS This can mean that the function does not implement a particular command
+#. TRANS or option value or flag bit at all.  For functions that operate on some
+#. TRANS object given in a parameter, such as a file descriptor or a port, it
+#. TRANS might instead mean that only @emph{that specific object} (file
+#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
+#. TRANS different file descriptors might support different ranges of parameter
+#. TRANS values.
+#. TRANS
+#. TRANS If the entire function is not available at all in the implementation,
+#. TRANS it returns @code{ENOSYS} instead.
+#: sysdeps/gnu/errlist.c:920
+msgid "Not supported"
 msgstr ""
 
-#: nis/ypclnt.c:799
-msgid "Can't bind to server which serves this domain"
+#. TRANS While decoding a multibyte character the function came along an invalid
+#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
+#: sysdeps/gnu/errlist.c:930
+msgid "Invalid or incomplete multibyte or wide character"
 msgstr ""
 
-#: nis/ypclnt.c:801
-msgid "No such map in server's domain"
+#. TRANS In the GNU system, servers supporting the @code{term} protocol return
+#. TRANS this error for certain operations when the caller is not in the
+#. TRANS foreground process group of the terminal.  Users do not usually see this
+#. TRANS error because functions such as @code{read} and @code{write} translate
+#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
+#. TRANS for information on process groups and these signals.
+#: sysdeps/gnu/errlist.c:944
+msgid "Inappropriate operation for background process"
 msgstr ""
 
-#: nis/ypclnt.c:803
-msgid "No such key in map"
+#. TRANS In the GNU system, opening a file returns this error when the file is
+#. TRANS translated by a program and the translator program dies while starting
+#. TRANS up, before it has connected to the file.
+#: sysdeps/gnu/errlist.c:955
+msgid "Translator died"
 msgstr ""
 
-#: nis/ypclnt.c:805
-msgid "Internal NIS error"
+#. TRANS The experienced user will know what is wrong.
+#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
+#. TRANS @c Don't change it.
+#: sysdeps/gnu/errlist.c:966
+msgid "?"
 msgstr ""
 
-#: nis/ypclnt.c:807
-msgid "Local resource allocation failure"
+#. TRANS You did @strong{what}?
+#: sysdeps/gnu/errlist.c:975
+msgid "You really blew it this time"
 msgstr ""
 
-#: nis/ypclnt.c:809
-msgid "No more records in map database"
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#: sysdeps/gnu/errlist.c:984
+msgid "Computer bought the farm"
 msgstr ""
 
-#: nis/ypclnt.c:811
-msgid "Can't communicate with portmapper"
+#. TRANS This error code has no purpose.
+#: sysdeps/gnu/errlist.c:993
+msgid "Gratuitous error"
 msgstr ""
 
-#: nis/ypclnt.c:813
-msgid "Can't communicate with ypbind"
+#: sysdeps/gnu/errlist.c:1001
+msgid "Bad message"
 msgstr ""
 
-#: nis/ypclnt.c:815
-msgid "Can't communicate with ypserv"
+#: sysdeps/gnu/errlist.c:1009
+msgid "Identifier removed"
 msgstr ""
 
-#: nis/ypclnt.c:817
-msgid "Local domain name not set"
+#: sysdeps/gnu/errlist.c:1017
+msgid "Multihop attempted"
 msgstr ""
 
-#: nis/ypclnt.c:819
-msgid "NIS map database is bad"
+#: sysdeps/gnu/errlist.c:1025
+msgid "No data available"
 msgstr ""
 
-#: nis/ypclnt.c:821
-msgid "NIS client/server version mismatch - can't supply service"
+#: sysdeps/gnu/errlist.c:1033
+msgid "Link has been severed"
 msgstr ""
 
-#: nis/ypclnt.c:825
-msgid "Database is busy"
+#: sysdeps/gnu/errlist.c:1041
+msgid "No message of desired type"
 msgstr ""
 
-#: nis/ypclnt.c:827
-msgid "Unknown NIS error code"
+#: sysdeps/gnu/errlist.c:1049
+msgid "Out of streams resources"
 msgstr ""
 
-#: nis/ypclnt.c:862
-msgid "Internal ypbind error"
+#: sysdeps/gnu/errlist.c:1057
+msgid "Device not a stream"
 msgstr ""
 
-#: nis/ypclnt.c:864
-msgid "Domain not bound"
+#: sysdeps/gnu/errlist.c:1065
+msgid "Value too large for defined data type"
 msgstr ""
 
-#: nis/ypclnt.c:866
-msgid "System resource allocation failure"
+#: sysdeps/gnu/errlist.c:1073
+msgid "Protocol error"
 msgstr ""
 
-#: nis/ypclnt.c:868
-msgid "Unknown ypbind error"
+#: sysdeps/gnu/errlist.c:1081
+msgid "Timer expired"
 msgstr ""
 
-#: nis/ypclnt.c:907
-msgid "yp_update: cannot convert host to netname\n"
+#. TRANS Operation canceled; an asynchronous operation was canceled before it
+#. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
+#. TRANS the normal result is for the operations affected to complete with this
+#. TRANS error; @pxref{Cancel AIO Operations}.
+#: sysdeps/gnu/errlist.c:1093
+msgid "Operation canceled"
 msgstr ""
 
-#: nis/ypclnt.c:919
-msgid "yp_update: cannot get server address\n"
+#: sysdeps/gnu/errlist.c:1101
+msgid "Interrupted system call should be restarted"
 msgstr ""
 
-#: nscd/aicache.c:74 nscd/hstcache.c:436
-#, c-format
-msgid "Haven't found \"%s\" in hosts cache!"
+#: sysdeps/gnu/errlist.c:1109
+msgid "Channel number out of range"
 msgstr ""
 
-#: nscd/aicache.c:76 nscd/hstcache.c:438
-#, c-format
-msgid "Reloading \"%s\" in hosts cache!"
+#: sysdeps/gnu/errlist.c:1117
+msgid "Level 2 not synchronized"
 msgstr ""
 
-#: nscd/cache.c:127
-#, c-format
-msgid "add new entry \"%s\" of type %s for %s to cache%s"
+#: sysdeps/gnu/errlist.c:1125
+msgid "Level 3 halted"
 msgstr ""
 
-#: nscd/cache.c:207 nscd/connections.c:501
-#, c-format
-msgid "cannot stat() file `%s': %s"
+#: sysdeps/gnu/errlist.c:1133
+msgid "Level 3 reset"
 msgstr ""
 
-#: nscd/connections.c:209
-msgid "Cannot run nscd in secure mode as unprivileged user"
+#: sysdeps/gnu/errlist.c:1141
+msgid "Link number out of range"
 msgstr ""
 
-#: nscd/connections.c:243 nscd/connections.c:255 nscd/connections.c:266
-#, c-format
-msgid "invalid persistent database file \"%s\": %s"
+#: sysdeps/gnu/errlist.c:1149
+msgid "Protocol driver not attached"
 msgstr ""
 
-#: nscd/connections.c:257
-msgid "header size does not match"
+#: sysdeps/gnu/errlist.c:1157
+msgid "No CSI structure available"
 msgstr ""
 
-#: nscd/connections.c:268
-msgid "file size does not match"
+#: sysdeps/gnu/errlist.c:1165
+msgid "Level 2 halted"
 msgstr ""
 
-#: nscd/connections.c:285
-#, c-format
-msgid ""
-"suggested size of table for database %s larger than the persistent "
-"database's table"
+#: sysdeps/gnu/errlist.c:1173
+msgid "Invalid exchange"
 msgstr ""
 
-#: nscd/connections.c:295 nscd/connections.c:376
-#, c-format
-msgid "cannot create read-only descriptor for \"%s\"; no mmap"
+#: sysdeps/gnu/errlist.c:1181
+msgid "Invalid request descriptor"
 msgstr ""
 
-#: nscd/connections.c:355
-#, c-format
-msgid ""
-"database for %s corrupted or simultaneously used; remove %s manually if "
-"necessary and restart"
+#: sysdeps/gnu/errlist.c:1189
+msgid "Exchange full"
 msgstr ""
 
-#: nscd/connections.c:362
-#, c-format
-msgid "cannot create %s; no persistent database used"
+#: sysdeps/gnu/errlist.c:1197
+msgid "No anode"
 msgstr ""
 
-#: nscd/connections.c:365
-#, c-format
-msgid "cannot create %s; no sharing possible"
+#: sysdeps/gnu/errlist.c:1205
+msgid "Invalid request code"
 msgstr ""
 
-#: nscd/connections.c:430
-#, c-format
-msgid "cannot write to database file %s: %s"
+#: sysdeps/gnu/errlist.c:1213
+msgid "Invalid slot"
 msgstr ""
 
-#: nscd/connections.c:464
-#, c-format
-msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1221
+msgid "File locking deadlock error"
 msgstr ""
 
-#: nscd/connections.c:514
-#, c-format
-msgid "cannot open socket: %s"
+#: sysdeps/gnu/errlist.c:1229
+msgid "Bad font file format"
 msgstr ""
 
-#: nscd/connections.c:531
-#, c-format
-msgid "cannot change socket to nonblocking mode: %s"
+#: sysdeps/gnu/errlist.c:1237
+msgid "Machine is not on the network"
 msgstr ""
 
-#: nscd/connections.c:539
-#, c-format
-msgid "cannot set socket to close on exec: %s"
+#: sysdeps/gnu/errlist.c:1245
+msgid "Package not installed"
 msgstr ""
 
-#: nscd/connections.c:550
-#, c-format
-msgid "cannot enable socket to accept connections: %s"
+#: sysdeps/gnu/errlist.c:1253
+msgid "Advertise error"
 msgstr ""
 
-#: nscd/connections.c:628
-#, c-format
-msgid "provide access to FD %d, for %s"
+#: sysdeps/gnu/errlist.c:1261
+msgid "Srmount error"
 msgstr ""
 
-#: nscd/connections.c:640
-#, c-format
-msgid "cannot handle old request version %d; current version is %d"
+#: sysdeps/gnu/errlist.c:1269
+msgid "Communication error on send"
 msgstr ""
 
-#: nscd/connections.c:689 nscd/connections.c:716
-#, c-format
-msgid "cannot write result: %s"
+#: sysdeps/gnu/errlist.c:1277
+msgid "RFS specific error"
 msgstr ""
 
-#: nscd/connections.c:792 nscd/connections.c:1102
-#, c-format
-msgid "error getting callers id: %s"
+#: sysdeps/gnu/errlist.c:1285
+msgid "Name not unique on network"
 msgstr ""
 
-#: nscd/connections.c:850 nscd/connections.c:864
-#, c-format
-msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1293
+msgid "File descriptor in bad state"
 msgstr ""
 
-#: nscd/connections.c:904
-#, c-format
-msgid "cannot change to old UID: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1301
+msgid "Remote address changed"
 msgstr ""
 
-#: nscd/connections.c:914
-#, c-format
-msgid "cannot change to old GID: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1309
+msgid "Can not access a needed shared library"
 msgstr ""
 
-#: nscd/connections.c:927
-#, c-format
-msgid "cannot change to old working directory: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1317
+msgid "Accessing a corrupted shared library"
 msgstr ""
 
-#: nscd/connections.c:955
-#, c-format
-msgid "re-exec failed: %s; disabling paranoia mode"
+#: sysdeps/gnu/errlist.c:1325
+msgid ".lib section in a.out corrupted"
 msgstr ""
 
-#: nscd/connections.c:1080
-#, c-format
-msgid "short read while reading request: %s"
+#: sysdeps/gnu/errlist.c:1333
+msgid "Attempting to link in too many shared libraries"
 msgstr ""
 
-#: nscd/connections.c:1130
-#, c-format
-msgid "key length in request too long: %d"
+#: sysdeps/gnu/errlist.c:1341
+msgid "Cannot exec a shared library directly"
 msgstr ""
 
-#: nscd/connections.c:1143
-#, c-format
-msgid "short read while reading request key: %s"
+#: sysdeps/gnu/errlist.c:1349
+msgid "Streams pipe error"
 msgstr ""
 
-#: nscd/connections.c:1152
-#, c-format
-msgid "handle_request: request received (Version = %d) from PID %ld"
+#: sysdeps/gnu/errlist.c:1357
+msgid "Structure needs cleaning"
 msgstr ""
 
-#: nscd/connections.c:1157
-#, c-format
-msgid "handle_request: request received (Version = %d)"
+#: sysdeps/gnu/errlist.c:1365
+msgid "Not a XENIX named type file"
 msgstr ""
 
-#: nscd/connections.c:1514
-#, c-format
-msgid "could only start %d threads; terminating"
+#: sysdeps/gnu/errlist.c:1373
+msgid "No XENIX semaphores available"
 msgstr ""
 
-#: nscd/connections.c:1562 nscd/connections.c:1563 nscd/connections.c:1580
-#: nscd/connections.c:1589 nscd/connections.c:1602 nscd/connections.c:1608
-#: nscd/connections.c:1615
-#, c-format
-msgid "Failed to run nscd as user '%s'"
+#: sysdeps/gnu/errlist.c:1381
+msgid "Is a named type file"
 msgstr ""
 
-#: nscd/connections.c:1581
-#, c-format
-msgid "initial getgrouplist failed"
+#: sysdeps/gnu/errlist.c:1389
+msgid "Remote I/O error"
 msgstr ""
 
-#: nscd/connections.c:1590
-#, c-format
-msgid "getgrouplist failed"
+#: sysdeps/gnu/errlist.c:1397
+msgid "No medium found"
 msgstr ""
 
-#: nscd/connections.c:1603
-#, c-format
-msgid "setgroups failed"
+#: sysdeps/gnu/errlist.c:1405
+msgid "Wrong medium type"
 msgstr ""
 
-#: nscd/grpcache.c:370 nscd/hstcache.c:386 nscd/initgrcache.c:382
-#: nscd/pwdcache.c:366
-#, c-format
-msgid "short write in %s: %s"
+#: sysdeps/gnu/errlist.c:1413
+msgid "Required key not available"
 msgstr ""
 
-#: nscd/grpcache.c:413 nscd/initgrcache.c:75
-#, c-format
-msgid "Haven't found \"%s\" in group cache!"
+#: sysdeps/gnu/errlist.c:1421
+msgid "Key has expired"
 msgstr ""
 
-#: nscd/grpcache.c:415 nscd/initgrcache.c:77
-#, c-format
-msgid "Reloading \"%s\" in group cache!"
+#: sysdeps/gnu/errlist.c:1429
+msgid "Key has been revoked"
 msgstr ""
 
-#: nscd/grpcache.c:506
-#, c-format
-msgid "Invalid numeric gid \"%s\"!"
+#: sysdeps/gnu/errlist.c:1437
+msgid "Key was rejected by service"
 msgstr ""
 
-#: nscd/mem.c:389
-#, c-format
-msgid "freed %zu bytes in %s cache"
+#: sysdeps/gnu/errlist.c:1445
+msgid "Owner died"
 msgstr ""
 
-#: nscd/mem.c:509
-#, c-format
-msgid "no more memory for database '%s'"
+#: sysdeps/gnu/errlist.c:1453
+msgid "State not recoverable"
 msgstr ""
 
-#: nscd/nscd.c:100
-msgid "Read configuration data from NAME"
+#: sysdeps/mach/_strerror.c:57 sysdeps/mach/hurd/mips/dl-machine.c:68
+msgid "Error in unknown error system: "
 msgstr ""
 
-#: nscd/nscd.c:102
-msgid "Do not fork and display messages on the current tty"
+#: sysdeps/posix/gai_strerror-strs.h:1
+msgid "Address family for hostname not supported"
 msgstr ""
 
-#: nscd/nscd.c:103
-msgid "NUMBER"
+#: sysdeps/posix/gai_strerror-strs.h:2
+msgid "Temporary failure in name resolution"
 msgstr ""
 
-#: nscd/nscd.c:103
-msgid "Start NUMBER threads"
+#: sysdeps/posix/gai_strerror-strs.h:3
+msgid "Bad value for ai_flags"
 msgstr ""
 
-#: nscd/nscd.c:104
-msgid "Shut the server down"
+#: sysdeps/posix/gai_strerror-strs.h:4
+msgid "Non-recoverable failure in name resolution"
 msgstr ""
 
-#: nscd/nscd.c:105
-msgid "Print current configuration statistic"
+#: sysdeps/posix/gai_strerror-strs.h:5
+msgid "ai_family not supported"
 msgstr ""
 
-#: nscd/nscd.c:106
-msgid "TABLE"
+#: sysdeps/posix/gai_strerror-strs.h:6
+msgid "Memory allocation failure"
 msgstr ""
 
-#: nscd/nscd.c:107
-msgid "Invalidate the specified cache"
+#: sysdeps/posix/gai_strerror-strs.h:7
+msgid "No address associated with hostname"
 msgstr ""
 
-#: nscd/nscd.c:108
-msgid "TABLE,yes"
+#: sysdeps/posix/gai_strerror-strs.h:8
+msgid "Name or service not known"
 msgstr ""
 
-#: nscd/nscd.c:109
-msgid "Use separate cache for each user"
+#: sysdeps/posix/gai_strerror-strs.h:9
+msgid "Servname not supported for ai_socktype"
 msgstr ""
 
-#: nscd/nscd.c:114
-msgid "Name Service Cache Daemon."
+#: sysdeps/posix/gai_strerror-strs.h:10
+msgid "ai_socktype not supported"
 msgstr ""
 
-#: nscd/nscd.c:156
-msgid "cannot read configuration file; this is fatal"
+#: sysdeps/posix/gai_strerror-strs.h:11
+msgid "System error"
 msgstr ""
 
-#: nscd/nscd.c:167
-#, c-format
-msgid "already running"
+#: sysdeps/posix/gai_strerror-strs.h:12
+msgid "Processing request in progress"
 msgstr ""
 
-#: nscd/nscd.c:182 nscd/nscd.c:237
-#, c-format
-msgid "cannot fork"
+#: sysdeps/posix/gai_strerror-strs.h:13
+msgid "Request canceled"
 msgstr ""
 
-#: nscd/nscd.c:251
-msgid "Could not create log file"
+#: sysdeps/posix/gai_strerror-strs.h:14
+msgid "Request not canceled"
 msgstr ""
 
-#: nscd/nscd.c:304 nscd/nscd.c:328 nscd/nscd_stat.c:162
-#, c-format
-msgid "Only root is allowed to use this option!"
+#: sysdeps/posix/gai_strerror-strs.h:15
+msgid "All requests done"
 msgstr ""
 
-#: nscd/nscd.c:378
-#, c-format
-msgid "secure services not implemented anymore"
+#: sysdeps/posix/gai_strerror-strs.h:16
+msgid "Interrupted by a signal"
 msgstr ""
 
-#: nscd/nscd_conf.c:94
-#, c-format
-msgid "Parse error: %s"
+#: sysdeps/posix/gai_strerror-strs.h:17
+msgid "Parameter string not correctly encoded"
 msgstr ""
 
-#: nscd/nscd_conf.c:194
-msgid "Must specify user name for server-user option"
+#: sysdeps/unix/siglist.c:26
+msgid "Signal 0"
 msgstr ""
 
-#: nscd/nscd_conf.c:201
-msgid "Must specify user name for stat-user option"
+#: sysdeps/unix/siglist.c:32
+msgid "IOT trap"
 msgstr ""
 
-#: nscd/nscd_conf.c:251
+#: sysdeps/unix/sysv/linux/i386/readelflib.c:49
 #, c-format
-msgid "invalid value for 'reload-count': %u"
-msgstr ""
-
-#: nscd/nscd_conf.c:266
-msgid "Must specify value for restart-interval option"
+msgid "%s is for unknown machine %d.\n"
 msgstr ""
 
-#: nscd/nscd_conf.c:269
+#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63
 #, c-format
-msgid "Unknown option: %s %s %s"
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
 msgstr ""
 
-#: nscd/nscd_conf.c:282
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, c-format
-msgid "cannot get current working directory: %s; disabling paranoia mode"
+msgid "cannot open `%s'"
 msgstr ""
 
-#: nscd/nscd_stat.c:131
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
-msgid "cannot write statistics: %s"
+msgid "cannot read header from `%s'"
 msgstr ""
 
-#: nscd/nscd_stat.c:158
-#, c-format
-msgid "Only root or %s is allowed to use this option!"
+#: timezone/zdump.c:212
+msgid "lacks alphabetic at start"
 msgstr ""
 
-#: nscd/nscd_stat.c:169
-#, c-format
-msgid "nscd not running!\n"
+#: timezone/zdump.c:214
+msgid "has fewer than 3 alphabetics"
 msgstr ""
 
-#: nscd/nscd_stat.c:180
-#, c-format
-msgid "write incomplete"
+#: timezone/zdump.c:216
+msgid "has more than 6 alphabetics"
 msgstr ""
 
-#: nscd/nscd_stat.c:192
-#, c-format
-msgid "cannot read statistics data"
+#: timezone/zdump.c:224
+msgid "differs from POSIX standard"
 msgstr ""
 
-#: nscd/nscd_stat.c:195
+#: timezone/zdump.c:280
 #, c-format
 msgid ""
-"nscd configuration:\n"
-"\n"
-"%15d  server debug level\n"
-msgstr ""
-
-#: nscd/nscd_stat.c:219
-#, c-format
-msgid "%3ud %2uh %2um %2lus  server runtime\n"
-msgstr ""
-
-#: nscd/nscd_stat.c:222
-#, c-format
-msgid "    %2uh %2um %2lus  server runtime\n"
-msgstr ""
-
-#: nscd/nscd_stat.c:224
-#, c-format
-msgid "        %2um %2lus  server runtime\n"
+"%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:226
+#: timezone/zdump.c:297
 #, c-format
-msgid "            %2lus  server runtime\n"
+msgid "%s: wild -c argument %s\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:228
-#, c-format
-msgid ""
-"%15d  current number of threads\n"
-"%15d  maximum number of threads\n"
-"%15lu  number of times clients had to wait\n"
-"%15s  paranoia mode enabled\n"
-"%15lu  restart internal\n"
+#: timezone/zdump.c:388
+msgid "Error writing standard output"
 msgstr ""
 
-#: nscd/nscd_stat.c:261
+#: timezone/zdump.c:411
 #, c-format
 msgid ""
-"\n"
-"%s cache:\n"
-"\n"
-"%15s  cache is enabled\n"
-"%15s  cache is persistent\n"
-"%15s  cache is shared\n"
-"%15zu  suggested size\n"
-"%15zu  total data pool size\n"
-"%15zu  used data pool size\n"
-"%15lu  seconds time to live for positive entries\n"
-"%15lu  seconds time to live for negative entries\n"
-"%15<PRIuMAX>  cache hits on positive entries\n"
-"%15<PRIuMAX>  cache hits on negative entries\n"
-"%15<PRIuMAX>  cache misses on positive entries\n"
-"%15<PRIuMAX>  cache misses on negative entries\n"
-"%15lu%% cache hit rate\n"
-"%15zu  current number of cached values\n"
-"%15zu  maximum number of cached values\n"
-"%15zu  maximum chain length searched\n"
-"%15<PRIuMAX>  number of delays on rdlock\n"
-"%15<PRIuMAX>  number of delays on wrlock\n"
-"%15<PRIuMAX>  memory allocations failed\n"
-"%15s  check /etc/%s for changes\n"
-msgstr ""
-
-#: nscd/pwdcache.c:409
-#, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr ""
-
-#: nscd/pwdcache.c:411
-#, c-format
-msgid "Reloading \"%s\" in password cache!"
-msgstr ""
-
-#: nscd/pwdcache.c:503
-#, c-format
-msgid "Invalid numeric uid \"%s\"!"
-msgstr ""
-
-#: nscd/selinux.c:105
-msgid "Failed to determine if kernel supports SELinux"
+"%s: use of -v on system with floating time_t other than float or double\n"
 msgstr ""
 
-#: nscd/selinux.c:120
+#: timezone/zic.c:371
 #, c-format
-msgid "Failed to start AVC thread"
+msgid "%s: Memory exhausted: %s\n"
 msgstr ""
 
-#: nscd/selinux.c:142
+#: timezone/zic.c:430
 #, c-format
-msgid "Failed to create AVC lock"
+msgid "\"%s\", line %d: %s"
 msgstr ""
 
-#: nscd/selinux.c:182
+#: timezone/zic.c:433
 #, c-format
-msgid "Failed to start AVC"
-msgstr ""
-
-#: nscd/selinux.c:184
-msgid "Access Vector Cache (AVC) started"
-msgstr ""
-
-#: nscd/selinux.c:202
-msgid "Error getting context of socket peer"
-msgstr ""
-
-#: nscd/selinux.c:207
-msgid "Error getting context of nscd"
+msgid " (rule from \"%s\", line %d)"
 msgstr ""
 
-#: nscd/selinux.c:213
-msgid "Error getting sid from context"
+#: timezone/zic.c:445
+msgid "warning: "
 msgstr ""
 
-#: nscd/selinux.c:245
+#: timezone/zic.c:455
 #, c-format
 msgid ""
-"\n"
-"SELinux AVC Statistics:\n"
-"\n"
-"%15u  entry lookups\n"
-"%15u  entry hits\n"
-"%15u  entry misses\n"
-"%15u  entry discards\n"
-"%15u  CAV lookups\n"
-"%15u  CAV hits\n"
-"%15u  CAV probes\n"
-"%15u  CAV misses\n"
-msgstr ""
-
-#: elf/../sysdeps/generic/dl-sysdep.c:486
-msgid "cannot create capability list"
-msgstr ""
-
-#: elf/../sysdeps/generic/dl-tls.c:785
-msgid "cannot create TLS data structures"
-msgstr ""
-
-#: elf/../sysdeps/generic/readelflib.c:35
-#, c-format
-msgid "file %s is truncated\n"
-msgstr ""
-
-#: elf/../sysdeps/generic/readelflib.c:67
-#, c-format
-msgid "%s is a 32 bit ELF file.\n"
+"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p "
+"posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:69
+#: timezone/zic.c:503
 #, c-format
-msgid "%s is a 64 bit ELF file.\n"
+msgid "%s: More than one -d option specified\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:71
+#: timezone/zic.c:513
 #, c-format
-msgid "Unknown ELFCLASS in file %s.\n"
+msgid "%s: More than one -l option specified\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:78
+#: timezone/zic.c:523
 #, c-format
-msgid "%s is not a shared object file (Type: %d).\n"
+msgid "%s: More than one -p option specified\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:109
+#: timezone/zic.c:533
 #, c-format
-msgid "more than one dynamic segment\n"
+msgid "%s: More than one -y option specified\n"
 msgstr ""
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: timezone/zic.c:543
 #, c-format
-msgid "%s is for unknown machine %d.\n"
+msgid "%s: More than one -L option specified\n"
 msgstr ""
 
-#: elf/cache.c:70
-msgid "unknown"
+#: timezone/zic.c:592
+msgid "link to link"
 msgstr ""
 
-#: elf/cache.c:111
-msgid "Unknown OS"
+#: timezone/zic.c:657
+msgid "hard link failed, symbolic link used"
 msgstr ""
 
-#: elf/cache.c:116
+#: timezone/zic.c:665
 #, c-format
-msgid ", OS ABI: %s %d.%d.%d"
+msgid "%s: Can't link from %s to %s: %s\n"
 msgstr ""
 
-#: elf/cache.c:142 elf/ldconfig.c:1220
-#, c-format
-msgid "Can't open cache file %s\n"
+#: timezone/zic.c:774 timezone/zic.c:776
+msgid "same rule name in multiple files"
 msgstr ""
 
-#: elf/cache.c:154
-#, c-format
-msgid "mmap of cache file failed.\n"
+#: timezone/zic.c:817
+msgid "unruly zone"
 msgstr ""
 
-#: elf/cache.c:158 elf/cache.c:168
+#: timezone/zic.c:824
 #, c-format
-msgid "File is not a cache file.\n"
+msgid "%s in ruleless zone"
 msgstr ""
 
-#: elf/cache.c:201 elf/cache.c:211
-#, c-format
-msgid "%d libs found in cache `%s'\n"
+#: timezone/zic.c:845
+msgid "standard input"
 msgstr ""
 
-#: elf/cache.c:410
+#: timezone/zic.c:850
 #, c-format
-msgid "Can't remove old temporary cache file %s"
+msgid "%s: Can't open %s: %s\n"
 msgstr ""
 
-#: elf/cache.c:417
-#, c-format
-msgid "Can't create temporary cache file %s"
+#: timezone/zic.c:861
+msgid "line too long"
 msgstr ""
 
-#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
-#, c-format
-msgid "Writing of cache data failed"
+#: timezone/zic.c:881
+msgid "input line of unknown type"
 msgstr ""
 
-#: elf/cache.c:442
+#: timezone/zic.c:897
 #, c-format
-msgid "Writing of cache data failed."
+msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 
-#: elf/cache.c:449
+#: timezone/zic.c:904 timezone/zic.c:1325 timezone/zic.c:1350
 #, c-format
-msgid "Changing access rights of %s to %#o failed"
+msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
 
-#: elf/cache.c:454
+#: timezone/zic.c:912
 #, c-format
-msgid "Renaming of %s to %s failed"
-msgstr ""
-
-#: elf/dl-close.c:116
-msgid "shared object not open"
-msgstr ""
-
-#: elf/dl-deps.c:112 elf/dl-open.c:234
-msgid "DST not allowed in SUID/SGID programs"
-msgstr ""
-
-#: elf/dl-deps.c:125
-msgid "empty dynamics string token substitution"
+msgid "%s: Error reading %s\n"
 msgstr ""
 
-#: elf/dl-deps.c:131
+#: timezone/zic.c:919
 #, c-format
-msgid ""
-"cannot load auxiliary `%s' because of empty dynamic string token "
-"substitution\n"
-msgstr ""
-
-#: elf/dl-deps.c:461
-msgid "cannot allocate dependency list"
-msgstr ""
-
-#: elf/dl-deps.c:494 elf/dl-deps.c:549
-msgid "cannot allocate symbol search list"
-msgstr ""
-
-#: elf/dl-deps.c:534
-msgid "Filters not supported with LD_TRACE_PRELINKING"
-msgstr ""
-
-#: elf/dl-error.c:75
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr ""
-
-#: elf/dl-error.c:108
-msgid "error while loading shared libraries"
-msgstr ""
-
-#: elf/dl-load.c:363
-msgid "cannot allocate name record"
-msgstr ""
-
-#: elf/dl-load.c:465 elf/dl-load.c:544 elf/dl-load.c:664 elf/dl-load.c:759
-msgid "cannot create cache for search path"
-msgstr ""
-
-#: elf/dl-load.c:567
-msgid "cannot create RUNPATH/RPATH copy"
-msgstr ""
-
-#: elf/dl-load.c:650
-msgid "cannot create search path array"
-msgstr ""
-
-#: elf/dl-load.c:836
-msgid "cannot stat shared object"
-msgstr ""
-
-#: elf/dl-load.c:911
-msgid "cannot open zero fill device"
-msgstr ""
-
-#: elf/dl-load.c:956 elf/dl-load.c:2144
-msgid "cannot create shared object descriptor"
-msgstr ""
-
-#: elf/dl-load.c:975 elf/dl-load.c:1620 elf/dl-load.c:1703
-msgid "cannot read file data"
-msgstr ""
-
-#: elf/dl-load.c:1019
-msgid "ELF load command alignment not page-aligned"
-msgstr ""
-
-#: elf/dl-load.c:1026
-msgid "ELF load command address/offset not properly aligned"
-msgstr ""
-
-#: elf/dl-load.c:1110
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr ""
-
-#: elf/dl-load.c:1134
-msgid "cannot handle TLS data"
-msgstr ""
-
-#: elf/dl-load.c:1153
-msgid "object file has no loadable segments"
-msgstr ""
-
-#: elf/dl-load.c:1189
-msgid "failed to map segment from shared object"
-msgstr ""
-
-#: elf/dl-load.c:1213
-msgid "cannot dynamically load executable"
-msgstr ""
-
-#: elf/dl-load.c:1274
-msgid "cannot change memory protections"
-msgstr ""
-
-#: elf/dl-load.c:1293
-msgid "cannot map zero-fill pages"
-msgstr ""
-
-#: elf/dl-load.c:1307
-msgid "object file has no dynamic section"
-msgstr ""
-
-#: elf/dl-load.c:1330
-msgid "shared object cannot be dlopen()ed"
-msgstr ""
-
-#: elf/dl-load.c:1343
-msgid "cannot allocate memory for program header"
-msgstr ""
-
-#: elf/dl-load.c:1385
-msgid "cannot enable executable stack as shared object requires"
-msgstr ""
-
-#: elf/dl-load.c:1400
-msgid "cannot close file descriptor"
-msgstr ""
-
-#: elf/dl-load.c:1442
-msgid "cannot create searchlist"
-msgstr ""
-
-#: elf/dl-load.c:1620
-msgid "file too short"
-msgstr ""
-
-#: elf/dl-load.c:1643
-msgid "invalid ELF header"
-msgstr ""
-
-#: elf/dl-load.c:1652
-msgid "ELF file data encoding not big-endian"
-msgstr ""
-
-#: elf/dl-load.c:1654
-msgid "ELF file data encoding not little-endian"
-msgstr ""
-
-#: elf/dl-load.c:1658
-msgid "ELF file version ident does not match current one"
-msgstr ""
-
-#: elf/dl-load.c:1662
-msgid "ELF file OS ABI invalid"
-msgstr ""
-
-#: elf/dl-load.c:1664
-msgid "ELF file ABI version invalid"
-msgstr ""
-
-#: elf/dl-load.c:1667
-msgid "internal error"
-msgstr ""
-
-#: elf/dl-load.c:1674
-msgid "ELF file version does not match current one"
-msgstr ""
-
-#: elf/dl-load.c:1682
-msgid "only ET_DYN and ET_EXEC can be loaded"
-msgstr ""
-
-#: elf/dl-load.c:1688
-msgid "ELF file's phentsize not the expected size"
-msgstr ""
-
-#: elf/dl-load.c:2158
-msgid "cannot open shared object file"
-msgstr ""
-
-#: elf/dl-lookup.c:249
-msgid "relocation error"
-msgstr ""
-
-#: elf/dl-lookup.c:277
-msgid "symbol lookup error"
-msgstr ""
-
-#: elf/dl-open.c:118
-msgid "cannot extend global scope"
-msgstr ""
-
-#: elf/dl-open.c:180
-msgid "invalid caller"
-msgstr ""
-
-#: elf/dl-open.c:250
-msgid "empty dynamic string token substitution"
-msgstr ""
-
-#: elf/dl-open.c:416 elf/dl-open.c:427
-msgid "cannot create scope list"
-msgstr ""
-
-#: elf/dl-open.c:471
-msgid "TLS generation counter wrapped!  Please report this."
+msgid "%s: Error closing %s: %s\n"
 msgstr ""
 
-#: elf/dl-open.c:514
-msgid "invalid mode for dlopen()"
+#: timezone/zic.c:924
+msgid "expected continuation line not found"
 msgstr ""
 
-#: elf/dl-open.c:531
-msgid "no more namespaces available for dlmopen()"
+#: timezone/zic.c:968
+msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr ""
 
-#: elf/dl-open.c:544
-msgid "invalid target namespace in dlmopen()"
+#: timezone/zic.c:982
+msgid "wrong number of fields on Rule line"
 msgstr ""
 
-#: elf/dl-reloc.c:55
-msgid "cannot allocate memory in static TLS block"
+#: timezone/zic.c:986
+msgid "nameless rule"
 msgstr ""
 
-#: elf/dl-reloc.c:195
-msgid "cannot make segment writable for relocation"
+#: timezone/zic.c:991
+msgid "invalid saved time"
 msgstr ""
 
-#: elf/dl-reloc.c:275
-#, c-format
-msgid "%s: no PLTREL found in object %s\n"
+#: timezone/zic.c:1010
+msgid "wrong number of fields on Zone line"
 msgstr ""
 
-#: elf/dl-reloc.c:286
+#: timezone/zic.c:1016
 #, c-format
-msgid "%s: out of memory to store relocation results for %s\n"
-msgstr ""
-
-#: elf/dl-reloc.c:301
-msgid "cannot restore segment prot after reloc"
-msgstr ""
-
-#: elf/dl-reloc.c:326
-msgid "cannot apply additional memory protection after relocation"
-msgstr ""
-
-#: elf/dl-sym.c:98
-msgid "RTLD_NEXT used in code not dynamically loaded"
-msgstr ""
-
-#: elf/dl-version.c:303
-msgid "cannot allocate version reference table"
-msgstr ""
-
-#: elf/ldconfig.c:135
-msgid "Print cache"
-msgstr ""
-
-#: elf/ldconfig.c:136
-msgid "Generate verbose messages"
-msgstr ""
-
-#: elf/ldconfig.c:137
-msgid "Don't build cache"
-msgstr ""
-
-#: elf/ldconfig.c:138
-msgid "Don't generate links"
-msgstr ""
-
-#: elf/ldconfig.c:139
-msgid "Change to and use ROOT as root directory"
-msgstr ""
-
-#: elf/ldconfig.c:139
-msgid "ROOT"
-msgstr ""
-
-#: elf/ldconfig.c:140
-msgid "CACHE"
-msgstr ""
-
-#: elf/ldconfig.c:140
-msgid "Use CACHE as cache file"
-msgstr ""
-
-#: elf/ldconfig.c:141
-msgid "CONF"
-msgstr ""
-
-#: elf/ldconfig.c:141
-msgid "Use CONF as configuration file"
-msgstr ""
-
-#: elf/ldconfig.c:142
-msgid ""
-"Only process directories specified on the command line.  Don't build cache."
-msgstr ""
-
-#: elf/ldconfig.c:143
-msgid "Manually link individual libraries."
-msgstr ""
-
-#: elf/ldconfig.c:144
-msgid "FORMAT"
-msgstr ""
-
-#: elf/ldconfig.c:144
-msgid "Format to use: new, old or compat (default)"
-msgstr ""
-
-#: elf/ldconfig.c:152
-msgid "Configure Dynamic Linker Run Time Bindings."
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr ""
 
-#: elf/ldconfig.c:310
+#: timezone/zic.c:1024
 #, c-format
-msgid "Path `%s' given more than once"
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr ""
 
-#: elf/ldconfig.c:350
+#: timezone/zic.c:1036
 #, c-format
-msgid "%s is not a known library type"
+msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr ""
 
-#: elf/ldconfig.c:375
-#, c-format
-msgid "Can't stat %s"
+#: timezone/zic.c:1052
+msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
-#: elf/ldconfig.c:449
-#, c-format
-msgid "Can't stat %s\n"
+#: timezone/zic.c:1092
+msgid "invalid UTC offset"
 msgstr ""
 
-#: elf/ldconfig.c:459
-#, c-format
-msgid "%s is not a symbolic link\n"
+#: timezone/zic.c:1095
+msgid "invalid abbreviation format"
 msgstr ""
 
-#: elf/ldconfig.c:478
-#, c-format
-msgid "Can't unlink %s"
+#: timezone/zic.c:1122
+msgid "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 
-#: elf/ldconfig.c:484
-#, c-format
-msgid "Can't link %s to %s"
+#: timezone/zic.c:1150
+msgid "wrong number of fields on Leap line"
 msgstr ""
 
-#: elf/ldconfig.c:490
-msgid " (changed)\n"
+#: timezone/zic.c:1159
+msgid "invalid leaping year"
 msgstr ""
 
-#: elf/ldconfig.c:492
-msgid " (SKIPPED)\n"
+#: timezone/zic.c:1174 timezone/zic.c:1280
+msgid "invalid month name"
 msgstr ""
 
-#: elf/ldconfig.c:547
-#, c-format
-msgid "Can't find %s"
+#: timezone/zic.c:1187 timezone/zic.c:1402 timezone/zic.c:1416
+msgid "invalid day of month"
 msgstr ""
 
-#: elf/ldconfig.c:563
-#, c-format
-msgid "Can't lstat %s"
+#: timezone/zic.c:1192
+msgid "time before zero"
 msgstr ""
 
-#: elf/ldconfig.c:570
-#, c-format
-msgid "Ignored file %s since it is not a regular file."
+#: timezone/zic.c:1196
+msgid "time too small"
 msgstr ""
 
-#: elf/ldconfig.c:578
-#, c-format
-msgid "No link created since soname could not be found for %s"
+#: timezone/zic.c:1200
+msgid "time too large"
 msgstr ""
 
-#: elf/ldconfig.c:669
-#, c-format
-msgid "Can't open directory %s"
+#: timezone/zic.c:1204 timezone/zic.c:1309
+msgid "invalid time of day"
 msgstr ""
 
-#: elf/ldconfig.c:724 elf/ldconfig.c:771
-#, c-format
-msgid "Cannot lstat %s"
+#: timezone/zic.c:1223
+msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: elf/ldconfig.c:736
-#, c-format
-msgid "Cannot stat %s"
+#: timezone/zic.c:1228
+msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
-#: elf/ldconfig.c:793 elf/readlib.c:92
-#, c-format
-msgid "Input file %s not found.\n"
+#: timezone/zic.c:1244
+msgid "wrong number of fields on Link line"
 msgstr ""
 
-#: elf/ldconfig.c:844
-#, c-format
-msgid "libc5 library %s in wrong directory"
+#: timezone/zic.c:1248
+msgid "blank FROM field on Link line"
 msgstr ""
 
-#: elf/ldconfig.c:847
-#, c-format
-msgid "libc6 library %s in wrong directory"
+#: timezone/zic.c:1252
+msgid "blank TO field on Link line"
 msgstr ""
 
-#: elf/ldconfig.c:850
-#, c-format
-msgid "libc4 library %s in wrong directory"
+#: timezone/zic.c:1329
+msgid "invalid starting year"
 msgstr ""
 
-#: elf/ldconfig.c:877
-#, c-format
-msgid ""
-"libraries %s and %s in directory %s have same soname but different type."
+#: timezone/zic.c:1333
+msgid "starting year too low to be represented"
 msgstr ""
 
-#: elf/ldconfig.c:984
-#, c-format
-msgid "Can't open configuration file %s"
+#: timezone/zic.c:1335
+msgid "starting year too high to be represented"
 msgstr ""
 
-#: elf/ldconfig.c:1048
-#, c-format
-msgid "%s:%u: bad syntax in hwcap line"
+#: timezone/zic.c:1354
+msgid "invalid ending year"
 msgstr ""
 
-#: elf/ldconfig.c:1054
-#, c-format
-msgid "%s:%u: hwcap index %lu above maximum %u"
+#: timezone/zic.c:1358
+msgid "ending year too low to be represented"
 msgstr ""
 
-#: elf/ldconfig.c:1061 elf/ldconfig.c:1069
-#, c-format
-msgid "%s:%u: hwcap index %lu already defined as %s"
+#: timezone/zic.c:1360
+msgid "ending year too high to be represented"
 msgstr ""
 
-#: elf/ldconfig.c:1072
-#, c-format
-msgid "%s:%u: duplicate hwcap %lu %s"
+#: timezone/zic.c:1363
+msgid "starting year greater than ending year"
 msgstr ""
 
-#: elf/ldconfig.c:1094
-#, c-format
-msgid "need absolute file name for configuration file when using -r"
+#: timezone/zic.c:1370
+msgid "typed single year"
 msgstr ""
 
-#: elf/ldconfig.c:1131
-#, c-format
-msgid "%s:%u: cannot read directory %s"
+#: timezone/zic.c:1407
+msgid "invalid weekday name"
 msgstr ""
 
-#: elf/ldconfig.c:1171
+#: timezone/zic.c:1521
 #, c-format
-msgid "relative path `%s' used to build cache"
+msgid "%s: Can't remove %s: %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:1199
+#: timezone/zic.c:1531
 #, c-format
-msgid "Can't chdir to /"
+msgid "%s: Can't create %s: %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:1241
+#: timezone/zic.c:1598
 #, c-format
-msgid "Can't open cache file directory %s\n"
-msgstr ""
-
-#: elf/ldd.bash.in:43
-msgid "Written by %s and %s.\n"
-msgstr ""
-
-#: elf/ldd.bash.in:48
-msgid ""
-"Usage: ldd [OPTION]... FILE...\n"
-"      --help              print this help and exit\n"
-"      --version           print version information and exit\n"
-"  -d, --data-relocs       process data relocations\n"
-"  -r, --function-relocs   process data and function relocations\n"
-"  -u, --unused            print unused direct dependencies\n"
-"  -v, --verbose           print all information\n"
-"For bug reporting instructions, please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>."
-msgstr ""
-
-#: elf/ldd.bash.in:80
-msgid "ldd: option `$1' is ambiguous"
-msgstr ""
-
-#: elf/ldd.bash.in:87
-msgid "unrecognized option"
-msgstr ""
-
-#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
-msgid "Try `ldd --help' for more information."
+msgid "%s: Error writing %s\n"
 msgstr ""
 
-#: elf/ldd.bash.in:125
-msgid "missing file arguments"
+#: timezone/zic.c:1789
+msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
-#: elf/ldd.bash.in:151
-msgid "warning: you do not have execution permission for"
+#: timezone/zic.c:1832
+msgid "too many transitions?!"
 msgstr ""
 
-#: elf/ldd.bash.in:185
-msgid "\tnot a dynamic executable"
+#: timezone/zic.c:1851
+msgid "internal error - addtype called with bad isdst"
 msgstr ""
 
-#: elf/ldd.bash.in:193
-msgid "exited with unknown exit code"
+#: timezone/zic.c:1855
+msgid "internal error - addtype called with bad ttisstd"
 msgstr ""
 
-#: elf/ldd.bash.in:198
-msgid "error: you do not have read permission for"
+#: timezone/zic.c:1859
+msgid "internal error - addtype called with bad ttisgmt"
 msgstr ""
 
-#: elf/readlib.c:98
-#, c-format
-msgid "Cannot fstat file %s.\n"
+#: timezone/zic.c:1878
+msgid "too many local time types"
 msgstr ""
 
-#: elf/readlib.c:109
-#, c-format
-msgid "File %s is empty, not checked."
+#: timezone/zic.c:1906
+msgid "too many leap seconds"
 msgstr ""
 
-#: elf/readlib.c:115
-#, c-format
-msgid "File %s is too small, not checked."
+#: timezone/zic.c:1912
+msgid "repeated leap second moment"
 msgstr ""
 
-#: elf/readlib.c:125
-#, c-format
-msgid "Cannot mmap file %s.\n"
+#: timezone/zic.c:1964
+msgid "Wild result from command execution"
 msgstr ""
 
-#: elf/readlib.c:163
+#: timezone/zic.c:1965
 #, c-format
-msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
-msgstr ""
-
-#: elf/sprof.c:77
-msgid "Output selection:"
+msgid "%s: command was '%s', result was %d\n"
 msgstr ""
 
-#: elf/sprof.c:79
-msgid "print list of count paths and their number of use"
+#: timezone/zic.c:2061
+msgid "Odd number of quotation marks"
 msgstr ""
 
-#: elf/sprof.c:81
-msgid "generate flat profile with counts and ticks"
+#: timezone/zic.c:2082 timezone/zic.c:2101
+msgid "time overflow"
 msgstr ""
 
-#: elf/sprof.c:82
-msgid "generate call graph"
+#: timezone/zic.c:2148
+msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: elf/sprof.c:89
+#: timezone/zic.c:2183
 msgid ""
-"Read and display shared object profiling data.\013For bug reporting "
-"instructions, please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>.\n"
-msgstr ""
-
-#: elf/sprof.c:94
-msgid "SHOBJ [PROFDATA]"
-msgstr ""
-
-#: elf/sprof.c:400
-#, c-format
-msgid "failed to load shared object `%s'"
-msgstr ""
-
-#: elf/sprof.c:409
-#, c-format
-msgid "cannot create internal descriptors"
-msgstr ""
-
-#: elf/sprof.c:528
-#, c-format
-msgid "Reopening shared object `%s' failed"
-msgstr ""
-
-#: elf/sprof.c:535 elf/sprof.c:629
-#, c-format
-msgid "reading of section headers failed"
-msgstr ""
-
-#: elf/sprof.c:543 elf/sprof.c:637
-#, c-format
-msgid "reading of section header string table failed"
-msgstr ""
-
-#: elf/sprof.c:569
-#, c-format
-msgid "*** Cannot read debuginfo file name: %m\n"
-msgstr ""
-
-#: elf/sprof.c:589
-#, c-format
-msgid "cannot determine file name"
-msgstr ""
-
-#: elf/sprof.c:622
-#, c-format
-msgid "reading of ELF header failed"
-msgstr ""
-
-#: elf/sprof.c:658
-#, c-format
-msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
-msgstr ""
-
-#: elf/sprof.c:688
-#, c-format
-msgid "failed to load symbol data"
+"rule goes past start/end of month--will not work with pre-2004 versions of "
+"zic"
 msgstr ""
 
-#: elf/sprof.c:755
-#, c-format
-msgid "cannot load profiling data"
+#: timezone/zic.c:2216
+msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 
-#: elf/sprof.c:764
-#, c-format
-msgid "while stat'ing profiling data file"
+#: timezone/zic.c:2218
+msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr ""
 
-#: elf/sprof.c:772
-#, c-format
-msgid "profiling data file `%s' does not match shared object `%s'"
-msgstr ""
-
-#: elf/sprof.c:783
-#, c-format
-msgid "failed to mmap the profiling data file"
+#: timezone/zic.c:2220
+msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 
-#: elf/sprof.c:791
-#, c-format
-msgid "error while closing the profiling data file"
+#: timezone/zic.c:2228
+msgid "time zone abbreviation differs from POSIX standard"
 msgstr ""
 
-#: elf/sprof.c:800 elf/sprof.c:870
-#, c-format
-msgid "cannot create internal descriptor"
+#: timezone/zic.c:2240
+msgid "too many, or too long, time zone abbreviations"
 msgstr ""
 
-#: elf/sprof.c:846
+#: timezone/zic.c:2281
 #, c-format
-msgid "`%s' is no correct profile data file for `%s'"
+msgid "%s: Can't create directory %s: %s\n"
 msgstr ""
 
-#: elf/sprof.c:1027 elf/sprof.c:1085
+#: timezone/zic.c:2303
 #, c-format
-msgid "cannot allocate symbol data"
+msgid "%s: %d did not sign extend correctly\n"
 msgstr ""
diff --git a/posix/Makefile b/posix/Makefile
index 90ce45d900..a0c7b94b02 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -65,7 +65,8 @@ routines :=								      \
 	spawnattr_getpgroup spawnattr_setpgroup spawn spawnp spawni	      \
 	spawnattr_getsigmask spawnattr_getschedpolicy spawnattr_getschedparam \
 	spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam \
-	posix_madvise
+	posix_madvise							      \
+	get_child_max
 
 include ../Makeconfig
 
diff --git a/posix/get_child_max.c b/posix/get_child_max.c
new file mode 100644
index 0000000000..dd68d91d32
--- /dev/null
+++ b/posix/get_child_max.c
@@ -0,0 +1,29 @@
+/* Get POSIX {CHILD_MAX} run-time limit value.  Stub version (no limit).
+   Copyright (C) 2006 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <limits.h>
+#include <sys/sysinfo.h>
+
+#ifndef CHILD_MAX
+long int
+__get_child_max (void)
+{
+  return -1;
+}
+#endif
diff --git a/scripts/check-c++-types.sh b/scripts/check-c++-types.sh
index f0ea0b5a84..b207f12ba4 100755
--- a/scripts/check-c++-types.sh
+++ b/scripts/check-c++-types.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006 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,8 +75,17 @@ nlink_t
 off64_t
 off_t
 pid_t
+pthread_attr_t
+pthread_barrier_t
+pthread_barrierattr_t
+pthread_cond_t
+pthread_condattr_t
 pthread_key_t
+pthread_mutex_t
+pthread_mutexattr_t
 pthread_once_t
+pthread_rwlock_t
+pthread_rwlockattr_t
 pthread_spinlock_t
 pthread_t
 quad_t
diff --git a/scripts/data/c++-types-alpha-linux-gnu.data b/scripts/data/c++-types-alpha-linux-gnu.data
index 0630f9a0d3..f264ed84ba 100644
--- a/scripts/data/c++-types-alpha-linux-gnu.data
+++ b/scripts/data/c++-types-alpha-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:j
 off64_t:l
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:l
diff --git a/scripts/data/c++-types-i386-linux-gnu.data b/scripts/data/c++-types-i386-linux-gnu.data
index aa3666cab1..fde53bf337 100644
--- a/scripts/data/c++-types-i386-linux-gnu.data
+++ b/scripts/data/c++-types-i386-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:j
 off64_t:x
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:x
diff --git a/scripts/data/c++-types-ia64-linux-gnu.data b/scripts/data/c++-types-ia64-linux-gnu.data
index 9072e891f2..23c11dc41b 100644
--- a/scripts/data/c++-types-ia64-linux-gnu.data
+++ b/scripts/data/c++-types-ia64-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:m
 off64_t:l
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:l
diff --git a/scripts/data/c++-types-powerpc-linux-gnu.data b/scripts/data/c++-types-powerpc-linux-gnu.data
index aa3666cab1..fde53bf337 100644
--- a/scripts/data/c++-types-powerpc-linux-gnu.data
+++ b/scripts/data/c++-types-powerpc-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:j
 off64_t:x
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:x
diff --git a/scripts/data/c++-types-powerpc64-linux-gnu.data b/scripts/data/c++-types-powerpc64-linux-gnu.data
index 9072e891f2..23c11dc41b 100644
--- a/scripts/data/c++-types-powerpc64-linux-gnu.data
+++ b/scripts/data/c++-types-powerpc64-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:m
 off64_t:l
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:l
diff --git a/scripts/data/c++-types-s390-linux-gnu.data b/scripts/data/c++-types-s390-linux-gnu.data
index 17647ef5ee..6e2036ec01 100644
--- a/scripts/data/c++-types-s390-linux-gnu.data
+++ b/scripts/data/c++-types-s390-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:j
 off64_t:x
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:x
diff --git a/scripts/data/c++-types-s390x-linux-gnu.data b/scripts/data/c++-types-s390x-linux-gnu.data
index 9072e891f2..23c11dc41b 100644
--- a/scripts/data/c++-types-s390x-linux-gnu.data
+++ b/scripts/data/c++-types-s390x-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:m
 off64_t:l
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:l
diff --git a/scripts/data/c++-types-sparc-linux-gnu.data b/scripts/data/c++-types-sparc-linux-gnu.data
new file mode 100644
index 0000000000..b3c19d9c61
--- /dev/null
+++ b/scripts/data/c++-types-sparc-linux-gnu.data
@@ -0,0 +1,67 @@
+blkcnt64_t:x
+blkcnt_t:l
+blksize_t:l
+caddr_t:Pc
+clockid_t:i
+clock_t:l
+daddr_t:i
+dev_t:y
+fd_mask:l
+fsblkcnt64_t:y
+fsblkcnt_t:m
+fsfilcnt64_t:y
+fsfilcnt_t:m
+fsid_t:8__fsid_t
+gid_t:j
+id_t:j
+ino64_t:y
+ino_t:m
+int16_t:s
+int32_t:i
+int64_t:x
+int8_t:a
+intptr_t:i
+key_t:i
+loff_t:x
+mode_t:j
+nlink_t:j
+off64_t:x
+off_t:l
+pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
+pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
+pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
+pthread_spinlock_t:i
+pthread_t:m
+quad_t:x
+register_t:i
+rlim64_t:y
+rlim_t:m
+sigset_t:10__sigset_t
+size_t:j
+socklen_t:j
+ssize_t:i
+suseconds_t:i
+time_t:l
+u_char:h
+uid_t:j
+uint:j
+u_int:j
+u_int16_t:t
+u_int32_t:j
+u_int64_t:y
+u_int8_t:h
+ulong:m
+u_long:m
+u_quad_t:y
+useconds_t:j
+ushort:t
+u_short:t
diff --git a/scripts/data/c++-types-sparc64-linux-gnu.data b/scripts/data/c++-types-sparc64-linux-gnu.data
new file mode 100644
index 0000000000..5a04f4939a
--- /dev/null
+++ b/scripts/data/c++-types-sparc64-linux-gnu.data
@@ -0,0 +1,67 @@
+blkcnt64_t:l
+blkcnt_t:l
+blksize_t:l
+caddr_t:Pc
+clockid_t:i
+clock_t:l
+daddr_t:i
+dev_t:m
+fd_mask:l
+fsblkcnt64_t:m
+fsblkcnt_t:m
+fsfilcnt64_t:m
+fsfilcnt_t:m
+fsid_t:8__fsid_t
+gid_t:j
+id_t:j
+ino64_t:m
+ino_t:m
+int16_t:s
+int32_t:i
+int64_t:l
+int8_t:a
+intptr_t:l
+key_t:i
+loff_t:l
+mode_t:j
+nlink_t:j
+off64_t:l
+off_t:l
+pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
+pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
+pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
+pthread_spinlock_t:i
+pthread_t:m
+quad_t:l
+register_t:l
+rlim64_t:m
+rlim_t:m
+sigset_t:10__sigset_t
+size_t:m
+socklen_t:j
+ssize_t:l
+suseconds_t:i
+time_t:l
+u_char:h
+uid_t:j
+uint:j
+u_int:j
+u_int16_t:t
+u_int32_t:j
+u_int64_t:m
+u_int8_t:h
+ulong:m
+u_long:m
+u_quad_t:m
+useconds_t:j
+ushort:t
+u_short:t
diff --git a/scripts/data/c++-types-x86_64-linux-gnu.data b/scripts/data/c++-types-x86_64-linux-gnu.data
index 9072e891f2..23c11dc41b 100644
--- a/scripts/data/c++-types-x86_64-linux-gnu.data
+++ b/scripts/data/c++-types-x86_64-linux-gnu.data
@@ -28,8 +28,17 @@ nlink_t:m
 off64_t:l
 off_t:l
 pid_t:i
+pthread_attr_t:14pthread_attr_t
+pthread_barrier_t:17pthread_barrier_t
+pthread_barrierattr_t:21pthread_barrierattr_t
+pthread_cond_t:14pthread_cond_t
+pthread_condattr_t:18pthread_condattr_t
 pthread_key_t:j
+pthread_mutex_t:15pthread_mutex_t
+pthread_mutexattr_t:19pthread_mutexattr_t
 pthread_once_t:i
+pthread_rwlock_t:16pthread_rwlock_t
+pthread_rwlockattr_t:20pthread_rwlockattr_t
 pthread_spinlock_t:i
 pthread_t:m
 quad_t:l
diff --git a/scripts/list-sources.sh b/scripts/list-sources.sh
new file mode 100755
index 0000000000..41c8b9eadd
--- /dev/null
+++ b/scripts/list-sources.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# List all the files under version control in the source tree.
+#
+
+case $# in
+0) ;;
+1) cd "$1" ;;
+*) echo >&2 "Usage: $0 [top_srcdir]"; exit 2 ;;
+esac
+
+if [ -r CVS/Entries ]; then
+
+  ${CVS:-cvs} status 2>&1 | ${AWK:-awk} '
+NF >= 2 && $(NF - 1) == "Examining" { dir = $NF }
+$1 == "File:" { print (dir == ".") ? $2 : (dir "/" $2) }'
+  exit $?
+
+elif [ -r .svn/entries ]; then
+
+  ${SVN:-svn} ls -R | sed '/\/$/d'
+  exit $?
+
+elif [ -r MT/options ]; then
+
+  exec ${MONOTONE:-monotone} list known
+
+elif [ -r .git/HEAD ]; then
+
+  exec ${GIT:-git} ls-files
+
+fi
+
+echo >&2 'Cannot list sources without some version control system in use.'
+exit 1
diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c
index c55b97060c..2f21fc6365 100644
--- a/stdio-common/printf-parsemb.c
+++ b/stdio-common/printf-parsemb.c
@@ -1,5 +1,5 @@
 /* Helper functions for parsing printf format strings.
-   Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of th GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -64,7 +64,8 @@ __find_specmb (const UCHAR_T *format, mbstate_t *ps)
 
       /* Remove any hints of a wrong encoding.  */
       ps->__count = 0;
-      if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0)
+      if (! isascii (*format)
+	  && (len = __mbrlen ((const CHAR_T *) format, MB_CUR_MAX, ps)) > 0)
 	format += len;
       else
 	++format;
diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c
index bcb136e8c1..81beddddef 100644
--- a/stdio-common/tst-fmemopen2.c
+++ b/stdio-common/tst-fmemopen2.c
@@ -28,7 +28,7 @@ do_test (void)
   o = ftello (fp);
   if (o != 0)
     {
-      printf ("second ftello returned %ld, expected %zu\n", o, 0);
+      printf ("second ftello returned %ld, expected %zu\n", o, (off_t) 0);
       result = 1;
     }
   if (fseeko (fp, 0, SEEK_END) != 0)
diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c
index e89487cb45..db038fa2b0 100644
--- a/stdio-common/tstdiomisc.c
+++ b/stdio-common/tstdiomisc.c
@@ -46,15 +46,8 @@ t2 (void)
   return result;
 }
 
-#if FLT_EVAL_METHOD == 2
-volatile long double dbl_max = LDBL_MAX;
-# define FLT_FLT_FMT "%Lf %LF"
-# define FLT_FLT_WFMT L"%Lf %LF"
-#else
-# define dbl_max DBL_MAX
-# define FLT_FLT_FMT "%f %F"
-# define FLT_FLT_WFMT L"%f %F"
-#endif
+volatile double nanval;
+
 
 static int
 F (void)
@@ -63,9 +56,9 @@ F (void)
   wchar_t wbuf[10];
   int result;
 
-  snprintf (buf, sizeof buf, FLT_FLT_FMT,
-	    dbl_max * dbl_max - dbl_max * dbl_max,
-	    dbl_max * dbl_max - dbl_max * dbl_max);
+  nanval = NAN;
+
+  snprintf (buf, sizeof buf, "%f %F", nanval, nanval);
   result = strcmp (buf, "nan NAN") != 0;
   printf ("expected \"nan NAN\", got \"%s\"\n", buf);
 
@@ -73,9 +66,7 @@ F (void)
   result |= strcmp (buf, "inf INF") != 0;
   printf ("expected \"inf INF\", got \"%s\"\n", buf);
 
-  swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), FLT_FLT_WFMT,
-	    dbl_max * dbl_max - dbl_max * dbl_max,
-	    dbl_max * dbl_max - dbl_max * dbl_max);
+  swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%f %F", nanval, nanval);
   result |= wcscmp (wbuf, L"nan NAN") != 0;
   printf ("expected L\"nan NAN\", got L\"%S\"\n", wbuf);
 
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
deleted file mode 100644
index 7cf49111e4..0000000000
--- a/sysdeps/alpha/Dist
+++ /dev/null
@@ -1,11 +0,0 @@
-divrem.h
-divl.S
-divq.S
-reml.S
-remq.S
-_mcount.S
-stxcpy.S
-stxncpy.S
-fpu/fenv_libc.h
-alphaev6/stxncpy.S
-alphaev6/stxcpy.S
diff --git a/sysdeps/alpha/soft-fp/Dist b/sysdeps/alpha/soft-fp/Dist
deleted file mode 100644
index 3d75ee78b5..0000000000
--- a/sysdeps/alpha/soft-fp/Dist
+++ /dev/null
@@ -1,14 +0,0 @@
-local-soft-fp.h
-ots_add.c
-ots_cmp.c
-ots_cmpe.c
-ots_cvtqux.c
-ots_cvtqx.c
-ots_cvttx.c
-ots_cvtxq.c
-ots_cvtxt.c
-ots_div.c
-ots_mul.c
-ots_nintxq.c
-ots_sub.c
-sfp-machine.h
diff --git a/sysdeps/generic/Dist b/sysdeps/generic/Dist
deleted file mode 100644
index e93e7b30b1..0000000000
--- a/sysdeps/generic/Dist
+++ /dev/null
@@ -1,23 +0,0 @@
-dl-brk.c
-dl-sbrk.c
-entry.h
-errno-loc.c
-getresgid.c
-getresuid.c
-endutxent.c
-getutxent.c
-getutxid.c
-getutxline.c
-pututxline.c
-setutxent.c
-updwtmpx.c
-utmpxname.c
-bits/libc-tsd.h
-siglist.h
-bp-semctl.h
-bp-checks.h
-bp-thunks.h
-bp-sym.h
-bp-start.h
-bits/link.h
-sysdep-cancel.h
diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h
index 58c79281ed..15d951c777 100644
--- a/sysdeps/generic/sysdep.h
+++ b/sysdeps/generic/sysdep.h
@@ -60,6 +60,7 @@
 #  define cfi_register(r1, r2)		.cfi_register r1, r2
 #  define cfi_return_column(reg)	.cfi_return_column reg
 #  define cfi_restore(reg)		.cfi_restore reg
+#  define cfi_same_value(reg)		.cfi_same_value reg
 #  define cfi_undefined(reg)		.cfi_undefined reg
 #  define cfi_remember_state		.cfi_remember_state
 #  define cfi_restore_state		.cfi_restore_state
@@ -76,6 +77,7 @@
 #  define cfi_register(r1, r2)
 #  define cfi_return_column(reg)
 #  define cfi_restore(reg)
+#  define cfi_same_value(reg)
 #  define cfi_undefined(reg)
 #  define cfi_remember_state
 #  define cfi_restore_state
diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
deleted file mode 100644
index 526c79b838..0000000000
--- a/sysdeps/gnu/Dist
+++ /dev/null
@@ -1,8 +0,0 @@
-errlist.awk
-errlist-compat.awk
-utmpx.h
-bits/utmpx.h
-netinet/tcp.h
-netinet/udp.h
-netinet/ip_icmp.h
-sys/mtio.h
diff --git a/sysdeps/hppa/Dist b/sysdeps/hppa/Dist
deleted file mode 100644
index 5a0df47c68..0000000000
--- a/sysdeps/hppa/Dist
+++ /dev/null
@@ -1,5 +0,0 @@
-libgcc-compat.c
-dl-symaddr.c
-dl-fptr.c
-bits/link.h
-elf/entry.h
diff --git a/sysdeps/i386/Dist b/sysdeps/i386/Dist
deleted file mode 100644
index 34cc8b0fdc..0000000000
--- a/sysdeps/i386/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-i386-mcount.S
-machine-gmon.h
-bp-asm.h
-bits/link.h
diff --git a/sysdeps/i386/i686/Dist b/sysdeps/i386/i686/Dist
deleted file mode 100644
index dbf11d5009..0000000000
--- a/sysdeps/i386/i686/Dist
+++ /dev/null
@@ -1 +0,0 @@
-hp-timing.c
diff --git a/sysdeps/i386/soft-fp/Dist b/sysdeps/i386/soft-fp/Dist
deleted file mode 100644
index 7e9914fe58..0000000000
--- a/sysdeps/i386/soft-fp/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sfp-machine.h
diff --git a/sysdeps/ia64/Dist b/sysdeps/ia64/Dist
deleted file mode 100644
index 09ee86c206..0000000000
--- a/sysdeps/ia64/Dist
+++ /dev/null
@@ -1,9 +0,0 @@
-_mcount.S
-dl-symaddr.c
-dl-fptr.c
-elf/entry.h
-hp-timing.c
-ia64libgcc.S
-ieee754.h
-softpipe.h
-bits/link.h
diff --git a/sysdeps/ia64/fpu/Dist b/sysdeps/ia64/fpu/Dist
deleted file mode 100644
index afd3153506..0000000000
--- a/sysdeps/ia64/fpu/Dist
+++ /dev/null
@@ -1,11 +0,0 @@
-libc_libm_error.c
-libm_atan2_reg.S
-libm_error.c
-libm_frexp4.S
-libm_frexp4f.S
-libm_frexp4l.S
-libm_reduce.S
-libm_support.h
-libm_tan.S
-s_matherrf.c
-s_matherrl.c
diff --git a/sysdeps/ieee754/Dist b/sysdeps/ieee754/Dist
deleted file mode 100644
index 94cc5c9ac4..0000000000
--- a/sysdeps/ieee754/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-support.c
-ieee754.h
diff --git a/sysdeps/ieee754/dbl-64/Dist b/sysdeps/ieee754/dbl-64/Dist
deleted file mode 100644
index 4920caedcc..0000000000
--- a/sysdeps/ieee754/dbl-64/Dist
+++ /dev/null
@@ -1,33 +0,0 @@
-asincos.tbl
-atnat.h
-atnat2.h
-branred.h
-dla.h
-doasin.h
-dosincos.h
-MathLib.h
-mpa.h
-mpa2.h
-mpatan.h
-mpexp.h
-mplog.h
-mpsqrt.h
-mydefs.h
-powtwo.tbl
-root.tbl
-sincos.tbl
-sincos32.h
-t_exp2.h
-uasncs.h
-uatan.tbl
-uexp.h
-uexp.tbl
-ulog.h
-ulog.tbl
-upow.h
-upow.tbl
-urem.h
-uroot.h
-usncs.h
-utan.h
-utan.tbl
diff --git a/sysdeps/ieee754/flt-32/Dist b/sysdeps/ieee754/flt-32/Dist
deleted file mode 100644
index 045ac801f6..0000000000
--- a/sysdeps/ieee754/flt-32/Dist
+++ /dev/null
@@ -1 +0,0 @@
-t_exp2f.h
diff --git a/sysdeps/ieee754/ldbl-128/Dist b/sysdeps/ieee754/ldbl-128/Dist
deleted file mode 100644
index 4504060729..0000000000
--- a/sysdeps/ieee754/ldbl-128/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-ieee754.h
-t_expl.h
diff --git a/sysdeps/m68k/fpu/Dist b/sysdeps/m68k/fpu/Dist
deleted file mode 100644
index e649e8d55e..0000000000
--- a/sysdeps/m68k/fpu/Dist
+++ /dev/null
@@ -1 +0,0 @@
-mathimpl.h
diff --git a/sysdeps/m68k/fpu/switch/Dist b/sysdeps/m68k/fpu/switch/Dist
deleted file mode 100644
index 9288bddaa5..0000000000
--- a/sysdeps/m68k/fpu/switch/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-68881-sw.h
-switch.c
diff --git a/sysdeps/mach/hurd/Dist b/sysdeps/mach/hurd/Dist
deleted file mode 100644
index 52c84297cb..0000000000
--- a/sysdeps/mach/hurd/Dist
+++ /dev/null
@@ -1,17 +0,0 @@
-cthreads.c
-errlist.c
-errnos.awk
-err_hurd.sub
-libc-ldscript
-libc_p-ldscript
-bits/libc-tsd.h
-net/ethernet.h
-net/if_arp.h
-net/if_ether.h
-net/if_ppp.h
-net/route.h
-nfs/nfs.h
-set-init.c
-siglist.h
-statfsconv.c
-xstatconv.c
diff --git a/sysdeps/mach/hurd/alpha/Dist b/sysdeps/mach/hurd/alpha/Dist
deleted file mode 100644
index c58180257e..0000000000
--- a/sysdeps/mach/hurd/alpha/Dist
+++ /dev/null
@@ -1 +0,0 @@
-static-start.S
diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
index 206058bf2f..06a73df75e 100644
--- a/sysdeps/mach/hurd/bits/ioctls.h
+++ b/sysdeps/mach/hurd/bits/ioctls.h
@@ -226,6 +226,7 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_32, IOC_64 };
 #define	SIOCSIFADDR	_IOW('i', 12, struct ifreq)	/* set ifnet address */
 #define	OSIOCGIFADDR	_IOWR('i',13, struct ifreq)	/* get ifnet address */
 #define	SIOCGIFADDR	_IOWR('i',33, struct ifreq)	/* get ifnet address */
+#define	SIOCGIFHWADDR	_IOWR('i',39, struct ifreq)	/* get hwaddress */
 #define	SIOCSIFDSTADDR	_IOW('i', 14, struct ifreq)	/* set p-p address */
 #define	OSIOCGIFDSTADDR	_IOWR('i',15, struct ifreq)	/* get p-p address */
 #define	SIOCGIFDSTADDR	_IOWR('i',34, struct ifreq)	/* get p-p address */
diff --git a/sysdeps/mach/hurd/i386/Dist b/sysdeps/mach/hurd/i386/Dist
deleted file mode 100644
index 82c44df00b..0000000000
--- a/sysdeps/mach/hurd/i386/Dist
+++ /dev/null
@@ -1,3 +0,0 @@
-static-start.S
-sys/io.h
-ioperm.c
diff --git a/sysdeps/mach/hurd/mips/Dist b/sysdeps/mach/hurd/mips/Dist
deleted file mode 100644
index b6f3ffa4c3..0000000000
--- a/sysdeps/mach/hurd/mips/Dist
+++ /dev/null
@@ -1,3 +0,0 @@
-longjmp-ctx.c
-init-fault.c
-dl-machine.c
diff --git a/sysdeps/mach/hurd/powerpc/Dist b/sysdeps/mach/hurd/powerpc/Dist
deleted file mode 100644
index c58180257e..0000000000
--- a/sysdeps/mach/hurd/powerpc/Dist
+++ /dev/null
@@ -1 +0,0 @@
-static-start.S
diff --git a/sysdeps/mach/mips/Dist b/sysdeps/mach/mips/Dist
deleted file mode 100644
index f2699bf887..0000000000
--- a/sysdeps/mach/mips/Dist
+++ /dev/null
@@ -1 +0,0 @@
-cacheflush.c
diff --git a/sysdeps/mips/Dist b/sysdeps/mips/Dist
deleted file mode 100644
index 1fbf36aaad..0000000000
--- a/sysdeps/mips/Dist
+++ /dev/null
@@ -1,8 +0,0 @@
-setjmp_aux.c
-regdef.h
-sgidefs.h
-fpregdef.h
-fpu/fenv_libc.h
-sys/fpregdef.h
-sys/regdef.h
-sys/asm.h
diff --git a/sysdeps/mips/mips64/Dist b/sysdeps/mips/mips64/Dist
deleted file mode 100644
index ad6ea0313a..0000000000
--- a/sysdeps/mips/mips64/Dist
+++ /dev/null
@@ -1 +0,0 @@
-setjmp_aux.c
diff --git a/sysdeps/mips/mips64/soft-fp/Dist b/sysdeps/mips/mips64/soft-fp/Dist
deleted file mode 100644
index 7e9914fe58..0000000000
--- a/sysdeps/mips/mips64/soft-fp/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sfp-machine.h
diff --git a/sysdeps/mips/soft-fp/Dist b/sysdeps/mips/soft-fp/Dist
deleted file mode 100644
index 7e9914fe58..0000000000
--- a/sysdeps/mips/soft-fp/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sfp-machine.h
diff --git a/sysdeps/posix/Dist b/sysdeps/posix/Dist
deleted file mode 100644
index 7f0fb706a7..0000000000
--- a/sysdeps/posix/Dist
+++ /dev/null
@@ -1 +0,0 @@
-gai_strerror-strs.h
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index de72e84829..cb5137cd76 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991,1993,1995-1997,1999-2003,2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991,1993,1995-1997,1999-2003,2004,2006
+	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
@@ -68,7 +68,7 @@ __sysconf (name)
 #ifdef	CHILD_MAX
       return CHILD_MAX;
 #else
-      return -1;
+      return __get_child_max ();
 #endif
 
     case _SC_CLK_TCK:
diff --git a/sysdeps/powerpc/Dist b/sysdeps/powerpc/Dist
deleted file mode 100644
index ba909df26f..0000000000
--- a/sysdeps/powerpc/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-novmx-longjmp.c
-novmx-sigjmp.c
diff --git a/sysdeps/powerpc/fpu/Dist b/sysdeps/powerpc/fpu/Dist
deleted file mode 100644
index 948b04a2b3..0000000000
--- a/sysdeps/powerpc/fpu/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-fe_nomask.c
-fenv_const.c
-fenv_libc.h
-t_sqrt.c
diff --git a/sysdeps/powerpc/powerpc32/Dist b/sysdeps/powerpc/powerpc32/Dist
deleted file mode 100644
index ada834f7c3..0000000000
--- a/sysdeps/powerpc/powerpc32/Dist
+++ /dev/null
@@ -1,9 +0,0 @@
-dl-machine.c
-dl-start.S
-libgcc-compat.S
-ppc-mcount.S
-gprsave1.S
-gprsave0.S
-gprrest1.S
-gprrest0.S
-bp-asm.h
diff --git a/sysdeps/powerpc/powerpc32/dl-trampoline.S b/sysdeps/powerpc/powerpc32/dl-trampoline.S
index 506e8022b9..392c109d4c 100644
--- a/sysdeps/powerpc/powerpc32/dl-trampoline.S
+++ b/sysdeps/powerpc/powerpc32/dl-trampoline.S
@@ -1,5 +1,5 @@
 /* PLT trampolines.  PPC32 version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -24,9 +24,11 @@
 	.globl _dl_runtime_resolve
 	.type _dl_runtime_resolve,@function
 _dl_runtime_resolve:
+	cfi_startproc
  # We need to save the registers used to pass parameters, and register 0,
  # which is used by _mcount; the registers are saved in a stack frame.
 	stwu r1,-64(r1)
+	cfi_adjust_cfa_offset (64)
 	stw r0,12(r1)
 	stw r3,16(r1)
 	stw r4,20(r1)
@@ -38,7 +40,8 @@ _dl_runtime_resolve:
 	mflr r0
  # We also need to save some of the condition register fields
 	stw r7,32(r1)
-	stw r0,48(r1)
+	stw r0,68(r1)
+ 	cfi_offset (lr, 4)
 	stw r8,36(r1)
 	mfcr r0
 	stw r9,40(r1)
@@ -48,7 +51,7 @@ _dl_runtime_resolve:
  # 'fixup' returns the address we want to branch to.
 	mtctr r3
  # Put the registers back...
-	lwz r0,48(r1)
+	lwz r0,68(r1)
 	lwz r10,44(r1)
 	lwz r9,40(r1)
 	mtlr r0
@@ -64,6 +67,7 @@ _dl_runtime_resolve:
  # ...unwind the stack frame, and jump to the PLT entry we updated.
 	addi r1,r1,64
 	bctr
+	cfi_endproc
 	.size	 _dl_runtime_resolve,.-_dl_runtime_resolve
 
 #ifndef PROF
@@ -71,9 +75,11 @@ _dl_runtime_resolve:
 	.globl _dl_prof_resolve
 	.type _dl_prof_resolve,@function
 _dl_prof_resolve:
+	cfi_startproc
  # We need to save the registers used to pass parameters, and register 0,
  # which is used by _mcount; the registers are saved in a stack frame.
 	stwu r1,-320(r1)
+	cfi_adjust_cfa_offset (320)
 	/* Stack layout:
 
 	  +312   stackframe
@@ -122,7 +128,8 @@ _dl_prof_resolve:
 	mflr r5
  # We also need to save some of the condition register fields.
 	stw r7,32(r1)
-	stw r5,308(r1)
+	stw r5,324(r1)
+	cfi_offset (lr, 4)
 	stw r8,36(r1)
 	mfcr r0
 	stw r9,40(r1)
@@ -147,7 +154,7 @@ _dl_prof_resolve:
  # 'fixup' returns the address we want to branch to.
 	mtctr r3
  # Put the registers back...
-	lwz r0,308(r1)
+	lwz r0,324(r1)
 	lwz r10,44(r1)
 	lwz r9,40(r1)
 	mtlr r0
@@ -172,5 +179,6 @@ _dl_prof_resolve:
  # ...unwind the stack frame, and jump to the PLT entry we updated.
 	addi r1,r1,320
 	bctr
+	cfi_endproc
 	.size	 _dl_prof_resolve,.-_dl_prof_resolve
 #endif
diff --git a/sysdeps/powerpc/powerpc32/fpu/Dist b/sysdeps/powerpc/powerpc32/fpu/Dist
deleted file mode 100644
index 375e57172e..0000000000
--- a/sysdeps/powerpc/powerpc32/fpu/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-fprrest.S
-fprsave.S
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index 022d7ebbad..644e626aa8 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
@@ -1,5 +1,5 @@
 /* longjmp for PowerPC.
-   Copyright (C) 1995-99, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-99, 2000, 2003-2005, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ASM
@@ -34,6 +34,7 @@ ENTRY (BP_SYM (__longjmp))
 #ifndef __NO_VMX__
 # ifdef PIC
 	mflr    r6
+	cfi_register (lr,r6)
 #  ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r5
@@ -46,10 +47,12 @@ ENTRY (BP_SYM (__longjmp))
 #  ifdef SHARED
 	lwz     r5,_rtld_global_ro@got(r5)
 	mtlr    r6
+	cfi_same_value (lr)
 	lwz     r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5)
 #  else
 	lwz     r5,_dl_hwcap@got(r5)
 	mtlr    r6
+	cfi_same_value (lr)
 	lwz     r5,0(r5)
 #  endif
 # else
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_ceil.S b/sysdeps/powerpc/powerpc32/fpu/s_ceil.S
index 13afba88f0..2e0e6a87a9 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_ceil.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_ceil.S
@@ -1,5 +1,5 @@
 /* ceil function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -29,19 +29,20 @@ ENTRY (__ceil)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_ceilf.S b/sysdeps/powerpc/powerpc32/fpu/s_ceilf.S
index f8ca1de08c..47a75ec0c3 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_ceilf.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_ceilf.S
@@ -1,5 +1,5 @@
 /* float ceil function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -29,19 +29,20 @@ ENTRY (__ceilf)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
index ee2c09cba8..39d7d1c770 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
@@ -1,5 +1,5 @@
 /* Copy a sign bit between floating-point values.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 /* This has been coded in assembler because GCC makes such a mess of it
    when it's coded in C.  */
@@ -27,6 +27,7 @@ ENTRY(__copysign)
    copysign(x,y) returns a value with the magnitude of x and
    with the sign bit of y.  */
 	stwu	r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 	stfd	fp2,8(r1)
 	lwz	r3,8(r1)
 	cmpwi   r3,0
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_floor.S b/sysdeps/powerpc/powerpc32/fpu/s_floor.S
index 5dfe8f2d9a..5942d09181 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_floor.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_floor.S
@@ -1,5 +1,5 @@
 /* Floor function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -29,19 +29,20 @@ ENTRY (__floor)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_floorf.S b/sysdeps/powerpc/powerpc32/fpu/s_floorf.S
index 31b71ad229..99fbdc5f86 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_floorf.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_floorf.S
@@ -1,5 +1,5 @@
 /* float Floor function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -29,19 +29,20 @@ ENTRY (__floorf)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_lround.S b/sysdeps/powerpc/powerpc32/fpu/s_lround.S
index 4f543eb269..67e58848d0 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_lround.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_lround.S
@@ -1,5 +1,5 @@
 /* lround function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -39,8 +39,11 @@
    to the integer value.  */
 
 ENTRY (__lround)
+	stwu    r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
@@ -52,6 +55,7 @@ ENTRY (__lround)
 	lwz	r9,.LC0@got(10)
 # endif
 	mtlr	r11
+	cfi_same_value (lr)
 	lfs	fp12,0(r9)
 #else
 	lis	r9,.LC0@ha
@@ -68,11 +72,12 @@ ENTRY (__lround)
 	fadd	fp1,fp1,fp10	/* x+= 0.5;  */
 .L9:
 	fctiwz	fp2,fp1		/* Convert To Integer DW lround toward 0.  */
-	stfd	fp2,-8(r1)
+	stfd	fp2,8(r1)
 	nop	/* Ensure the following load is in a different dispatch  */
 	nop	/* group to avoid pipe stall on POWER4&5.  */
 	nop
-	lwz	r3,-4(r1)
+	lwz	r3,12(r1)
+	addi	r1,r1,16
 	blr
 .L4:
 	fsub	fp1,fp1,fp10	/* x-= 0.5;  */
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_rint.S b/sysdeps/powerpc/powerpc32/fpu/s_rint.S
index 1cfcd78b5c..041cb58b84 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_rint.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_rint.S
@@ -1,5 +1,5 @@
 /* Round to int floating-point values.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 /* This has been coded in assembler because GCC makes such a mess of it
    when it's coded in C.  */
@@ -31,19 +31,20 @@
 ENTRY (__rint)
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_rintf.S b/sysdeps/powerpc/powerpc32/fpu/s_rintf.S
index 93c02667fe..7771cb2bc8 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_rintf.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_rintf.S
@@ -1,5 +1,5 @@
 /* Round float to int floating-point values.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -28,19 +28,20 @@
 ENTRY (__rintf)
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_round.S b/sysdeps/powerpc/powerpc32/fpu/s_round.S
index 53b45916d1..04ba9422d9 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_round.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_round.S
@@ -1,5 +1,5 @@
 /* round function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -41,6 +41,7 @@ ENTRY (__round)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
@@ -52,6 +53,7 @@ ENTRY (__round)
 	lwz	r9,.LC0@got(10)
 # endif
 	mtlr	r11
+	cfi_same_value (lr)
 	lfs	fp13,0(r9)
 #else
 	lis	r9,.LC0@ha
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_roundf.S b/sysdeps/powerpc/powerpc32/fpu/s_roundf.S
index 39ba08655a..7e99bca315 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_roundf.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_roundf.S
@@ -1,5 +1,5 @@
 /* roundf  function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -41,6 +41,7 @@ ENTRY (__roundf )
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
@@ -52,6 +53,7 @@ ENTRY (__roundf )
 	lwz	r9,.LC0@got(10)
 # endif
 	mtlr	r11
+	cfi_same_value (lr)
 	lfs	fp13,0(r9)
 #else
 	lis	r9,.LC0@ha
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_trunc.S b/sysdeps/powerpc/powerpc32/fpu/s_trunc.S
index 827e8cb940..4ea4e074c8 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_trunc.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_trunc.S
@@ -1,5 +1,5 @@
 /* trunc function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -36,19 +36,20 @@ ENTRY (__trunc)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_truncf.S b/sysdeps/powerpc/powerpc32/fpu/s_truncf.S
index 55e7a74b41..0005d50160 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_truncf.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_truncf.S
@@ -1,5 +1,5 @@
 /* truncf function.  PowerPC32 version.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 
@@ -36,19 +36,20 @@ ENTRY (__truncf)
 	mffs	fp11		/* Save current FPU rounding mode.  */
 #ifdef SHARED
 	mflr	r11
+	cfi_register(lr,r11)
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r9
 	addis	r9,r9,.LC0-1b@ha
-	mtlr	r11
 	lfs	fp13,.LC0-1b@l(r9)
 # else
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
 	mflr	r10
 	lwz	r9,.LC0@got(10)
-	mtlr	r11
 	lfs	fp13,0(r9)
 # endif
+	mtlr	r11
+	cfi_same_value (lr)
 #else
 	lis	r9,.LC0@ha
 	lfs	fp13,.LC0@l(r9)
diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
index 3afcf66fb9..e38c7b8d6e 100644
--- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
@@ -1,5 +1,5 @@
 /* setjmp for PowerPC.
-   Copyright (C) 1995-2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000, 2003-2005, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 1 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ASM
@@ -85,6 +85,7 @@ ENTRY (BP_SYM (__sigsetjmp))
 #ifndef __NO_VMX__
 # ifdef PIC
 	mflr    r6
+	cfi_register(lr,r6)
 #  ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r5
@@ -94,13 +95,13 @@ ENTRY (BP_SYM (__sigsetjmp))
 	bl      _GLOBAL_OFFSET_TABLE_@local-4
 	mflr    r5
 #  endif
+	mtlr	r6
+	cfi_same_value (lr)
 #  ifdef SHARED
 	lwz     r5,_rtld_global_ro@got(r5)
-	mtlr    r6
 	lwz     r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5)
 #  else
 	lwz     r5,_dl_hwcap@got(r5)
-	mtlr    r6
 	lwz     r5,0(r5)
 #  endif
 # else
diff --git a/sysdeps/powerpc/powerpc32/lshift.S b/sysdeps/powerpc/powerpc32/lshift.S
index 9f5870d828..65054f229d 100644
--- a/sysdeps/powerpc/powerpc32/lshift.S
+++ b/sysdeps/powerpc/powerpc32/lshift.S
@@ -1,5 +1,5 @@
 /* Shift a limb left, low level routine.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <bp-sym.h>
@@ -67,6 +67,7 @@ L(boom): tweq    r0,r0
 /* We imitate a case statement, by using (yuk!) fixed-length code chunks,
    of size 4*12 bytes.  We have to do this (or something) to make this PIC.  */
 L(big):	mflr    r9
+	cfi_register(lr,r9)
 	bltl-   cr0,L(boom)	# Never taken, only used to set LR.
 	slwi    r10,r6,4
 	mflr    r12
@@ -75,7 +76,8 @@ L(big):	mflr    r9
 	add     r10,r8,r10
 	mtctr   r10
 	addi	r5,r5,-1
-	mtlr    r9
+	mtlr	r9
+	cfi_same_value (lr)
 	bctr
 
 L(end2):slw	r0,r10,r6
diff --git a/sysdeps/powerpc/powerpc32/ppc-mcount.S b/sysdeps/powerpc/powerpc32/ppc-mcount.S
index c1a08d379c..7e39acb55b 100644
--- a/sysdeps/powerpc/powerpc32/ppc-mcount.S
+++ b/sysdeps/powerpc/powerpc32/ppc-mcount.S
@@ -1,5 +1,5 @@
 /* PowerPC-specific implementation of profiling support.
-   Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2005, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 /* This would be bad.  */
 #ifdef PROF
@@ -42,6 +42,7 @@
 
 ENTRY(_mcount)
 	stwu	r1,-48(r1)
+	cfi_adjust_cfa_offset (48)
 /* We need to save the parameter-passing registers.  */
 	stw	r3, 12(r1)
 	stw	r4, 16(r1)
@@ -55,6 +56,7 @@ ENTRY(_mcount)
 	stw	r9, 36(r1)
 	stw	r10,40(r1)
 	stw	r4, 44(r1)
+	cfi_offset (lr, -4)
 	stw	r5,  8(r1)
 	bl	__mcount_internal@local
 	nop
diff --git a/sysdeps/powerpc/powerpc64/Dist b/sysdeps/powerpc/powerpc64/Dist
deleted file mode 100644
index bbadfef3b8..0000000000
--- a/sysdeps/powerpc/powerpc64/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-dl-machine.c
-ppc-mcount.S
-elf/entry.h
-bp-asm.h
diff --git a/sysdeps/powerpc/powerpc64/dl-trampoline.S b/sysdeps/powerpc/powerpc64/dl-trampoline.S
index c90f961615..c5afe5a3fa 100644
--- a/sysdeps/powerpc/powerpc64/dl-trampoline.S
+++ b/sysdeps/powerpc/powerpc64/dl-trampoline.S
@@ -1,5 +1,5 @@
 /* PLT trampolines.  PPC64 version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <rtld-global-offsets.h>
@@ -31,6 +31,7 @@ EALIGN(_dl_runtime_resolve, 4, 0)
 /* We need to save the registers used to pass parameters, ie. r3 thru
    r10; the registers are saved in a stack frame.  */
 	stdu	r1,-128(r1)
+	cfi_adjust_cfa_offset (128)
 	std	r3,48(r1)
 	mr	r3,r11
 	std	r4,56(r1)
@@ -44,6 +45,7 @@ EALIGN(_dl_runtime_resolve, 4, 0)
 	std	r8,88(r1)
 /* Store the LR in the LR Save area of the previous frame.  */
 	std	r0,128+16(r1)
+	cfi_offset (lr, 16)
 	mfcr	r0
 	std	r9,96(r1)
 	std	r10,104(r1)
@@ -178,6 +180,7 @@ EALIGN(_dl_profile_resolve, 4, 0)
 /* We need to save the registers used to pass parameters, ie. r3 thru
    r10; the registers are saved in a stack frame.  */
 	stdu	r1,-FRAME_SIZE(r1)
+	cfi_adjust_cfa_offset (FRAME_SIZE)
 	std	r3,INT_PARMS+0(r1)
 	mr	r3,r11
 	std	r4,INT_PARMS+8(r1)
@@ -193,6 +196,7 @@ EALIGN(_dl_profile_resolve, 4, 0)
 /* XXX Do we have to do this?  */
 	la	r8,FRAME_SIZE(r1)
 	std	r5,FRAME_SIZE+16(r1)
+	cfi_offset (lr, 16)
 	std	r5,CALLING_LR(r1)
 	mfcr	r0
 	std	r9,INT_PARMS+48(r1)
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
index f083d2b7ea..c0fdf4196c 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
@@ -28,7 +28,11 @@ ENTRY(__copysign)
    copysign(x,y) returns a value with the magnitude of x and
    with the sign bit of y.  */
 	stdu	r1,-48(r1)
+	cfi_adjust_cfa_offset (48)
 	stfd	fp2,24(r1)
+	nop
+	nop
+	nop
 	ld	r3,24(r1)
 	cmpdi   r3,0
 	addi    r1,r1,48
diff --git a/sysdeps/powerpc/powerpc64/ppc-mcount.S b/sysdeps/powerpc/powerpc64/ppc-mcount.S
index 46cb9fdc8a..5df9650577 100644
--- a/sysdeps/powerpc/powerpc64/ppc-mcount.S
+++ b/sysdeps/powerpc/powerpc64/ppc-mcount.S
@@ -1,5 +1,5 @@
 /* PowerPC64-specific implementation of profiling support.
-   Copyright (C) 1997, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2002, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 /* We don't need to save the parameter-passing registers as gcc takes
@@ -26,7 +26,9 @@ ENTRY(_mcount)
 	mflr		 r4
 	ld		 r11, 0(r1)
 	stdu		 r1,-112(r1)
+	cfi_adjust_cfa_offset (112)
 	std		 r4, 128(r1)
+	cfi_offset (lr, 16)
 	ld		 r3, 16(r11)
 	bl		 JUMPTARGET(__mcount_internal)
 	nop
diff --git a/sysdeps/powerpc/soft-fp/Dist b/sysdeps/powerpc/soft-fp/Dist
deleted file mode 100644
index a917524129..0000000000
--- a/sysdeps/powerpc/soft-fp/Dist
+++ /dev/null
@@ -1,28 +0,0 @@
-q_add.c
-q_cmp.c
-q_cmpe.c
-q_div.c
-q_dtoq.c
-q_feq.c
-q_fge.c
-q_fgt.c
-q_fle.c
-q_flt.c
-q_fne.c
-q_itoq.c
-q_lltoq.c
-q_mul.c
-q_neg.c
-q_qtod.c
-q_qtoi.c
-q_qtoll.c
-q_qtos.c
-q_qtou.c
-q_qtoull.c
-q_sqrt.c
-q_stoq.c
-q_sub.c
-q_ulltoq.c
-q_util.c
-q_utoq.c
-sfp-machine.h
diff --git a/sysdeps/s390/Dist b/sysdeps/s390/Dist
deleted file mode 100644
index 10a95f596b..0000000000
--- a/sysdeps/s390/Dist
+++ /dev/null
@@ -1,3 +0,0 @@
-machine-gmon.h
-bits/link.h
-fpu/fenv_libc.h
diff --git a/sysdeps/s390/s390-32/Dist b/sysdeps/s390/s390-32/Dist
deleted file mode 100644
index 1cd482830a..0000000000
--- a/sysdeps/s390/s390-32/Dist
+++ /dev/null
@@ -1 +0,0 @@
-s390-mcount.S
diff --git a/sysdeps/s390/s390-64/Dist b/sysdeps/s390/s390-64/Dist
deleted file mode 100644
index dbf7aa9661..0000000000
--- a/sysdeps/s390/s390-64/Dist
+++ /dev/null
@@ -1 +0,0 @@
-s390x-mcount.S
diff --git a/sysdeps/sh/Dist b/sysdeps/sh/Dist
deleted file mode 100644
index a6bf2ff36d..0000000000
--- a/sysdeps/sh/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-_mcount.S
-bits/link.h
diff --git a/sysdeps/sparc/Dist b/sysdeps/sparc/Dist
deleted file mode 100644
index 7832507772..0000000000
--- a/sysdeps/sparc/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sys/trap.h
diff --git a/sysdeps/sparc/sparc32/Dist b/sysdeps/sparc/sparc32/Dist
deleted file mode 100644
index c3bf9746bc..0000000000
--- a/sysdeps/sparc/sparc32/Dist
+++ /dev/null
@@ -1,9 +0,0 @@
-dotmul.S
-umul.S
-divrem.m4
-sdiv.S
-udiv.S
-rem.S
-urem.S
-alloca.S
-ieee754.h
diff --git a/sysdeps/sparc/sparc32/soft-fp/Dist b/sysdeps/sparc/sparc32/soft-fp/Dist
deleted file mode 100644
index b3c7344889..0000000000
--- a/sysdeps/sparc/sparc32/soft-fp/Dist
+++ /dev/null
@@ -1,28 +0,0 @@
-q_add.c
-q_cmp.c
-q_cmpe.c
-q_div.c
-q_dtoq.c
-q_feq.c
-q_fge.c
-q_fgt.c
-q_fle.c
-q_flt.c
-q_fne.c
-q_itoq.c
-q_mul.c
-q_neg.c
-q_qtod.c
-q_qtoi.c
-q_qtos.c
-q_qtoui.c
-q_qtoux.c
-q_qtox.c
-q_sqrt.c
-q_stoq.c
-q_sub.c
-q_uitoq.c
-q_util.c
-q_uxtoq.c
-q_xtoq.c
-sfp-machine.h
diff --git a/sysdeps/sparc/sparc32/sparcv8/Dist b/sysdeps/sparc/sparc32/sparcv8/Dist
deleted file mode 100644
index 6318172684..0000000000
--- a/sysdeps/sparc/sparc32/sparcv8/Dist
+++ /dev/null
@@ -1,6 +0,0 @@
-urem.S
-umul.S
-udiv.S
-sdiv.S
-rem.S
-dotmul.S
diff --git a/sysdeps/sparc/sparc32/sparcv9/Dist b/sysdeps/sparc/sparc32/sparcv9/Dist
deleted file mode 100644
index 2de64957fb..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/Dist
+++ /dev/null
@@ -1,7 +0,0 @@
-dotmul.S
-hp-timing.c
-rem.S
-sdiv.S
-udiv.S
-umul.S
-urem.S
diff --git a/sysdeps/sparc/sparc64/Dist b/sysdeps/sparc/sparc64/Dist
deleted file mode 100644
index dbf11d5009..0000000000
--- a/sysdeps/sparc/sparc64/Dist
+++ /dev/null
@@ -1 +0,0 @@
-hp-timing.c
diff --git a/sysdeps/sparc/sparc64/soft-fp/Dist b/sysdeps/sparc/sparc64/soft-fp/Dist
deleted file mode 100644
index f98d85f7c2..0000000000
--- a/sysdeps/sparc/sparc64/soft-fp/Dist
+++ /dev/null
@@ -1,32 +0,0 @@
-qp_add.c
-qp_cmp.c
-qp_cmpe.c
-qp_div.c
-qp_dtoq.c
-qp_feq.c
-qp_fge.c
-qp_fgt.c
-qp_fle.c
-qp_flt.c
-qp_fne.c
-qp_itoq.c
-qp_mul.c
-qp_neg.S
-qp_qtod.c
-qp_qtoi.c
-qp_qtos.c
-qp_qtoui.c
-qp_qtoux.c
-qp_qtox.c
-qp_sqrt.c
-qp_stoq.c
-qp_sub.c
-qp_uitoq.c
-qp_util.c
-qp_uxtoq.c
-qp_xtoq.c
-s_frexpl.c
-s_ilogbl.c
-s_scalblnl.c
-s_scalbnl.c
-sfp-machine.h
diff --git a/sysdeps/unix/Dist b/sysdeps/unix/Dist
deleted file mode 100644
index b3c3880a79..0000000000
--- a/sysdeps/unix/Dist
+++ /dev/null
@@ -1,14 +0,0 @@
-errnos-tmpl.c
-errnos.awk
-ioctls-tmpl.c
-ioctls.awk
-snarf-ioctls
-make_errlist.c
-mk-local_lim.c
-s-proto.S
-make-syscalls.sh
-i386/dl-brk.S
-mips/dl-brk.S
-sparc/dl-brk.S
-s-proto-bp.S
-s-proto-cancel.S
diff --git a/sysdeps/unix/bsd/Dist b/sysdeps/unix/bsd/Dist
deleted file mode 100644
index e81952e015..0000000000
--- a/sysdeps/unix/bsd/Dist
+++ /dev/null
@@ -1,5 +0,0 @@
-setrgid.c
-setruid.c
-bsdstat.h
-bsdtty.h
-vax/dl-brk.S
diff --git a/sysdeps/unix/bsd/bsd4.4/Dist b/sysdeps/unix/bsd/bsd4.4/Dist
deleted file mode 100644
index 2562aac1b6..0000000000
--- a/sysdeps/unix/bsd/bsd4.4/Dist
+++ /dev/null
@@ -1 +0,0 @@
-cmsg_nxthdr.c
diff --git a/sysdeps/unix/common/Dist b/sysdeps/unix/common/Dist
deleted file mode 100644
index 0c47cabcfa..0000000000
--- a/sysdeps/unix/common/Dist
+++ /dev/null
@@ -1 +0,0 @@
-glue-ctype.c
diff --git a/sysdeps/unix/get_child_max.c b/sysdeps/unix/get_child_max.c
new file mode 100644
index 0000000000..c59e4d8953
--- /dev/null
+++ b/sysdeps/unix/get_child_max.c
@@ -0,0 +1,37 @@
+/* Get POSIX {CHILD_MAX} run-time limit value.  Unix version.
+   Copyright (C) 2006 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <limits.h>
+#include <sys/sysinfo.h>
+#include <sys/resource.h>
+
+#ifndef CHILD_MAX
+long int
+__get_child_max (void)
+{
+# ifdef RLIMIT_NPROC
+  struct rlimit limit;
+  if (__getrlimit (RLIMIT_NPROC, &limit) == 0
+      && limit.rlim_cur != RLIM_INFINITY)
+    return limit.rlim_cur;
+# endif
+
+  return -1;
+}
+#endif
diff --git a/sysdeps/unix/sysv/Dist b/sysdeps/unix/sysv/Dist
deleted file mode 100644
index 6ad8e0f653..0000000000
--- a/sysdeps/unix/sysv/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-direct.h
-sysv_termio.h
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
deleted file mode 100644
index e621041a24..0000000000
--- a/sysdeps/unix/sysv/linux/Dist
+++ /dev/null
@@ -1,85 +0,0 @@
-bits/initspin.h
-cmsg_nxthdr.c
-dl-brk.c
-dl-sbrk.c
-exit-thread.S
-fatal-prepare.h
-getdirentries.c
-getdirentries64.c
-ipc_priv.h
-kernel-features.h
-kernel_sigaction.h
-kernel_stat.h
-kernel_termios.h
-ldd-rewrite.sed
-lddlibc4.c
-linux_fsinfo.h
-llseek.c
-makedev.c
-ntp_gettime.c
-readahead.c
-s_pread64.c
-s_pwrite64.c
-siglist.h
-sizes.h
-socketcall.h
-sysctl.c
-termio.h
-netlinkaccess.h
-net/ethernet.h
-net/if_arp.h
-net/if_packet.h
-net/if_ppp.h
-net/if_shaper.h
-net/if_slip.h
-net/ppp-comp.h
-net/ppp_defs.h
-net/route.h
-netash/ash.h
-netatalk/at.h
-netax25/ax25.h
-neteconet/ec.h
-netinet/if_fddi.h
-netinet/if_tr.h
-netpacket/packet.h
-netipx/ipx.h
-netrom/netrom.h
-netrose/rose.h
-nfs/nfs.h
-pathconf.h
-rt_sigaction.c
-rt_sigpending.c
-rt_sigprocmask.c
-rt_sigqueueinfo.c
-rt_sigreturn.c
-rt_sigsuspend.c
-rt_sigtimedwait.c
-sa_len.c
-scsi/sg.h
-scsi/scsi.h
-scsi/scsi_ioctl.h
-sys/acct.h
-sys/epoll.h
-sys/fsuid.h
-sys/kd.h
-sys/kdaemon.h
-sys/klog.h
-sys/mount.h
-sys/pci.h
-sys/personality.h
-sys/prctl.h
-sys/procfs.h
-sys/quota.h
-sys/raw.h
-sys/soundcard.h
-sys/sysctl.h
-sys/sysinfo.h
-sys/timex.h
-sys/ultrasound.h
-sys/user.h
-sys/vt.h
-xstatconv.c
-xstatconv.h
-getdents64.c
-umount.S
-umount2.S
diff --git a/sysdeps/unix/sysv/linux/alpha/Dist b/sysdeps/unix/sysv/linux/alpha/Dist
deleted file mode 100644
index bba6642b42..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/Dist
+++ /dev/null
@@ -1,19 +0,0 @@
-alpha/ptrace.h
-alpha/regdef.h
-clone.S
-dl-brk.S
-ieee_get_fp_control.S
-ieee_set_fp_control.S
-ioperm.c
-ipc_priv.h
-kernel_sigaction.h
-kernel_stat.h
-kernel_termios.h
-oldglob.c
-rt_sigaction.S
-sizes.h
-sys/acct.h
-sys/io.h
-sys/procfs.h
-sys/user.h
-xstatconv.c
diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c
index e206cb4727..1700524d34 100644
--- a/sysdeps/unix/sysv/linux/alpha/adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <shlib-compat.h>
 #include <sysdep.h>
 #include <sys/time.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if !defined __ASSUME_TIMEVAL64 || SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
 struct timeval32
diff --git a/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c b/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c
index a0214b0072..d95e46f6f1 100644
--- a/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/alpha/dl-sysdep.c
@@ -1,5 +1,5 @@
-/* Operating system support for run-time dynamic linker.  Linux/PPC version.
-   Copyright (C) 1997, 1998, 2001, 2003 Free Software Foundation, Inc.
+/* Operating system support for run-time dynamic linker.  Linux/Alpha version.
+   Copyright (C) 1997, 1998, 2001, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,9 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-
-#include "config.h"
-#include "kernel-features.h"
+#include <config.h>
+#include <kernel-features.h>
 #include <ldsodefs.h>
 
 extern long __libc_alpha_cache_shape[4];
diff --git a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c
index 07f055886e..5e63be5cc7 100644
--- a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c
+++ b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <fenv_libc.h>
 #include <sysdep.h>
 #include <float.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include "kernel_sysinfo.h"
 
 
diff --git a/sysdeps/unix/sysv/linux/alpha/getitimer.S b/sysdeps/unix/sysv/linux/alpha/getitimer.S
index c2bc565afc..6644a5c36d 100644
--- a/sysdeps/unix/sysv/linux/alpha/getitimer.S
+++ b/sysdeps/unix/sysv/linux/alpha/getitimer.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/getrusage.S b/sysdeps/unix/sysv/linux/alpha/getrusage.S
index 46797aa83b..0bca4b5f23 100644
--- a/sysdeps/unix/sysv/linux/alpha/getrusage.S
+++ b/sysdeps/unix/sysv/linux/alpha/getrusage.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/gettimeofday.S b/sysdeps/unix/sysv/linux/alpha/gettimeofday.S
index 1a6f88b03a..7c9183a4fe 100644
--- a/sysdeps/unix/sysv/linux/alpha/gettimeofday.S
+++ b/sysdeps/unix/sysv/linux/alpha/gettimeofday.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2002, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/msgctl.c b/sysdeps/unix/sysv/linux/alpha/msgctl.c
index 1b75af2b80..a59911fe40 100644
--- a/sysdeps/unix/sysv/linux/alpha/msgctl.c
+++ b/sysdeps/unix/sysv/linux/alpha/msgctl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_msqid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/alpha/select.S b/sysdeps/unix/sysv/linux/alpha/select.S
index 458cda9246..35a81e949f 100644
--- a/sysdeps/unix/sysv/linux/alpha/select.S
+++ b/sysdeps/unix/sysv/linux/alpha/select.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2002,2003,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep-cancel.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
@@ -63,7 +63,7 @@ LEAF(SELECT, 64)
 	ldl	t0, __libc_missing_axp_tv64
 #endif
 
-	/* Save timeout early, since we'll need to recover this after 
+	/* Save timeout early, since we'll need to recover this after
 	   the system call.  */
 	stq	a4, 48(sp)
 
diff --git a/sysdeps/unix/sysv/linux/alpha/semctl.c b/sysdeps/unix/sysv/linux/alpha/semctl.c
index 6925c3f058..9957f983bf 100644
--- a/sysdeps/unix/sysv/linux/alpha/semctl.c
+++ b/sysdeps/unix/sysv/linux/alpha/semctl.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -26,7 +27,7 @@
 #include <string.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_semid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/alpha/setitimer.S b/sysdeps/unix/sysv/linux/alpha/setitimer.S
index 16bbd2227f..59caeac680 100644
--- a/sysdeps/unix/sysv/linux/alpha/setitimer.S
+++ b/sysdeps/unix/sysv/linux/alpha/setitimer.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/settimeofday.S b/sysdeps/unix/sysv/linux/alpha/settimeofday.S
index b49c770a0a..e39eadc208 100644
--- a/sysdeps/unix/sysv/linux/alpha/settimeofday.S
+++ b/sysdeps/unix/sysv/linux/alpha/settimeofday.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/shmctl.c b/sysdeps/unix/sysv/linux/alpha/shmctl.c
index 4a9d9445ef..e63211fa00 100644
--- a/sysdeps/unix/sysv/linux/alpha/shmctl.c
+++ b/sysdeps/unix/sysv/linux/alpha/shmctl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -27,7 +27,7 @@
 #include <bits/wordsize.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_shmid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/alpha/utimes.S b/sysdeps/unix/sysv/linux/alpha/utimes.S
index c210e1d12f..0dd0a9372b 100644
--- a/sysdeps/unix/sysv/linux/alpha/utimes.S
+++ b/sysdeps/unix/sysv/linux/alpha/utimes.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/wait4.S b/sysdeps/unix/sysv/linux/alpha/wait4.S
index 8d89e3d46e..634993deb8 100644
--- a/sysdeps/unix/sysv/linux/alpha/wait4.S
+++ b/sysdeps/unix/sysv/linux/alpha/wait4.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <sysdep.h>
 #define _ERRNO_H        1
 #include <bits/errno.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 .text
 
diff --git a/sysdeps/unix/sysv/linux/alpha/xstatconv.h b/sysdeps/unix/sysv/linux/alpha/xstatconv.h
index 846bb02994..094d11e5c9 100644
--- a/sysdeps/unix/sysv/linux/alpha/xstatconv.h
+++ b/sysdeps/unix/sysv/linux/alpha/xstatconv.h
@@ -1,5 +1,5 @@
 /* Convert between the kernel's `struct stat' format, and libc's.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 extern int __libc_missing_axp_stat64 attribute_hidden;
 extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 69924769bc..ae6f71d89c 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -1,5 +1,5 @@
 /* Determine protocol families for which interfaces exist.  Linux version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 static int
diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
index 2e5d2e7aee..04bf49e45f 100644
--- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
@@ -1,5 +1,5 @@
 /* clock_getcpuclockid -- Get a clockid_t for process CPU time.  Linux version.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 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,7 +20,7 @@
 #include <errno.h>
 #include <time.h>
 #include <unistd.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include "kernel-posix-cpu-timers.h"
 
 #ifndef HAS_CPUCLOCK
diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c
index 44dcccd150..813d3ebbf9 100644
--- a/sysdeps/unix/sysv/linux/clock_getres.c
+++ b/sysdeps/unix/sysv/linux/clock_getres.c
@@ -1,5 +1,5 @@
 /* clock_getres -- Get the resolution of a POSIX clockid_t.  Linux version.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003,2004,2005,2006 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
@@ -21,8 +21,7 @@
 #include <errno.h>
 #include <time.h>
 #include "kernel-posix-cpu-timers.h"
-
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifndef HAVE_CLOCK_GETRES_VSYSCALL
 # undef INTERNAL_VSYSCALL
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index 315d595edc..5afe20feb5 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -1,5 +1,5 @@
 /* clock_gettime -- Get current time from a POSIX clockid_t.  Linux version.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003,2004,2005,2006 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
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <time.h>
 #include "kernel-posix-cpu-timers.h"
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifndef HAVE_CLOCK_GETTIME_VSYSCALL
 # undef INTERNAL_VSYSCALL
diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c
index 3fb14b48aa..7645262cee 100644
--- a/sysdeps/unix/sysv/linux/clock_nanosleep.c
+++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005, 2006 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,7 +20,7 @@
 #include <errno.h>
 
 #include <sysdep-cancel.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include "kernel-posix-cpu-timers.h"
 
 
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 5d19a09bf8..31ba0225fb 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
 
 #include <sysdep.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __ASSUME_POSIX_TIMERS
diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c
index b38d0c4238..fcac5ae240 100644
--- a/sysdeps/unix/sysv/linux/dl-execstack.c
+++ b/sysdeps/unix/sysv/linux/dl-execstack.c
@@ -1,5 +1,5 @@
 /* Stack executability handling for GNU dynamic linker.  Linux version.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 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 @@
 #include <caller.h>
 #include <sysdep.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 extern int __stack_prot attribute_relro attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index a8291c3c1c..6cc0550f3f 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -1,5 +1,5 @@
 /* Operating system specific code for generic dynamic loader functions.  Linux.
-   Copyright (C) 2000,2001,2002,2004,2005 Free Software Foundation, Inc.
+   Copyright (C) 2000,2001,2002,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <dl-sysdep.h>
 #include <stdint.h>
 #include <hp-timing.h>
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
index acc2441051..42aec77e82 100644
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -1,5 +1,5 @@
 /* Dynamic linker system dependencies for Linux.
-   Copyright (C) 1995, 1997, 2001, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995,1997,2001,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 
 #include <unistd.h>
 #include <ldsodefs.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define DL_SYSDEP_INIT frob_brk ()
 
diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
index 18f2f6dc7b..24c0a8fedc 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
@@ -1,5 +1,6 @@
 /* Return information about the filesystem on which FD resides.
-   Copyright (C) 1996,1997,1998,2000,2001,2004 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,2000,2001,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +23,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
diff --git a/sysdeps/unix/sysv/linux/ftruncate64.c b/sysdeps/unix/sysv/linux/ftruncate64.c
index 4c60a1f19a..2aa4ad54be 100644
--- a/sysdeps/unix/sysv/linux/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/ftruncate64.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997,1998,1999,2000,2001,2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2001,2003,2005,2006
+	 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
@@ -24,7 +25,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_ftruncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c
index 0c4be2b67f..b307c3ff64 100644
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@@ -1,5 +1,5 @@
 /* futimes -- change access and modification times of open file.  Linux version.
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002,2003,2005,2006 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
@@ -25,7 +25,7 @@
 #include <stdio-common/_itoa.h>
 #include <fcntl.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1], but do not follow symlinks.
@@ -88,6 +88,9 @@ __futimes (int fd, const struct timeval tvp[2])
       case ENOENT:
 	/* Validate the file descriptor by letting fcntl set errno to
 	   EBADF if it's bogus.  Otherwise it's a /proc issue.  */
+#if !defined __NR_fcntl && defined __NR_fcntl64
+# define __NR_fcntl __NR_fcntl64
+#endif
 	if (INLINE_SYSCALL (fcntl, 3, fd, F_GETFD, 0) != -1)
 	  __set_errno (ENOSYS);
 	break;
diff --git a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c
index 8a87cc442b..be148b8d7a 100644
--- a/sysdeps/unix/sysv/linux/futimesat.c
+++ b/sysdeps/unix/sysv/linux/futimesat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 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
@@ -24,7 +24,7 @@
 #include <utime.h>
 #include <sys/time.h>
 #include <sysdep.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 /* Change the access time of FILE relative to FD to TVP[0] and
diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index f443adf7da..6bc560152c 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -1,5 +1,5 @@
 /* fxstat64 using old-style Unix fstat system call.
-   Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002, 2003, 2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c
index 31113d5db5..83a8816697 100644
--- a/sysdeps/unix/sysv/linux/fxstatat64.c
+++ b/sysdeps/unix/sysv/linux/fxstatat64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c
index 9695d8a035..1a308ca38f 100644
--- a/sysdeps/unix/sysv/linux/getcwd.c
+++ b/sysdeps/unix/sysv/linux/getcwd.c
@@ -1,5 +1,6 @@
 /* Determine current working directory.  Linux version.
-   Copyright (C) 1997,1998,1999,2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -28,7 +29,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 /* If we compile the file for use in ld.so we don't need the feature
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index d473486de8..963b40d91d 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-2003, 2004, 2006 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,7 +33,7 @@
 
 #include <linux/posix_types.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getdents64
 # ifndef __ASSUME_GETDENTS64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/hppa/Dist b/sysdeps/unix/sysv/linux/hppa/Dist
deleted file mode 100644
index 2954d3c4bf..0000000000
--- a/sysdeps/unix/sysv/linux/hppa/Dist
+++ /dev/null
@@ -1,5 +0,0 @@
-umount.c
-kernel_stat.h
-kernel_sigaction.h
-clone.S
-sys/procfs.h
diff --git a/sysdeps/unix/sysv/linux/i386/Dist b/sysdeps/unix/sysv/linux/i386/Dist
deleted file mode 100644
index 70253ac9e8..0000000000
--- a/sysdeps/unix/sysv/linux/i386/Dist
+++ /dev/null
@@ -1,17 +0,0 @@
-bp-thunks.h
-clone.S
-olddirent.h
-oldgetrlimit64.c
-setresuid.c
-setresgid.c
-setfsuid.c
-setfsgid.c
-sys/debugreg.h
-sys/elf.h
-sys/io.h
-sys/perm.h
-sys/procfs.h
-sys/reg.h
-sys/user.h
-sys/vm86.h
-ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c
index 31a6e0f08a..fc6a9c95a1 100644
--- a/sysdeps/unix/sysv/linux/i386/chown.c
+++ b/sysdeps/unix/sysv/linux/i386/chown.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998,1999,2000,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,1999,2000,2002,2003,2004,2006
+	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
@@ -25,7 +26,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /*
   In Linux 2.1.x the chown functions have been changed.  A new function lchown
diff --git a/sysdeps/unix/sysv/linux/i386/fchown.c b/sysdeps/unix/sysv/linux/i386/fchown.c
index 1f2e389844..30299c9609 100644
--- a/sysdeps/unix/sysv/linux/i386/fchown.c
+++ b/sysdeps/unix/sysv/linux/i386/fchown.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <sys/syscall.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_fchown32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/i386/fchownat.c b/sysdeps/unix/sysv/linux/i386/fchownat.c
index eb74fad8e0..b2bac1913f 100644
--- a/sysdeps/unix/sysv/linux/i386/fchownat.c
+++ b/sysdeps/unix/sysv/linux/i386/fchownat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /*
   In Linux 2.1.x the chown functions have been changed.  A new function lchown
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index 210faba2a7..b27373d24b 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 
 #include <sys/syscall.h>
-#include "../kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_FCNTL64 == 0
 /* This variable is shared with all files that check for fcntl64.  */
diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c
index 40787b99e7..281839f964 100644
--- a/sysdeps/unix/sysv/linux/i386/fxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/fxstat.c
@@ -1,5 +1,6 @@
 /* fxstat using old-style Unix fstat system call.
-   Copyright (C) 1991,1995-1998,2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995-1998,2000,2002,2003,2006
+	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,7 +31,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #include <xstatconv.h>
 
diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c b/sysdeps/unix/sysv/linux/i386/fxstatat.c
index d5bc6021bc..d982cfb454 100644
--- a/sysdeps/unix/sysv/linux/i386/fxstatat.c
+++ b/sysdeps/unix/sysv/linux/i386/fxstatat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #include <xstatconv.h>
 
diff --git a/sysdeps/unix/sysv/linux/i386/getegid.c b/sysdeps/unix/sysv/linux/i386/getegid.c
index c54133b359..31c10cc32f 100644
--- a/sysdeps/unix/sysv/linux/i386/getegid.c
+++ b/sysdeps/unix/sysv/linux/i386/getegid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2006 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
@@ -21,7 +21,7 @@
 
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getegid32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/i386/geteuid.c b/sysdeps/unix/sysv/linux/i386/geteuid.c
index 8d56f6c7f8..53f52687a4 100644
--- a/sysdeps/unix/sysv/linux/i386/geteuid.c
+++ b/sysdeps/unix/sysv/linux/i386/geteuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2006 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
@@ -21,7 +21,7 @@
 
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_geteuid32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/i386/getgid.c b/sysdeps/unix/sysv/linux/i386/getgid.c
index 0ff63580f6..7a7e38d9c0 100644
--- a/sysdeps/unix/sysv/linux/i386/getgid.c
+++ b/sysdeps/unix/sysv/linux/i386/getgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getgid32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/i386/getresgid.c b/sysdeps/unix/sysv/linux/i386/getresgid.c
index ea3318e7f5..393195619f 100644
--- a/sysdeps/unix/sysv/linux/i386/getresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/getresgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2005,2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getresgid
 
diff --git a/sysdeps/unix/sysv/linux/i386/getresuid.c b/sysdeps/unix/sysv/linux/i386/getresuid.c
index b2783d075c..ddd25341b2 100644
--- a/sysdeps/unix/sysv/linux/i386/getresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/getresuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2005,2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getresuid
 
diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c
index 38b369bc4f..59951ac100 100644
--- a/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003, 2006 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
@@ -24,7 +24,7 @@
 #include <shlib-compat.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 extern int __new_getrlimit (enum __rlimit_resource resource,
 			    struct rlimit *__unbounded rlimits);
diff --git a/sysdeps/unix/sysv/linux/i386/getuid.c b/sysdeps/unix/sysv/linux/i386/getuid.c
index 3e5c901ec5..d7be0c3cde 100644
--- a/sysdeps/unix/sysv/linux/i386/getuid.c
+++ b/sysdeps/unix/sysv/linux/i386/getuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_getuid32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/i386/lchown.c b/sysdeps/unix/sysv/linux/i386/lchown.c
index 57226277c1..fbba0bf1d1 100644
--- a/sysdeps/unix/sysv/linux/i386/lchown.c
+++ b/sysdeps/unix/sysv/linux/i386/lchown.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2000,2003,2005,2006 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
@@ -24,7 +24,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_lchown
 # ifdef __NR_lchown32
diff --git a/sysdeps/unix/sysv/linux/i386/lockf64.c b/sysdeps/unix/sysv/linux/i386/lockf64.c
index e066cb26e1..8b568ff4a3 100644
--- a/sysdeps/unix/sysv/linux/i386/lockf64.c
+++ b/sysdeps/unix/sysv/linux/i386/lockf64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1994,1996,1997,1998,1999,2000,2003,2006
+	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
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sysdep.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c
index 65ea0bbed0..5cc96127b5 100644
--- a/sysdeps/unix/sysv/linux/i386/lxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/lxstat.c
@@ -1,6 +1,6 @@
 /* lxstat using old-style Unix lstat system call.
-   Copyright (C) 1991, 1995, 1996, 1997, 1998, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1991,1995,1996,1997,1998,2000,2002,2003,2006
+	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
@@ -31,7 +31,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #include <xstatconv.h>
 
diff --git a/sysdeps/unix/sysv/linux/i386/mmap.S b/sysdeps/unix/sysv/linux/i386/mmap.S
index 10f8bc75a7..a1481feeb5 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap.S
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,96,97,98,99,2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995,96,97,98,99,2000,2002,2005,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,7 +19,7 @@
 
 #include <sysdep.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define EINVAL	22
 
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index 4209453819..f53e6e8c68 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,96,97,98,99,2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995,96,97,98,99,2000,2002,2005,2006
+	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,7 +21,7 @@
 #include <bp-sym.h>
 #include <bp-asm.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define EINVAL	22
 #define ENOSYS	38
diff --git a/sysdeps/unix/sysv/linux/i386/msgctl.c b/sysdeps/unix/sysv/linux/i386/msgctl.c
index 108da8a987..afecc49dd7 100644
--- a/sysdeps/unix/sysv/linux/i386/msgctl.c
+++ b/sysdeps/unix/sysv/linux/i386/msgctl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <shlib-compat.h>
 
 struct __old_msqid_ds
diff --git a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
index dc82582fa0..092a3bfb97 100644
--- a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
+++ b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-2000,2002,2003,2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2000,2002,2003,2004,2005,2006
+	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,7 +21,7 @@
 #include <bp-sym.h>
 #include <bp-asm.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define EINVAL	22
 #define ENOSYS	38
diff --git a/sysdeps/unix/sysv/linux/i386/semctl.c b/sysdeps/unix/sysv/linux/i386/semctl.c
index 14bfac613c..1693cd47c4 100644
--- a/sysdeps/unix/sysv/linux/i386/semctl.c
+++ b/sysdeps/unix/sysv/linux/i386/semctl.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -26,7 +27,7 @@
 #include <string.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <shlib-compat.h>
 
 struct __old_semid_ds
diff --git a/sysdeps/unix/sysv/linux/i386/setegid.c b/sysdeps/unix/sysv/linux/i386/setegid.c
index b4bf33f18f..755bc360ad 100644
--- a/sysdeps/unix/sysv/linux/i386/setegid.c
+++ b/sysdeps/unix/sysv/linux/i386/setegid.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000,2002,2003,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +20,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <setxid.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setresgid
diff --git a/sysdeps/unix/sysv/linux/i386/seteuid.c b/sysdeps/unix/sysv/linux/i386/seteuid.c
index c139684d04..6de173521c 100644
--- a/sysdeps/unix/sysv/linux/i386/seteuid.c
+++ b/sysdeps/unix/sysv/linux/i386/seteuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <setxid.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setresuid
diff --git a/sysdeps/unix/sysv/linux/i386/setfsgid.c b/sysdeps/unix/sysv/linux/i386/setfsgid.c
index b98514d5be..7296d433ca 100644
--- a/sysdeps/unix/sysv/linux/i386/setfsgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setfsgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setfsgid
diff --git a/sysdeps/unix/sysv/linux/i386/setfsuid.c b/sysdeps/unix/sysv/linux/i386/setfsuid.c
index f7cf89bf14..65ed353480 100644
--- a/sysdeps/unix/sysv/linux/i386/setfsuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setfsuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2003, 2006 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
@@ -24,7 +24,7 @@
 #include <sys/syscall.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_setfsuid
 
diff --git a/sysdeps/unix/sysv/linux/i386/setgid.c b/sysdeps/unix/sysv/linux/i386/setgid.c
index a7cdba582d..208ef25d0e 100644
--- a/sysdeps/unix/sysv/linux/i386/setgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2003, 2004, 2006 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,7 +20,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setgid32
diff --git a/sysdeps/unix/sysv/linux/i386/setgroups.c b/sysdeps/unix/sysv/linux/i386/setgroups.c
index a2c6fc8daa..10f5b7c91b 100644
--- a/sysdeps/unix/sysv/linux/i386/setgroups.c
+++ b/sysdeps/unix/sysv/linux/i386/setgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2000,2002,2004,2006 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 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setgroups32
diff --git a/sysdeps/unix/sysv/linux/i386/setregid.c b/sysdeps/unix/sysv/linux/i386/setregid.c
index f20a78175a..05e448c6c9 100644
--- a/sysdeps/unix/sysv/linux/i386/setregid.c
+++ b/sysdeps/unix/sysv/linux/i386/setregid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2003,2004,2006 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,7 +20,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setregid32
diff --git a/sysdeps/unix/sysv/linux/i386/setresgid.c b/sysdeps/unix/sysv/linux/i386/setresgid.c
index fd0dfb342a..d0750bb203 100644
--- a/sysdeps/unix/sysv/linux/i386/setresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresgid.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2004,2005,2006
+	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,7 +21,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #if defined __NR_setresgid || defined __NR_setresgid32
diff --git a/sysdeps/unix/sysv/linux/i386/setresuid.c b/sysdeps/unix/sysv/linux/i386/setresuid.c
index c5651bf85a..0a676e53a9 100644
--- a/sysdeps/unix/sysv/linux/i386/setresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresuid.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2004,2005,2006
+	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,7 +21,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #if defined __NR_setresuid || defined __NR_setresuid32
diff --git a/sysdeps/unix/sysv/linux/i386/setreuid.c b/sysdeps/unix/sysv/linux/i386/setreuid.c
index 09717ec52a..1ea449616c 100644
--- a/sysdeps/unix/sysv/linux/i386/setreuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setreuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2003,2004,2006 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,7 +20,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setreuid32
diff --git a/sysdeps/unix/sysv/linux/i386/setrlimit.c b/sysdeps/unix/sysv/linux/i386/setrlimit.c
index 4d23209f62..e7e517d914 100644
--- a/sysdeps/unix/sysv/linux/i386/setrlimit.c
+++ b/sysdeps/unix/sysv/linux/i386/setrlimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003, 2006 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
@@ -25,7 +25,7 @@
 #include <shlib-compat.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 extern int __new_setrlimit (enum __rlimit_resource resource,
 			    const struct rlimit *__unboundedrlimits);
diff --git a/sysdeps/unix/sysv/linux/i386/setuid.c b/sysdeps/unix/sysv/linux/i386/setuid.c
index f809948f59..21c5bcd615 100644
--- a/sysdeps/unix/sysv/linux/i386/setuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2003,2004,2006 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,7 +20,7 @@
 #include <unistd.h>
 #include <setxid.h>
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __NR_setuid32
diff --git a/sysdeps/unix/sysv/linux/i386/shmctl.c b/sysdeps/unix/sysv/linux/i386/shmctl.c
index 394d3c01cf..2cc039996c 100644
--- a/sysdeps/unix/sysv/linux/i386/shmctl.c
+++ b/sysdeps/unix/sysv/linux/i386/shmctl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -27,7 +27,7 @@
 #include <bits/wordsize.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <shlib-compat.h>
 
 struct __old_shmid_ds
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c
index 7c41d8cefa..d27ecd3126 100644
--- a/sysdeps/unix/sysv/linux/i386/xstat.c
+++ b/sysdeps/unix/sysv/linux/i386/xstat.c
@@ -1,5 +1,6 @@
 /* xstat using old-style Unix stat system call.
-   Copyright (C) 1991,95,96,97,98,2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1991,95,96,97,98,2000,2002,2003,2006
+	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,7 +31,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #include <xstatconv.h>
 
diff --git a/sysdeps/unix/sysv/linux/ia64/Dist b/sysdeps/unix/sysv/linux/ia64/Dist
deleted file mode 100644
index b4118bdead..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/Dist
+++ /dev/null
@@ -1,13 +0,0 @@
-clone.S
-clone2.S
-dl-brk.S
-dl-static.c
-has_cpuclock.c
-ioperm.c
-ldd-rewrite.sed
-__start_context.S
-ucontext_i.h
-sys/procfs.h
-sys/io.h
-sys/rse.h
-sys/user.h
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 2fc992e812..dd7a5b1b1d 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
+/* Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jes Sorensen, <Jes.Sorensen@cern.ch>, April 1999.
@@ -205,8 +205,7 @@
     register long _r8 __asm ("r8");					      \
     register long _r10 __asm ("r10");					      \
     register long _r15 __asm ("r15") = name;				      \
-    register void *_b7 __asm ("b7")					      \
-      = ((tcbhead_t *) __thread_self)->__private;			      \
+    register void *_b7 __asm ("b7") = ((tcbhead_t *)__thread_self)->__private;\
     long _retval;							      \
     LOAD_REGS_##nr							      \
     /*									      \
diff --git a/sysdeps/unix/sysv/linux/ifreq.c b/sysdeps/unix/sysv/linux/ifreq.c
index 43d54014bc..d7e442c277 100644
--- a/sysdeps/unix/sysv/linux/ifreq.c
+++ b/sysdeps/unix/sysv/linux/ifreq.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2002,2003,2004,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>.
 
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include "ifreq.h"
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* Variable to signal whether SIOCGIFCONF is not available.  */
 #if __ASSUME_SIOCGIFNAME == 0 || 1
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 3bc5dc03c2..b28cb73626 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -111,7 +111,8 @@
 
 /* On sparc and ARM the truncate64/ftruncate64/mmap2/stat64/lstat64/fstat64
    syscalls were introduced in 2.3.35.  */
-#if __LINUX_KERNEL_VERSION >= 131875 && (defined __sparc__ || defined __arm__)
+#if __LINUX_KERNEL_VERSION >= 131875 \
+    && ((defined __sparc__ && !defined __arch64__) || defined __arm__)
 # define __ASSUME_TRUNCATE64_SYSCALL	1
 # define __ASSUME_MMAP2_SYSCALL		1
 # define __ASSUME_STAT64_SYSCALL	1
@@ -449,3 +450,9 @@
 #if __LINUX_KERNEL_VERSION >= 0x020609 && defined __alpha__
 #define __ASSUME_IEEE_RAISE_EXCEPTION	1
 #endif
+
+/* On sparc64 stat64/lstat64/fstat64 syscalls were introduced in 2.6.12.  */
+#if __LINUX_KERNEL_VERSION >= 0x02060c && defined __sparc__ \
+    && defined __arch64__
+# define __ASSUME_STAT64_SYSCALL	1
+#endif
diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h
index c5fd854d70..0bdca3c3fd 100644
--- a/sysdeps/unix/sysv/linux/ldsodefs.h
+++ b/sysdeps/unix/sysv/linux/ldsodefs.h
@@ -1,5 +1,5 @@
 /* Run-time dynamic linker data structures for loaded ELF shared objects.
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 
 #ifndef	_LDSODEFS_H
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* Get the real definitions.  */
 #include_next <ldsodefs.h>
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 4e80469572..7444dfe0d9 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -1,5 +1,5 @@
 /* lxstat64 using old-style Unix lstat system call.
-   Copyright (C) 1997-2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002,2003,2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
diff --git a/sysdeps/unix/sysv/linux/m68k/Dist b/sysdeps/unix/sysv/linux/m68k/Dist
deleted file mode 100644
index 35fad7ff0e..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/Dist
+++ /dev/null
@@ -1,9 +0,0 @@
-clone.S
-mremap.S
-oldgetrlimit64.c
-setresuid.c
-setresgid.c
-setfsuid.c
-setfsgid.c
-sys/reg.h
-sys/procfs.h
diff --git a/sysdeps/unix/sysv/linux/m68k/chown.c b/sysdeps/unix/sysv/linux/m68k/chown.c
index 735fa5780a..e7193dc23b 100644
--- a/sysdeps/unix/sysv/linux/m68k/chown.c
+++ b/sysdeps/unix/sysv/linux/m68k/chown.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2006 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
@@ -24,7 +24,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_chown32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/m68k/fchownat.c b/sysdeps/unix/sysv/linux/m68k/fchownat.c
index 0da8cd8082..6cc093222d 100644
--- a/sysdeps/unix/sysv/linux/m68k/fchownat.c
+++ b/sysdeps/unix/sysv/linux/m68k/fchownat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_chown32
 # if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/mips/Dist b/sysdeps/unix/sysv/linux/mips/Dist
deleted file mode 100644
index 1d74119a6d..0000000000
--- a/sysdeps/unix/sysv/linux/mips/Dist
+++ /dev/null
@@ -1,13 +0,0 @@
-_test_and_set.c
-clone.S
-entry.h
-ipc_priv.h
-kernel_sigaction.h
-kernel_stat.h
-kernel_termios.h
-sys/cachectl.h
-sys/procfs.h
-sys/sysmips.h
-sys/tas.h
-sys/user.h
-xstatconv.c
diff --git a/sysdeps/unix/sysv/linux/mips/ftruncate64.c b/sysdeps/unix/sysv/linux/mips/ftruncate64.c
index 11e242570d..a46e22f828 100644
--- a/sysdeps/unix/sysv/linux/mips/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/mips/ftruncate64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005,2006
+	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
@@ -25,7 +25,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_ftruncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/Dist b/sysdeps/unix/sysv/linux/mips/mips64/Dist
deleted file mode 100644
index b8fa28f0a4..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/Dist
+++ /dev/null
@@ -1 +0,0 @@
-ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/mips/sigaction.c b/sysdeps/unix/sysv/linux/mips/sigaction.c
index 09fbe79316..8e2ca42bb4 100644
--- a/sysdeps/unix/sysv/linux/mips/sigaction.c
+++ b/sysdeps/unix/sysv/linux/mips/sigaction.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997,1998,1999,2000,2002,2003, 2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 
 #include <sgidefs.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* The difference here is that the sigaction structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/sysdeps/unix/sysv/linux/mips/truncate64.c b/sysdeps/unix/sysv/linux/mips/truncate64.c
index d01d25b077..01cc148be9 100644
--- a/sysdeps/unix/sysv/linux/mips/truncate64.c
+++ b/sysdeps/unix/sysv/linux/mips/truncate64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2005,2006
+   	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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_truncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index 7e9e9498cb..d3c68cd106 100644
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2002,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
 
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_mmap2
 
diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c
index 700591b2d3..86fd34cf8c 100644
--- a/sysdeps/unix/sysv/linux/msgctl.c
+++ b/sysdeps/unix/sysv/linux/msgctl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2002, 2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2002,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -28,7 +28,7 @@
 #include <shlib-compat.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_msqid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h
index 6b2d858c9d..92310b77df 100644
--- a/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ b/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 struct netlink_res
diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c
index 26acae814a..c7671dc170 100644
--- a/sysdeps/unix/sysv/linux/opendir.c
+++ b/sysdeps/unix/sysv/linux/opendir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #ifdef __ASSUME_O_DIRECTORY
diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c
index 4c4868645b..a745fbcbc0 100644
--- a/sysdeps/unix/sysv/linux/poll.c
+++ b/sysdeps/unix/sysv/linux/poll.c
@@ -1,5 +1,6 @@
 /* Poll system call, with emulation if it is not available.
-   Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2001,2002,2006
+	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
@@ -24,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_poll || __ASSUME_POLL_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/Dist b/sysdeps/unix/sysv/linux/powerpc/Dist
deleted file mode 100644
index f36d3685f6..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/Dist
+++ /dev/null
@@ -1,8 +0,0 @@
-dl-brk.S
-ipc_priv.h
-kernel_termios.h
-ldd-rewrite.sed
-oldgetrlimit64.c
-sys/procfs.h
-sys/ptrace.h
-sys/user.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/aix/Dist b/sysdeps/unix/sysv/linux/powerpc/aix/Dist
deleted file mode 100644
index 64de6ace3e..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/aix/Dist
+++ /dev/null
@@ -1,7 +0,0 @@
-aix-dirent.h
-aix-errno.h
-aix-stat.h
-aix-termios.h
-direntconv.c
-errnoconv.c
-statconv.c
diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
index a548a96325..7c02c68985 100644
--- a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
@@ -1,5 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Linux/PPC version.
-   Copyright (C) 1997, 1998, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2001, 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,9 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-
-#include "config.h"
-#include "kernel-features.h"
+#include <config.h>
+#include <kernel-features.h>
 #include <ldsodefs.h>
 
 extern int __cache_line_size;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist
deleted file mode 100644
index 297e031620..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist
+++ /dev/null
@@ -1,3 +0,0 @@
-clone.S
-kernel_stat.h
-fe_nomask.c
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S
index 21ad98e501..e945834945 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S
@@ -1,5 +1,5 @@
 /* brk system call for Linux/ppc.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-97, 1999, 2000, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ERRNO_H	1
@@ -27,32 +27,34 @@
 	.section ".text"
 ENTRY (BP_SYM (__brk))
 	DISCARD_BOUNDS (r3)	/* the bounds are meaningless, so toss 'em */
-
+	mflr	r0
 	stwu    r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 	stw	r3,8(r1)
+	stw	r0,20(r1)
+	cfi_offset (lr, 4)
 	DO_CALL(SYS_ify(brk))
 	lwz     r6,8(r1)
 #ifdef PIC
-	mflr    r4
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,1f
 1:	mflr	r5
 	addis	r5,r5,__curbrk-1b@ha
-	mtlr	r4
 	stw	r3,__curbrk-1b@l(r5)
 # else
 	bl      _GLOBAL_OFFSET_TABLE_@local-4
 	mflr    r5
 	lwz     r5,__curbrk@got(r5)
-	mtlr    r4
 	stw     r3,0(r5)
 # endif
 #else
 	lis     r4,__curbrk@ha
 	stw     r3,__curbrk@l(r4)
 #endif
+	lwz	r0,20(r1)
 	cmplw   r6,r3
 	addi    r1,r1,16
+	mtlr	r0
 	li	r3,0
 	blelr+
 	li      r3,ENOMEM
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
index 43d44ea418..f4c92ad7c7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
@@ -1,5 +1,5 @@
 /* Wrapper around clone system call.
-   Copyright (C) 1997,98,99,2000,02,2004 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,02,04,2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ERRNO_H	1
@@ -49,6 +49,7 @@ ENTRY (BP_SYM (__clone))
 
 	/* Set up stack frame for parent.  */
 	stwu	r1,-32(r1)
+	cfi_adjust_cfa_offset (32)
 #ifdef RESET_PID
 	stmw	r28,16(r1)
 #else
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c
index 2c85a3a9e9..8d3b9ad1f4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fe_nomask.c
@@ -1,5 +1,5 @@
 /* Procedure definition for FE_NOMASK_ENV for Linux/ppc.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,11 +23,11 @@
 #include <unistd.h>
 #include <sysdep.h>
 #include <sys/prctl.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_NEW_PRCTL_SYSCALL == 0
 /* This is rather fiddly under Linux.  We don't have direct access,
-   and there is no system call, but we can change the bits 
+   and there is no system call, but we can change the bits
    in a signal handler's context...  */
 
 static struct sigaction oact;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
index cf61b01a54..e83f7f04b7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2002,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_ftruncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S
index 0e04e4bb59..c28c34664c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S
@@ -1,5 +1,5 @@
 /* Save current context, powerpc32 common.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 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
@@ -40,6 +40,7 @@
 #endif
 ENTRY(__CONTEXT_FUNC_NAME)
 	stwu	r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 /* Insure that the _UC_REGS start on a quadword boundary.  */
 	stw	r3,_FRAME_PARM_SAVE1(r1)
 	addi	r3,r3,_UC_REG_SPACE+12
@@ -55,6 +56,7 @@ ENTRY(__CONTEXT_FUNC_NAME)
 	stw	r0,_UC_GREGS+(PT_LNK*4)(r3)
 	stw	r0,_UC_GREGS+(PT_NIP*4)(r3)
 	stw	r0,_FRAME_LR_SAVE+16(r1)
+	cfi_offset (lr, _FRAME_LR_SAVE)
 	stw	r5,_UC_GREGS+(PT_R5*4)(r3)
 	stw	r6,_UC_GREGS+(PT_R6*4)(r3)
 	stw	r7,_UC_GREGS+(PT_R7*4)(r3)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
index b220f631ec..208a375ef3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
@@ -1,5 +1,5 @@
 /* Set up a context to call a function.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <shlib-compat.h>
@@ -49,10 +49,12 @@ ENTRY(__makecontext)
 	/* Set the function's LR to point to the exitcode below. */
 #ifdef PIC
 	mflr	r0
+	cfi_register(lr,r0)
 	bl	1f
 1:	mflr	r6
 	addi	r6,r6,L(exitcode)-1b
 	mtlr	r0
+	cfi_same_value (lr)
 #else
 	lis	r6,L(exitcode)@ha
 	addi	r6,r6,L(exitcode)@l
@@ -136,10 +138,12 @@ ENTRY(__novec_makecontext)
 	/* Set the function's LR to point to the exitcode below. */
 #ifdef PIC
 	mflr	r0
+	cfi_register(lr,r0)
 	bl	1f
 1:	mflr	r6
 	addi	r6,r6,L(novec_exitcode)-1b
 	mtlr	r0
+	cfi_same_value (lr)
 #else
 	lis	r6,L(novec_exitcode)@ha
 	addi	r6,r6,L(novec_exitcode)@l
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c
index 495c98ab97..4d9fa263c4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
@@ -58,7 +58,7 @@ __libc_pread (fd, buf, count, offset)
 
       return result;
     }
-  
+
   int oldtype = LIBC_CANCEL_ASYNC ();
 
   /* On PPC32 64bit values are aligned in odd/even register pairs.  */
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c
index d4fe1eea2d..9527554e9b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c
index 3727fa7a42..32383f4301 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c
index 080c88cf29..acc250a88f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S
index c71fcd73d5..1a5251d100 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S
@@ -1,5 +1,5 @@
 /* Jump to a new context powerpc32 common.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 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
@@ -41,7 +41,9 @@
 ENTRY(__CONTEXT_FUNC_NAME)
 	mflr	r0
 	stwu	r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 	stw	r0,20(r1)
+	cfi_offset (lr, _FRAME_LR_SAVE)
 	stw	r31,12(r1)
 	lwz	r31,_UC_REGS_PTR(r3)
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S
index 8b2998b8fd..0c7b945ed2 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S
@@ -1,5 +1,5 @@
 /* Save current context and jump to a new context.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 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
@@ -40,6 +40,7 @@
 #endif
 ENTRY(__CONTEXT_FUNC_NAME)
 	stwu	r1,-16(r1)
+	cfi_adjust_cfa_offset (16)
 /* Insure that the _UC_REGS start on a quadword boundary.  */
 	stw	r3,_FRAME_PARM_SAVE1(r1)
 	addi	r3,r3,_UC_REG_SPACE+12
@@ -56,6 +57,7 @@ ENTRY(__CONTEXT_FUNC_NAME)
 	stw	r0,_UC_GREGS+(PT_LNK*4)(r3)
 	stw	r0,_UC_GREGS+(PT_NIP*4)(r3)
 	stw	r0,_FRAME_LR_SAVE+16(r1)
+	cfi_offset (lr, _FRAME_LR_SAVE)
 	stw	r5,_UC_GREGS+(PT_R5*4)(r3)
 	stw	r6,_UC_GREGS+(PT_R6*4)(r3)
 	stw	r7,_UC_GREGS+(PT_R7*4)(r3)
@@ -309,13 +311,12 @@ ENTRY(__CONTEXT_FUNC_NAME)
 	bl      _GLOBAL_OFFSET_TABLE_@local-4
 	mflr    r7
 #   endif
+	mtlr    r8
 #   ifdef SHARED
 	lwz     r7,_rtld_global_ro@got(r7)
-	mtlr    r8
 	lwz     r7,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r7)
 #   else
 	lwz     r7,_dl_hwcap@got(r7)
-	mtlr    r8
 	lwz     r7,0(r7)
 #   endif
 #  else
@@ -467,7 +468,6 @@ ENTRY(__CONTEXT_FUNC_NAME)
 	mtcr	r5
 
 	/* Restore the general registers */
-	lwz	r1,_UC_GREGS+(PT_R1*4)(r31)
 	lwz	r3,_UC_GREGS+(PT_R3*4)(r31)
 	lwz	r4,_UC_GREGS+(PT_R4*4)(r31)
 	lwz	r5,_UC_GREGS+(PT_R5*4)(r31)
@@ -496,6 +496,7 @@ ENTRY(__CONTEXT_FUNC_NAME)
 	lwz	r28,_UC_GREGS+(PT_R28*4)(r31)
 	lwz	r29,_UC_GREGS+(PT_R29*4)(r31)
 	lwz	r30,_UC_GREGS+(PT_R30*4)(r31)
+	lwz	r1,_UC_GREGS+(PT_R1*4)(r31)
 	lwz	r31,_UC_GREGS+(PT_R31*4)(r31)
 
 	bctr
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
index af6fa548dd..f107e84373 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997,1998,1999,2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2005,2006
+	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
@@ -24,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_truncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist
deleted file mode 100644
index 6085928f34..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-clone.S
-fe_nomask.c
-kernel_stat.h
-ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S
index 3f74f55271..f2ac00d4c7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S
@@ -1,5 +1,5 @@
 /* brk system call for Linux.  PowerPC64 version.
-   Copyright (C) 1995,96,97,99, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,99, 2000,02, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ERRNO_H	1
@@ -33,6 +33,7 @@ ENTRY (BP_SYM (__brk))
 	DISCARD_BOUNDS (r3)	/* the bounds are meaningless, so toss 'em.  */
 
 	stdu    r1,-64(r1)
+	cfi_adjust_cfa_offset (64)
 	std	r3,48(r1)
 	DO_CALL(SYS_ify(brk))
 	ld     r6,48(r1)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
index 287597c480..a0f018ba41 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
@@ -1,5 +1,5 @@
 /* Wrapper around clone system call.  PowerPC64 version.
-   Copyright (C) 1997,98,99,2000,02, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,02,04, 2006 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
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #define _ERRNO_H	1
@@ -48,6 +48,7 @@ ENTRY (BP_SYM (__clone))
 
 	/* Set up stack frame for parent.  */
 	stdu	r1,-80(r1)
+	cfi_adjust_cfa_offset (80)
 	std	r29,56(r1)
 	std	r30,64(r1)
 	std	r31,72(r1)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c
index 7571f28780..62f735514a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fe_nomask.c
@@ -1,5 +1,5 @@
 /* Procedure definition for FE_NOMASK_ENV for Linux/ppc64.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 #include <sys/prctl.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 const fenv_t *
 __fe_nomask_env (void)
@@ -36,7 +36,7 @@ __fe_nomask_env (void)
       && INTERNAL_SYSCALL_ERRNO (result, err) == EINVAL)
     __set_errno (ENOSYS);
 # endif
-#else  
+#else
   __set_errno (ENOSYS);
 #endif
   return FE_ENABLED_ENV;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S
index 61e0f8ed11..98b49ba1dc 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S
@@ -1,5 +1,5 @@
 /* Save current context.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 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
@@ -14,13 +14,13 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <rtld-global-offsets.h>
 #include <shlib-compat.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define __ASSEMBLY__
 #include <asm/ptrace.h>
@@ -37,9 +37,11 @@ ENTRY(__novec_getcontext)
   mflr  r0
   std  r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3)
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r3)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   std  r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r3)
   std  r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r3)
   std  r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r3)
@@ -140,6 +142,7 @@ ENTRY(__novec_getcontext)
   /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
   mflr r0
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu r1,-128(r1)
   li   r3,ENOSYS
   bl   JUMPTARGET(__syscall_error)
@@ -175,9 +178,11 @@ ENTRY(__getcontext)
   mflr  r0
   std  r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3)
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r3)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   std  r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r3)
   std  r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r3)
   std  r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r3)
@@ -387,7 +392,9 @@ L(has_no_vec):
   /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
   mflr r0
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   li   r3,ENOSYS
   bl   JUMPTARGET(__syscall_error)
   nop
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
index cf71a6df19..4a82802d96 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
@@ -1,5 +1,5 @@
 /* Create new context.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 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
@@ -14,11 +14,11 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define __ASSEMBLY__
 #include <asm/ptrace.h>
@@ -41,7 +41,9 @@ ENTRY(__makecontext)
   /* Get the address of the target functions first parameter.  */
   addi  r6,r1,FRAME_PARM4_SAVE
   std   r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
 
   /* Get the ucontexts stack pointer and size.  Compute the top of stack
      and round down to a quadword boundary.  Then stack a dummy frame
@@ -168,7 +170,9 @@ L(gotexitcodeaddr):
   /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
   mflr r0
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   li   r3,ENOSYS
   bl   JUMPTARGET(__syscall_error)
   nop
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c
index d5b77e0b57..315d1195e8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
@@ -57,7 +57,7 @@ __libc_pread (fd, buf, count, offset)
 
       return result;
     }
-  
+
   int oldtype = LIBC_CANCEL_ASYNC ();
 
   result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count,
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c
index 9bbe389420..f775e1f1eb 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c
index 96b72e18a5..0f509154e2 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c
index 9e68acdf08..22224324a1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
index 7eaaad20a4..68fec9d2aa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
@@ -1,5 +1,5 @@
 /* Switch to context.
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006 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
@@ -14,13 +14,13 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <rtld-global-offsets.h>
 #include <shlib-compat.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define __ASSEMBLY__
 #include <asm/ptrace.h>
@@ -34,7 +34,9 @@ ENTRY(__novec_setcontext)
   mflr  r0
   std   r31,-8(1)
   std   r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   mr    r31,r3
 
 /*
@@ -200,7 +202,9 @@ ENTRY(__setcontext)
   mflr  r0
   std   r31,-8(1)
   std   r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   mr    r31,r3
 
 /*
@@ -443,7 +447,9 @@ L(do_sigret):
   /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
   mflr r0
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   li   r3,ENOSYS
   bl   JUMPTARGET(__syscall_error)
   nop
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
index 772adacfe4..5a128606ad 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
@@ -1,5 +1,5 @@
 /* Save current context and install the given one.
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006 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
@@ -14,13 +14,13 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA
+   02110-1301 USA.  */
 
 #include <sysdep.h>
 #include <rtld-global-offsets.h>
 #include <shlib-compat.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #define __ASSEMBLY__
 #include <asm/ptrace.h>
@@ -37,9 +37,11 @@ ENTRY(__novec_swapcontext)
   std   r31,-8(1)
   std  r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3)
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r3)
   std  r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3)
   stdu  r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   std  r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r3)
   std  r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r3)
   std  r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r3)
@@ -744,7 +746,9 @@ L(do_sigret):
   /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
   mflr r0
   std  r0,FRAME_LR_SAVE(r1)
+  cfi_offset (lr, FRAME_LR_SAVE)
   stdu r1,-128(r1)
+  cfi_adjust_cfa_offset (128)
   li   r3,ENOSYS
   bl   JUMPTARGET(__syscall_error)
   nop
diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c
index 90057f3f40..d459e98f2c 100644
--- a/sysdeps/unix/sysv/linux/pread.c
+++ b/sysdeps/unix/sysv/linux/pread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2000,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_pread64		/* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread
diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c
index 44ea68fa9f..07d8b68acc 100644
--- a/sysdeps/unix/sysv/linux/pread64.c
+++ b/sysdeps/unix/sysv/linux/pread64.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997,1998,1999,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_pread64		/* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread
diff --git a/sysdeps/unix/sysv/linux/prof-freq.c b/sysdeps/unix/sysv/linux/prof-freq.c
index 621a4c4d25..49ec257e70 100644
--- a/sysdeps/unix/sysv/linux/prof-freq.c
+++ b/sysdeps/unix/sysv/linux/prof-freq.c
@@ -1,5 +1,5 @@
 /* Determine realtime clock frequency.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 
 #include <sys/time.h>
 #include <libc-internal.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <ldsodefs.h>
 
 
diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c
index f4eb2f5544..7afb814518 100644
--- a/sysdeps/unix/sysv/linux/pwrite.c
+++ b/sysdeps/unix/sysv/linux/pwrite.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2000,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_pwrite64		/* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pwrite
diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c
index ae63ed0794..a0a6a08311 100644
--- a/sysdeps/unix/sysv/linux/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/pwrite64.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997,1998,1999,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -25,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_pwrite64		/* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pwrite
diff --git a/sysdeps/unix/sysv/linux/s390/Dist b/sysdeps/unix/sysv/linux/s390/Dist
deleted file mode 100644
index 4af39f72c9..0000000000
--- a/sysdeps/unix/sysv/linux/s390/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-ldd-rewrite.sed
-sys/elf.h
-sys/procfs.h
-sys/user.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Dist b/sysdeps/unix/sysv/linux/s390/s390-32/Dist
deleted file mode 100644
index c0a7dc8c93..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Dist
+++ /dev/null
@@ -1,7 +0,0 @@
-clone.S
-oldgetrlimit64.c
-setresuid.c
-setresgid.c
-setfsuid.c
-setfsgid.c
-ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/chown.c b/sysdeps/unix/sysv/linux/s390/s390-32/chown.c
index 0656b396f8..5909ba8a43 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/chown.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/chown.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000,2001,2002,2003,2004,2006 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
@@ -25,7 +25,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /*
   In Linux 2.1.x the chown functions have been changed.  A new function lchown
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c b/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c
index ac6006af81..d927d7ca0d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /*
   In Linux 2.1.x the chown functions have been changed.  A new function lchown
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c b/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c
index ccdb67b15c..1e64a0ef75 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/lchown.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2003, 2006 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
@@ -24,7 +24,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 # ifdef __NR_lchown32
 #  if __ASSUME_32BITUIDS == 0
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Dist b/sysdeps/unix/sysv/linux/s390/s390-64/Dist
deleted file mode 100644
index bfd4edc372..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-clone.S
-ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
index ecd23ce53e..2f5471f8f8 100644
--- a/sysdeps/unix/sysv/linux/semctl.c
+++ b/sysdeps/unix/sysv/linux/semctl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -28,7 +28,7 @@
 #include <sys/syscall.h>
 #include <shlib-compat.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_semid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/setegid.c b/sysdeps/unix/sysv/linux/setegid.c
index f87af0d16f..c0400aa121 100644
--- a/sysdeps/unix/sysv/linux/setegid.c
+++ b/sysdeps/unix/sysv/linux/setegid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <setxid.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #if defined __NR_setresgid || __ASSUME_SETRESGID_SYSCALL > 0
diff --git a/sysdeps/unix/sysv/linux/seteuid.c b/sysdeps/unix/sysv/linux/seteuid.c
index 5e5d1e184f..4a1a29eaa5 100644
--- a/sysdeps/unix/sysv/linux/seteuid.c
+++ b/sysdeps/unix/sysv/linux/seteuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998,1999,2002,2003,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <setxid.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #if defined __NR_setresuid || __ASSUME_SETRESUID_SYSCALL > 0
diff --git a/sysdeps/unix/sysv/linux/sh/Dist b/sysdeps/unix/sysv/linux/sh/Dist
deleted file mode 100644
index 8a1cdff7c5..0000000000
--- a/sysdeps/unix/sysv/linux/sh/Dist
+++ /dev/null
@@ -1,8 +0,0 @@
-clone.S
-pipe.S
-setresuid.c
-setresgid.c
-setfsuid.c
-setfsgid.c
-sys/io.h
-sys/user.h
diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c
index 5561cca36f..0fbddd9206 100644
--- a/sysdeps/unix/sysv/linux/shmctl.c
+++ b/sysdeps/unix/sysv/linux/shmctl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998,2000,2003,2004,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -29,7 +29,7 @@
 #include <shlib-compat.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 struct __old_shmid_ds
 {
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c
index a9ad6b18f3..7b44598c09 100644
--- a/sysdeps/unix/sysv/linux/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sigaction.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2000,2002,2003,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2000,2002,2003,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 /* The difference here is that the sigaction structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/sysdeps/unix/sysv/linux/sigpending.c b/sysdeps/unix/sysv/linux/sigpending.c
index c19da4c764..f0036c1139 100644
--- a/sysdeps/unix/sysv/linux/sigpending.c
+++ b/sysdeps/unix/sysv/linux/sigpending.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2003,2006
+	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
@@ -24,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 /* The variable is shared between all wrappers around signal handling
diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c
index 1573780d8e..1b13ea74de 100644
--- a/sysdeps/unix/sysv/linux/sigprocmask.c
+++ b/sysdeps/unix/sysv/linux/sigprocmask.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2001,2003,2004,2006 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
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 /* The variable is shared between all wrappers around signal handling
diff --git a/sysdeps/unix/sysv/linux/sigsuspend.c b/sysdeps/unix/sysv/linux/sigsuspend.c
index 0cf8d5083c..7b9b60911b 100644
--- a/sysdeps/unix/sysv/linux/sigsuspend.c
+++ b/sysdeps/unix/sysv/linux/sigsuspend.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2002,2003,2006
+	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
@@ -25,7 +25,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 #if !__ASSUME_REALTIME_SIGNALS
diff --git a/sysdeps/unix/sysv/linux/sparc/Dist b/sysdeps/unix/sysv/linux/sparc/Dist
deleted file mode 100644
index 174d053909..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-kernel_termios.h
-sys/trap.h
-ldd-rewrite.sed
-sys/procfs.h
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/setjmp.h b/sysdeps/unix/sysv/linux/sparc/bits/setjmp.h
index 7dc822929f..4fb7c90fd5 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/setjmp.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/setjmp.h
@@ -61,7 +61,7 @@ typedef struct __sparc64_jmp_buf
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(jmpbuf, address, demangle)			\
-  ((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_fp)
+  ((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_fp + 2047)
 
 #else
 
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
index 1890a6f680..2fccb14cf9 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2006
+   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
@@ -60,15 +61,7 @@ struct stat
 #else
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
 #endif
-#if __WORDSIZE == 64
-    __time_t st_atime;			/* Time of last access.  */
-    unsigned long int __unused1;
-    __time_t st_mtime;			/* Time of last modification.  */
-    unsigned long int __unused2;
-    __time_t st_ctime;			/* Time of last status change.  */
-    unsigned long int __unused3;
-#else
-# ifdef __USE_MISC
+#ifdef __USE_MISC
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -78,17 +71,16 @@ struct stat
     struct timespec st_atim;		/* Time of last access.  */
     struct timespec st_mtim;		/* Time of last modification.  */
     struct timespec st_ctim;		/* Time of last status change.  */
-#  define st_atime st_atim.tv_sec	/* Backward compatibility.  */
-#  define st_mtime st_mtim.tv_sec
-#  define st_ctime st_ctim.tv_sec
-# else
+# define st_atime st_atim.tv_sec	/* Backward compatibility.  */
+# define st_mtime st_mtim.tv_sec
+# define st_ctime st_ctim.tv_sec
+#else
     __time_t st_atime;			/* Time of last access.  */
     unsigned long int st_atimensec;	/* Nscecs of last access.  */
     __time_t st_mtime;			/* Time of last modification.  */
     unsigned long int st_mtimensec;	/* Nsecs of last modification.  */
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
-# endif
 #endif
     unsigned long int __unused4;
     unsigned long int __unused5;
@@ -112,15 +104,7 @@ struct stat64
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
 
     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#if __WORDSIZE == 64
-    __time_t st_atime;			/* Time of last access.  */
-    unsigned long int __unused1;
-    __time_t st_mtime;			/* Time of last modification.  */
-    unsigned long int __unused2;
-    __time_t st_ctime;			/* Time of last status change.  */
-    unsigned long int __unused3;
-#else
-# ifdef __USE_MISC
+#ifdef __USE_MISC
     /* Nanosecond resolution timestamps are stored in a format
        equivalent to 'struct timespec'.  This is the type used
        whenever possible but the Unix namespace rules do not allow the
@@ -130,17 +114,16 @@ struct stat64
     struct timespec st_atim;		/* Time of last access.  */
     struct timespec st_mtim;		/* Time of last modification.  */
     struct timespec st_ctim;		/* Time of last status change.  */
-#  define st_atime st_atim.tv_sec	/* Backward compatibility.  */
-#  define st_mtime st_mtim.tv_sec
-#  define st_ctime st_ctim.tv_sec
-# else
+# define st_atime st_atim.tv_sec	/* Backward compatibility.  */
+# define st_mtime st_mtim.tv_sec
+# define st_ctime st_ctim.tv_sec
+#else
     __time_t st_atime;			/* Time of last access.  */
     unsigned long int st_atimensec;	/* Nscecs of last access.  */
     __time_t st_mtime;			/* Time of last modification.  */
     unsigned long int st_mtimensec;	/* Nsecs of last modification.  */
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
-# endif
 #endif
     unsigned long int __unused4;
     unsigned long int __unused5;
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Dist b/sysdeps/unix/sysv/linux/sparc/sparc32/Dist
deleted file mode 100644
index 66f771a161..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-clone.S
-kernel_stat.h
-setfsuid.c
-setfsgid.c
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
index b28f009b06..64d47b34c5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
@@ -1,6 +1,6 @@
 /* Semctl for architectures where word sized unions are passed indirectly
-   Copyright (C) 1995, 1997, 1998, 2000, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1995,1997,1998,2000,2002,2003,2004,2006
+   	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/syscall.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 #include <shlib-compat.h>
 
 struct __old_semid_ds
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Dist b/sysdeps/unix/sysv/linux/sparc/sparc64/Dist
deleted file mode 100644
index 4ba3a60c2c..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/Dist
+++ /dev/null
@@ -1,7 +0,0 @@
-clone.S
-dl-brk.S
-kernel_stat.h
-getcontext.S
-setcontext.S
-sizes.h
-ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
index c2610b2a06..db08af8e0f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
@@ -1 +1 @@
-#include "../../fxstatat.c"
+#include "../../i386/fxstatat.c"
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
index 700dd127d0..a4e411d132 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
@@ -9,31 +9,39 @@ struct kernel_stat
     unsigned int st_gid;
     unsigned int st_rdev;
     long int st_size;
-    long int st_atime;
-    long int st_mtime;
-    long int st_ctime;
+    long int st_atime_sec;
+    long int st_mtime_sec;
+    long int st_ctime_sec;
     long int st_blksize;
     long int st_blocks;
     unsigned long int __unused1;
     unsigned long int __unused2;
   };
 
-#define _HAVE___UNUSED1
-#define _HAVE___UNUSED2
+/* Definition of `struct stat64' used in the kernel.  */
+struct kernel_stat64
+  {
+    unsigned long int st_dev;
+    unsigned long int st_ino;
+    unsigned long int st_nlink;
+
+    unsigned int st_mode;
+    unsigned int st_uid;
+    unsigned int st_gid;
+    unsigned int __pad0;
 
-#define _HAVE_STAT___UNUSED1
-#define _HAVE_STAT___UNUSED2
-#define _HAVE_STAT___UNUSED3
-#define _HAVE_STAT___UNUSED4
-#define _HAVE_STAT___UNUSED5
-#define _HAVE_STAT___PAD1
-#define _HAVE_STAT___PAD2
-#define _HAVE_STAT64___UNUSED1
-#define _HAVE_STAT64___UNUSED2
-#define _HAVE_STAT64___UNUSED3
-#define _HAVE_STAT64___UNUSED4
-#define _HAVE_STAT64___UNUSED5
-#define _HAVE_STAT64___PAD1
-#define _HAVE_STAT64___PAD2
+    unsigned long int st_rdev;
+    long int st_size;
+    long int st_blksize;
+    long int st_blocks;
+
+    unsigned long int st_atime_sec;
+    unsigned long int st_atime_nsec;
+    unsigned long int st_mtime_sec;
+    unsigned long int st_mtime_nsec;
+    unsigned long int st_ctime_sec;
+    unsigned long int st_ctime_nsec;
+    long int __unused[3];
+  };
 
 #define XSTAT_IS_XSTAT64 1
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c b/sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c
index 7637472dfc..7f1e98e433 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/lxstat.c
@@ -1 +1 @@
-#include "../../lxstat.c"
+#include "../../i386/lxstat.c"
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index b30cffc5e9..dfc38f151a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2000, 2002, 2003, 2004, 2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <richard@gnu.ai.mit.edu>, 1997.
 
@@ -25,6 +26,7 @@
 #ifdef IS_IN_rtld
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
 #endif
+#include <tls.h>
 
 #undef SYS_ify
 #define SYS_ify(syscall_name) __NR_##syscall_name
@@ -124,10 +126,10 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler)			\
 #  define SYSCALL_ERROR_HANDLER						\
 SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler)			\
 	sethi	%tie_hi22(SYSCALL_ERROR_ERRNO), %g1;			\
-	sethi	%hi(_GLOBAL_OFFSET_TABLE_), %g2;			\
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_), %g4;			\
 	add	%g1, %tie_lo10(SYSCALL_ERROR_ERRNO), %g1;		\
-	add	%g2, %lo(_GLOBAL_OFFSET_TABLE_), %g2;			\
-	ldx	[%g2 + %g1], %g1, %tie_ldx(SYSCALL_ERROR_ERRNO);	\
+	add	%g4, %lo(_GLOBAL_OFFSET_TABLE_), %g4;			\
+	ldx	[%g4 + %g1], %g1, %tie_ldx(SYSCALL_ERROR_ERRNO);	\
 	st	%o0, [%g7 + %g1], %tie_add(SYSCALL_ERROR_ERRNO);	\
 	jmpl	%o7+8, %g0;						\
 	 mov	-1, %o0;						\
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c b/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
index 27d700b133..9f4c02c78b 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
@@ -1 +1,8 @@
-#include "../../xstat.c"
+#include "../../i386/xstat.c"
+
+#ifdef __NR_stat64
+# if __ASSUME_STAT64_SYSCALL == 0
+/* The variable is shared between all wrappers around *stat{,64} calls.  */
+int __have_no_stat64;
+# endif
+#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
new file mode 100644
index 0000000000..d3f49eea43
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
@@ -0,0 +1,127 @@
+/* Convert between the kernel's `struct stat' format, and libc's.
+   Copyright (C) 1991, 1995, 1996, 1997, 2000, 2002, 2003, 2006
+   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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <kernel_stat.h>
+#include <string.h>
+#include <kernel-features.h>
+
+int
+__xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
+{
+  switch (vers)
+    {
+    case _STAT_VER_KERNEL:
+      /* Nothing to do.  The struct is in the form the kernel expects.
+         We should have short-circuted before we got here, but for
+         completeness... */
+      *(struct kernel_stat *) ubuf = *kbuf;
+      break;
+
+    case _STAT_VER_LINUX:
+      {
+	struct stat *buf = ubuf;
+
+	/* Convert to current kernel version of `struct stat'.  */
+	buf->st_dev = kbuf->st_dev;
+	buf->__pad1 = 0;
+	buf->st_ino = kbuf->st_ino;
+	buf->st_mode = kbuf->st_mode;
+	buf->st_nlink = kbuf->st_nlink;
+	buf->st_uid = kbuf->st_uid;
+	buf->st_gid = kbuf->st_gid;
+	buf->st_rdev = kbuf->st_rdev;
+	buf->__pad2 = 0;
+	buf->st_size = kbuf->st_size;
+	buf->st_blksize = kbuf->st_blksize;
+	buf->st_blocks = kbuf->st_blocks;
+	buf->st_atim.tv_sec = kbuf->st_atime_sec;
+	buf->st_atim.tv_nsec = 0;
+	buf->st_mtim.tv_sec = kbuf->st_mtime_sec;
+	buf->st_mtim.tv_nsec = 0;
+	buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
+	buf->st_ctim.tv_nsec = 0;
+	buf->__unused4 = 0;
+	buf->__unused5 = 0;
+      }
+      break;
+
+    default:
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  return 0;
+}
+
+int
+__xstat32_conv (int vers, struct stat64 *sbuf, struct stat *buf)
+{
+  struct kernel_stat64 *kbuf;
+
+  /* *stat64 syscalls on sparc64 really fill in struct kernel_stat64,
+     rather than struct stat64.  But it is the same size as
+     struct kernel_stat64, so use this hack so that we can reuse
+     i386 {,f,l}xstat{,at}.c routines.  */
+  __asm ("" : "=r" (kbuf) : "0" (sbuf));
+  assert (sizeof (struct stat) == sizeof (struct stat64));
+  assert (sizeof (struct stat64) >= sizeof (struct kernel_stat64));
+
+  switch (vers)
+    {
+    case _STAT_VER_LINUX:
+      {
+	/* Convert current kernel version of `struct stat64' to
+           `struct stat'.  */
+	buf->st_dev = kbuf->st_dev;
+	buf->__pad1 = 0;
+	buf->st_ino = kbuf->st_ino;
+	buf->st_mode = kbuf->st_mode;
+	buf->st_nlink = kbuf->st_nlink;
+	buf->st_uid = kbuf->st_uid;
+	buf->st_gid = kbuf->st_gid;
+	buf->st_rdev = kbuf->st_rdev;
+	buf->__pad2 = 0;
+	buf->st_size = kbuf->st_size;
+	buf->st_blksize = kbuf->st_blksize;
+	buf->st_blocks = kbuf->st_blocks;
+	buf->st_atim.tv_sec = kbuf->st_atime_sec;
+	buf->st_atim.tv_nsec = kbuf->st_atime_nsec;
+	buf->st_mtim.tv_sec = kbuf->st_mtime_sec;
+	buf->st_mtim.tv_nsec = kbuf->st_mtime_nsec;
+	buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
+	buf->st_ctim.tv_nsec = kbuf->st_ctime_nsec;
+	buf->__unused4 = 0;
+	buf->__unused5 = 0;
+      }
+      break;
+
+      /* If struct stat64 is different from struct stat then
+	 _STAT_VER_KERNEL does not make sense.  */
+    case _STAT_VER_KERNEL:
+    default:
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
index 79d82c756a..bcef1d3afb 100644
--- a/sysdeps/unix/sysv/linux/statvfs64.c
+++ b/sysdeps/unix/sysv/linux/statvfs64.c
@@ -1,5 +1,5 @@
 /* Return information about the filesystem on which FILE resides.
-   Copyright (C) 1998, 2000, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
diff --git a/sysdeps/unix/sysv/linux/syslog.c b/sysdeps/unix/sysv/linux/syslog.c
index 56828b24e3..145e22b520 100644
--- a/sysdeps/unix/sysv/linux/syslog.c
+++ b/sysdeps/unix/sysv/linux/syslog.c
@@ -1,4 +1,4 @@
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_MSG_NOSIGNAL
 # define NO_SIGPIPE
diff --git a/sysdeps/unix/sysv/linux/testrtsig.h b/sysdeps/unix/sysv/linux/testrtsig.h
index cf36ab08a7..f823a3f5af 100644
--- a/sysdeps/unix/sysv/linux/testrtsig.h
+++ b/sysdeps/unix/sysv/linux/testrtsig.h
@@ -1,5 +1,5 @@
 /* Test whether RT signals are really available.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 static int
 kernel_has_rtsig (void)
diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
index b2ef13eaf8..f43cffe01a 100644
--- a/sysdeps/unix/sysv/linux/truncate64.c
+++ b/sysdeps/unix/sysv/linux/truncate64.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997-2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2000,2003,2004,2005,2006
+	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
@@ -25,7 +26,7 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifdef __NR_truncate64
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
index d777672125..a6095aaea5 100644
--- a/sysdeps/unix/sysv/linux/utimes.c
+++ b/sysdeps/unix/sysv/linux/utimes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006 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
@@ -21,7 +21,7 @@
 #include <utime.h>
 #include <sys/time.h>
 #include <sysdep.h>
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 
 /* Change the access time of FILE to TVP[0] and
diff --git a/sysdeps/unix/sysv/linux/x86_64/Dist b/sysdeps/unix/sysv/linux/x86_64/Dist
deleted file mode 100644
index 57dd1b2221..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/Dist
+++ /dev/null
@@ -1,11 +0,0 @@
-clone.S
-ldd-rewrite.sed
-__start_context.S
-ucontext_i.h
-umount.c
-sys/debugreg.h
-sys/io.h
-sys/perm.h
-sys/procfs.h
-sys/reg.h
-sys/user.h
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index 9e5110657a..096aac813b 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -1,5 +1,5 @@
 /* xstat64 using old-style Unix stat system call.
-   Copyright (C) 1991, 1995-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995-2002,2003,2006 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 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
diff --git a/sysdeps/unix/sysv/linux/xstatconv.h b/sysdeps/unix/sysv/linux/xstatconv.h
index 387a9feffc..7e36620430 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.h
+++ b/sysdeps/unix/sysv/linux/xstatconv.h
@@ -1,5 +1,6 @@
 /* Convert between the kernel's `struct stat' format, and libc's.
-   Copyright (C) 1991,1995-1997,2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995-1997,2000,2002,2003,2006
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +18,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "kernel-features.h"
+#include <kernel-features.h>
 
 #ifndef STAT_IS_KERNEL_STAT
 extern int __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf);
diff --git a/sysdeps/wordsize-32/Dist b/sysdeps/wordsize-32/Dist
deleted file mode 100644
index 2459c7d95b..0000000000
--- a/sysdeps/wordsize-32/Dist
+++ /dev/null
@@ -1 +0,0 @@
-divdi3.c
diff --git a/sysdeps/x86_64/Dist b/sysdeps/x86_64/Dist
deleted file mode 100644
index d0e516c5bc..0000000000
--- a/sysdeps/x86_64/Dist
+++ /dev/null
@@ -1,4 +0,0 @@
-bp-asm.h
-hp-timing.c
-_mcount.S
-bits/link.h
diff --git a/sysdeps/x86_64/soft-fp/Dist b/sysdeps/x86_64/soft-fp/Dist
deleted file mode 100644
index 7e9914fe58..0000000000
--- a/sysdeps/x86_64/soft-fp/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sfp-machine.h