summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-06-21 02:59:26 +0000
committerUlrich Drepper <drepper@redhat.com>1997-06-21 02:59:26 +0000
commit5107cf1d7d27f17c6de68ec15a8e8d9dd5b471c1 (patch)
treedbe8fd6c6a69eac9e3e6f465ab6396d47f232e6f
parentd705269e75ff9846000abea981774b381b076482 (diff)
1997-06-21 02:48 Ulrich Drepper <drepper@cygnus.com> * config.h.in: Add DO_STATIC_NSS. * config.make.in: Add build-static-nss. * elf/eval.c: Use __getdelim instead of __getline. * locale/programs/locale.c: Correct comment. * manual/libc.texinfo: Update copyright and date. Remove A4 option. * sysdeps/libm-ieee754/k_standard.c: Always return HUGE_VAL for gamma overflow. * sysdeps/libm-ieee754/w_gamma.c: Handle SVID and ISO C behaviour. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammalp.c: Likewise. * po/ko.po: Update. 1997-06-13 10:06 Richard Henderson <rth@tamu.edu> The Great Bit File Move: * configure.in (AC_INIT): Look in include/ for features.h. (sysnames): Add include as the final search directory. (AC_OUTPUT): Create a bits directory in the build directory. * Makeconfig (CPPFLAGS): Look in include/ for libc-symbols.h. * Makefile: Make sure the target directory exists when installing <gnu/stubs.h> and <gnu/lib-names.h>. * csu/Makefile: Use $(compile.S) and $(compile.c) instead of invoking $(CC) directly, as the former have the full include path. * ansidecl.h: Removed. * aliases.h: Moved to include/. * alloca.h: Likewise. * argp.h: Likewise. * argz.h: Likewise. * arpa/ftp.h: Likewise. * arpa/inet.h: Likewise. * arpa/nameser.h: Likewise. * arpa/telnet.h: Likewise. * arpa/tftp.h: Likewise. * assert.h: Likewise. * ctype.h: Likewise. * db.h: Likewise. * dirent.h: Likewise. * dlfcn.h: Likewise. * elf.h: Likewise. * endian.h: Likewise. * envz.h: Likewise. * err.h: Likewise. * errno.h: Likewise. * error.h: Likewise. * fcntl.h: Likewise. * features.h: Likewise. * fnmatch.h: Likewise. * ftw.h: Likewise. * getopt.h: Likewise. * glob.h: Likewise. * gnu-versions.h: Likewise. * grp.h: Likewise. * langinfo.h: Likewise. * libc-symbols.h: Likewise. * libgen.h: Likewise. * libintl.h: Likewise. * limits.h: Likewise. * linewrap.h: Likewise. * link.h: Likewise. * locale.h: Likewise. * malloc.h: Likewise. * math.h: Likewise. * mathcalls.h: Likewise. * mcheck.h: Likewise. * memory.h: Likewise. * netdb.h: Likewise. * netgroup.h: Likewise. * netinet/ether.h: Likewise. * netinet/in.h: Likewise. * nlist.h: Likewise. * nss.h: Likewise. * nsswitch.h: Likewise. * obstack.h: Likewise. * poll.h: Likewise. * posix1_lim.h: Likewise. * posix2_lim.h: Likewise. * printf.h: Likewise. * protocols/routed.h: Likewise. * protocols/rwhod.h: Likewise. * protocols/talkd.h: Likewise. * protocols/timed.h: Likewise. * pwd.h: Likewise. * regex.h: Likewise. * resolv.h: Likewise. * rpc/auth_unix.h: Likewise. * rpc/clnt.h: Likewise. * rpc/netdb.h: Likewise. * rpc/pmap_clnt.h: Likewise. * rpc/pmap_prot.h: Likewise. * rpc/pmap_rmt.h: Likewise. * rpc/rpc.h: Likewise. * rpc/rpc_msg.h: Likewise. * rpc/svc.h: Likewise. * rpc/svc_auth.h: Likewise. * rpc/types.h: Likewise. * rpc/xdr.h: Likewise. * sched.h: Likewise. * search.h: Likewise. * set-hooks.h: Likewise. * setjmp.h: Likewise. * sgtty.h: Likewise. * shadow.h: Likewise. * signal.h: Likewise. * stab.def: Likewise. * stab.h: Likewise. * stdio.h: Likewise. * stdlib.h: Likewise. * string.h: Likewise. * strings.h: Likewise. * sys/bitypes.h: Likewise. * sys/cdefs.h: Likewise. * sys/dir.h: Likewise. * sys/errno.h: Likewise. * sys/fcntl.h: Likewise. * sys/file.h: Likewise. * sys/gmon.h: Likewise. * sys/ioctl.h: Likewise. * sys/ipc.h: Likewise. * sys/msg.h: Likewise. * sys/poll.h: Likewise. * sys/queue.h: Likewise. * sys/resource.h: Likewise. * sys/select.h: Likewise. * sys/sem.h: Likewise. * sys/shm.h: Likewise. * sys/signal.h: Likewise. * sys/socket.h: Likewise. * sys/stat.h: Likewise. * sys/statfs.h: Likewise. * sys/syslog.h: Likewise. * sys/termios.h: Likewise. * sys/time.h: Likewise. * sys/timeb.h: Likewise. * sys/times.h: Likewise. * sys/types.h: Likewise. * sys/uio.h: Likewise. * sys/un.h: Likewise. * sys/unistd.h: Likewise. * sys/utsname.h: Likewise. * sys/vlimit.h: Likewise. * sys/vtimes.h: Likewise. * sys/wait.h: Likewise. * syscall.h: Likewise. * syslog.h: Likewise. * tar.h: Likewise. * termios.h: Likewise. * time.h: Likewise. * ttyent.h: Likewise. * unistd.h: Likewise. * utime.h: Likewise. * utmp.h: Likewise. * values.h: Likewise. * wchar.h: Likewise. * wctype.h: Likewise. * wordexp.h: Likewise. * xlocale.h: Likewise. * xopen_lim.h: Likewise. * linuxthreads/sysdeps/alpha/semaphorebits.h: -> .../bits/semaphore.h. * linuxthreads/sysdeps/powerpc/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/cmpxchg/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/no-cmpxchg/semaphorebits.h: Likewise. * linuxthreads/sysdeps/pthread/libc-lock.h: -> bits/ * sysdeps/mach/libc-lock.h: Likewise. * sysdeps/stub/libc-lock.h: Likewise. * linuxthreads/sysdeps/pthread/stdio-lock.h: Likewise. * linuxthreads/sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/mach/hurd/local_lim.h: Likewise. * sysdeps/stub/local_lim.h: Likewise. * sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/unix/sysv/local_lim.h: Likewise. * sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise. * linuxthreads/sysdeps/unix/sysv/linux/posix_opt.h: Likewise. * sysdeps/mach/hurd/posix_opt.h: Likewise. * sysdeps/stub/posix_opt.h: Likewise. * sysdeps/unix/bsd/posix_opt.h: Likewise. * sysdeps/unix/bsd/ultrix4/posix_opt.h: Likewise. * sysdeps/unix/sysv/linux/posix_opt.h: Likewise. * math/cmathcalls.h: -> bits/ * math/mathcalls.h: Likewise. * misc/stab.def: -> bits/ * posix/posix1_lim.h: -> bits/ * posix/posix2_lim.h: Likewise. * sysdeps/alpha/__math.h: -> .../fpu/bits/mathinline.h * sysdeps/i386/fpu/__math.h: Likewise. * sysdeps/m68k/fpu/__math.h: Likewise. * sysdeps/m68k/fpu/switch/__math.h: Likewise. * sysdeps/powerpc/__math.h: Likewise. * sysdeps/stub/__math.h: Likewise. * sysdeps/alpha/bytesex.h: -> .../bits/endian.h * sysdeps/arm/bytesex.h: Likewise. * sysdeps/i386/bytesex.h: Likewise. * sysdeps/m68k/bytesex.h: Likewise. * sysdeps/mips/bytesex.h: Likewise. * sysdeps/mips/dec/bytesex.h: Likewise. * sysdeps/mips/mipsel/bytesex.h: Likewise. * sysdeps/mips/p40/bytesex.h: Likewise. * sysdeps/sparc/bytesex.h: Likewise. * sysdeps/stub/bytesex.h: Likewise. * sysdeps/alpha/fpu/fenvbits.h: -> .../bits/fenv.h * sysdeps/i386/fpu/fenvbits.h: Likewise. * sysdeps/m68k/fpu/fenvbits.h: Likewise. * sysdeps/powerpc/fenvbits.h: Likewise. * sysdeps/stub/fenvbits.h: Likewise. * sysdeps/alpha/jmp_buf.h: -> .../bits/setenv.h * sysdeps/arm/jmp_buf.h: Likewise. * sysdeps/i386/jmp_buf.h: Likewise. * sysdeps/m68k/jmp_buf.h: Likewise. * sysdeps/mips/jmp_buf.h: Likewise. * sysdeps/sparc/jmp_buf.h: Likewise. * sysdeps/powerpc/jmp_buf.h: Likewise. * sysdeps/stub/jmp_buf.h: Likewise. * sysdeps/vax/jmp_buf.h: Likewise. * sysdeps/generic/confname.h: -> bits/ * sysdeps/unix/sysv/irix4/confname.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/confname.h: Likewise. * sysdeps/generic/gnu/types.h: -> ../bits/types.h * sysdeps/unix/sysv/linux/alpha/gnu/types.h: Likewise. * sysdeps/unix/sysv/linux/gnu/types.h: Likewise. * sysdeps/generic/ioctl-types.h: -> bits/ * sysdeps/unix/sysv/linux/ioctl-types.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/ioctl-types.h: Likewise. * sysdeps/generic/iovec.h: -> .../bits/uio.h * sysdeps/unix/sysv/linux/iovec.h: Likewise. * sysdeps/generic/mathbits.h: -> .../bits/mathdef.h * sysdeps/i386/fpu/mathbits.h: Likewise. * sysdeps/m68k/fpu/mathbits.h: Likewise. * sysdeps/powerpc/mathbits.h: Likewise. * sysdeps/generic/resourcebits.h: -> .../bits/resource.h * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise. * sysdeps/unix/sysv/linux/resourcebits.h: Likewise. * sysdeps/generic/schedbits.h: -> .../bits/sched.h * sysdeps/unix/sysv/linux/schedbits.h: Likewise. * sysdeps/generic/selectbits.h: -> .../bits/select.h * sysdeps/i386/selectbits.h: Likewise. * sysdeps/generic/sigaction.h: -> bits/ * sysdeps/unix/bsd/osf/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sigaction.h: Likewise. * sysdeps/unix/sysv/minix/sigaction.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/sigaction.h: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.h: Likewise. * sysdeps/generic/sigset.h: -> bits/ * sysdeps/unix/sysv/linux/sigset.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset.h: Likewise. * sysdeps/generic/sockaddrcom.h: -> .../bits/sockaddr.h * sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise. * sysdeps/generic/socketbits.h: -> .../bits/socket.h * sysdeps/unix/sysv/linux/socketbits.h: Likewise. * sysdeps/generic/statfsbuf.h: -> .../bits/statfs.h * sysdeps/unix/sysv/linux/statfsbuf.h: Likewise. * sysdeps/generic/termbits.h: -> .../bits/termios.h * sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise. * sysdeps/unix/sysv/linux/alpha/termbits.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/termbits.h: Likewise. * sysdeps/unix/sysv/linux/sparc/termbits.h: Likewise. * sysdeps/unix/sysv/linux/termbits.h: Likewise. * sysdeps/generic/ustatbits.h: -> .../bits/ustat.h * sysdeps/unix/sysv/linux/ustatbits.h: Likewise. * sysdeps/generic/utmpbits.h: -> .../bits/utmp.h * sysdeps/gnu/utmpbits.h: Likewise. * sysdeps/unix/sysv/utmpbits.h: Likewise. * sysdeps/generic/utsnamelen.h: -> .../bits/utsname.h * sysdeps/unix/bsd/sun/sunos4/utsnamelen.h: Likewise. * sysdeps/unix/bsd/ultrix4/utsnamelen.h: Likewise. * sysdeps/unix/sysv/linux/utsnamelen.h: Likewise. * sysdeps/unix/sysv/sysv4/utsnamelen.h: Likewise. * sysdeps/unix/sysv/utsnamelen.h: Likewise. * sysdeps/generic/waitstatus.h: -> bits/ * sysdeps/i386/huge_val.h: -> bits/ * sysdeps/ieee754/huge_val.h: Likewise. * sysdeps/m68k/huge_val.h: Likewise. * sysdeps/stub/huge_val.h: Likewise. * sysdeps/vax/huge_val.h: Likewise. * sysdeps/ieee754/nan.h: Likewise. * sysdeps/stub/nan.h: Likewise. * sysdeps/mach/hurd/alpha/sigcontext.h: -> bits/ * sysdeps/mach/hurd/hppa/sigcontext.h: Likewise. * sysdeps/mach/hurd/i386/sigcontext.h: Likewise. * sysdeps/mach/hurd/mips/sigcontext.h: Likewise. * sysdeps/stub/sigcontext.h: Likewise. * sysdeps/unix/bsd/sun/m68k/sigcontext.h: Likewise. * sysdeps/unix/bsd/sun/sparc/sigcontext.h: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigcontext.h: Likewise. * sysdeps/unix/sysv/linux/sigcontext.h: Likewise. * sysdeps/mach/hurd/errnos.h: -> .../bits/errno.h * sysdeps/standalone/arm/errnos.h: Likewise. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * sysdeps/unix/sysv/linux/errnos.h: Likewise. * sysdeps/mach/hurd/fcntlbits.h: -> .../bits/fcntl.h * sysdeps/stub/fcntlbits.h: Likewise. * sysdeps/unix/bsd/bsd4.4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/fcntlbits.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/ultrix4/fcntlbits.h: Likewise. * sysdeps/unix/common/fcntlbits.h: Likewise. * sysdeps/unix/sysv/fcntlbits.h: Likewise. * sysdeps/unix/sysv/irix4/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/sparc/fcntlbits.h: Likewise. * sysdeps/mach/hurd/ioctls.h: -> bits/ * sysdeps/stub/ioctls.h: Likewise. * sysdeps/unix/bsd/bsd4.4/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/alpha/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/sparc/ioctls.h: Likewise. * sysdeps/mach/hurd/statbuf.h: -> .../bits/stat.h * sysdeps/stub/statbuf.h: Likewise. * sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise. * sysdeps/unix/bsd/statbuf.h: Likewise. * sysdeps/unix/sysv/irix4/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/statbuf.h: Likewise. * sysdeps/unix/sysv/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise. * sysdeps/standalone/stdio_lim.h: -> bits/ * sysdeps/stub/stdio_lim.h: Likewise. * sysdeps/stub/direntry.h: -> ../bits/dirent.h * sysdeps/unix/bsd/bsd4.4/direntry.h: Likewise. * sysdeps/unix/bsd/direntry.h: Likewise. * sysdeps/unix/common/direntry.h: Likewise. * sysdeps/unix/sysv/direntry.h: Likewise. * sysdeps/unix/sysv/linux/direntry.h: Likewise. * sysdeps/stub/elfclass.h: -> bits/ * sysdeps/wordsize-32/elfclass.h: Likewise. * sysdeps/wordsize-64/elfclass.h: Likewise. * sysdeps/stub/signum.h: -> bits/ * sysdeps/unix/bsd/signum.h: Likewise. * sysdeps/unix/bsd/sun/signum.h: Likewise. * sysdeps/unix/sysv/irix4/signum.h: Likewise. * sysdeps/unix/sysv/linux/alpha/signum.h: Likewise. * sysdeps/unix/sysv/linux/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/signum.h: Likewise. * sysdeps/unix/sysv/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise. * sysdeps/stub/sys/ipc_buf.h: -> .../bits/ipc.h * sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h: Likewise. * sysdeps/unix/sysv/linux/sys/ipc_buf.h: Likewise. * sysdeps/stub/sys/msq_buf.h: -> .../bits/msq.h * sysdeps/unix/sysv/linux/sys/msq_buf.h: Likewise. * sysdeps/stub/sys/sem_buf.h: -> .../bits/sem.h * sysdeps/unix/sysv/linux/sys/sem_buf.h: Likewise. * sysdeps/stub/sys/shm_buf.h: -> .../bits/shm.h * sysdeps/unix/sysv/linux/sys/shm_buf.h: Likewise. * sysdeps/stub/timebits.h: -> .../bits/time.h * sysdeps/unix/sysv/linux/alpha/timebits.h: Likewise. * sysdeps/unix/sysv/linux/timebits.h: Likewise. * sysdeps/stub/waitflags.h: -> bits/ * sysdeps/unix/bsd/waitflags.h: Likewise. * sysdeps/unix/sysv/linux/waitflags.h: Likewise. * sysdeps/unix/sysv/sysv4/waitflags.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: -> ../ * sysdeps/unix/sysv/linux/powerpc/sys/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/sys/socketcall.h: -> ../ * argp/argp-fmtstream.h: Standardize the multiple-include protect. * argp/argp.h: Likewise. * catgets/nl_types.h: Likewise. * crypt/sysdeps/unix/crypt.h: Likewise. * ctype/ctype.h: Likewise. * db/db.h: Likewise. * db/mpool.h: Likewise. * db/ndbm.h: Likewise. * dirent/dirent.h: Likewise. * elf/dlfcn.h: Likewise. * elf/elf.h: Likewise. * elf/link.h: Likewise. * gmon/sys/gmon.h: Likewise. * gmon/sys/gmon_out.h: Likewise. * grp/grp.h: Likewise. * inet/aliases.h: Likewise. * inet/arpa/ftp.h: Likewise. * inet/arpa/inet.h: Likewise. * inet/arpa/telnet.h: Likewise. * inet/arpa/tftp.h: Likewise. * inet/netinet/ether.h: Likewise. * inet/netinet/icmp6.h: Likewise. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * inet/protocols/routed.h: Likewise. * inet/protocols/rwhod.h: Likewise. * inet/protocols/talkd.h: Likewise. * inet/protocols/timed.h: Likewise. * intl/libintl.h: Likewise. * io/fcntl.h: Likewise. * io/fts.h: Likewise. * io/ftw.h: Likewise. * io/sys/poll.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * linuxthreads/semaphore.h: Likewise. * linuxthreads/sysdeps/pthread/pthread.h: Likewise. * locale/locale.h: Likewise. * login/pty.h: Likewise. * login/utmp.h: Likewise. * malloc/malloc.h: Likewise. * malloc/obstack.h: Likewise. * math/complex.h: Likewise. * math/fenv.h: Likewise. * math/math.h: Likewise. * md5-crypt/md5.h: Likewise. * misc/ar.h: Likewise. * misc/err.h: Likewise. * misc/error.h: Likewise. * misc/fstab.h: Likewise. * misc/libgen.h: Likewise. * misc/nlist.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/file.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/queue.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/syslog.h: Likewise. * misc/sys/uio.h: Likewise. * misc/sysexits.h: Likewise. * misc/ttyent.h: Likewise. * nss/nss.h: Likewise. * posix/fnmatch.h: Likewise. * posix/getopt.h: Likewise. * posix/glob.h: Likewise. * posix/regex.h: Likewise. * posix/sys/times.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * posix/tar.h: Likewise. * posix/unistd.h: Likewise. * posix/wordexp.h: Likewise. * pwd/pwd.h: Likewise. * resolv/arpa/nameser.h: Likewise. * resolv/netdb.h: Likewise. * resolv/resolv.h: Likewise. * resource/sys/resource.h: Likewise. * resource/sys/vlimit.h: Likewise. * resource/sys/vtimes.h: Likewise. * setjmp/setjmp.h: Likewise. * shadow/shadow.h: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdlib/exit.h: Likewise. * stdlib/fmtmsg.h: Likewise. * stdlib/monetary.h: Likewise. * stdlib/stdlib.h: Likewise. * string/argz.h: Likewise. * string/envz.h: Likewise. * string/memory.h: Likewise. * string/string.h: Likewise. * string/strings.h: Likewise. * sunrpc/rpc/rpc.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/types.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * termios/sys/ttychars.h: Likewise. * termios/termios.h: Likewise. * argp/argp-parse.c: <foo.h> -> <bits/foo.h>. * crypt/sysdeps/unix/crypt_util.c: Likewise. * dirent/dirent.h: Likewise. * elf/link.h: Likewise. * grp/fgetgrent.c: Likewise. * grp/grp.h: Likewise. * hurd/hurd/ioctl.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/netinet/in.h: Likewise. * io/fcntl.h: Likewise. * io/ftw.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * libio/_G_config.h: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/stdio.h: Likewise. * linuxthreads/lockfile.c: Likewise. * linuxthreads/semaphore.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/lc-time.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/lastlog.h: Likewise. * login/pty.h: Likewise. * login/utmp.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/thread-m.h: Likewise. * math/complex.h: Likewise. * math/fenv.h: Likewise. * math/libm-test.c: Likewise. * math/math.h: Likewise. * misc/sgtty.h: Likewise. * misc/stab.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/uio.h: Likewise. * misc/sys/ustat.h: Likewise. * misc/syslog.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/sched.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/sys/wait.h: Likewise. * posix/unistd.h: Likewise. * pwd/fgetpwent.c: Likewise. * pwd/pwd.h: Likewise. * resource/sys/resource.h: Likewise. * setjmp/setjmp.h: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * signal/signal.h: Likewise. * signal/sigsetops.c: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdio/stdio.h: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * string/endian.h: Likewise. * sysdeps/alpha/w_sqrt.S: Likewise. * sysdeps/arm/__longjmp.S: Likewise. * sysdeps/arm/setjmp.S: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/netinet/ip.h: Likewise. * sysdeps/generic/setenv.c: Likewise. * generic/sys/mman.h: Likewise. * sysdeps/i386/__longjmp.S: Likewise. * sysdeps/i386/setjmp.S: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/jmp-unwind.c: Likewise. * sysdeps/posix/mk-stdiolim.c: Likewise. * sysdeps/powerpc/__longjmp.S: Likewise. * sysdeps/powerpc/setjmp.S: Likewise. * sysdeps/sparc/__longjmp.S: Likewise. * sysdeps/sparc/setjmp.S: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/filedesc.h: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Likewise. * sysdeps/unix/bsd/m68k/sysdep.S: Likewise. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/m68k/sethostid.S: Likewise. * sysdeps/unix/bsd/sun/sparc/sethostid.S: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/bsd/vax/sysdep.S: Likewise. * sysdeps/unix/dirstream.h: Likewise. * sysdeps/unix/i386/sysdep.S: Likewise. * sysdeps/unix/mips/sysdep.S: Likewise. * sysdeps/unix/mk-local_lim.c: Likewise. * sysdeps/unix/sparc/sysdep.S: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/alpha/brk.S: Likewise. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/arm/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Likewise. * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise. * sysdeps/unix/sysv/linux/netinet/ip.h: Likewise. * sysdeps/unix/sysv/linux/netinet/tcp.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/syscall.h: Likewise. * sysdeps/unix/sysv/linux/tcgetattr.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/sysconf.S: Likewise. * sysdeps/unix/sysv/sysv4/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.S: Likewise. * sysvipc/sys/ipc.h: Likewise. * sysvipc/sys/msg.h: Likewise. * sysvipc/sys/sem.h: Likewise. * sysvipc/sys/shm.h: Likewise. * termios/termios.h: Likewise. * time/localtime.c: Likewise. * time/sys/time.h: Likewise. * time/time.h: Likewise. * time/tzset.c: Likewise. * sysdeps/unix/sysv/linux/arm/socket.S: socketcall.h change. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/sparc/socket.S: Likewise. * Makefile (headers): foo.h -> bits/foo.h. * dirent/Makefile: Likewise. * elf/Makefile: Likewise. * io/Makefile: Likewise. * linuxthreads/Makefile: Likewise. * linuxthreads/sysdeps/pthread/Makefile: Likewise. * login/Makefile: Likewise. * math/Makefile: Likewise. * misc/Makefile: Likewise. * posix/Makefile: Likewise. * resource/Makefile: Likewise. * setjmp/Makefile: Likewise. * signal/Makefile: Likewise. * socket/Makefile: Likewise. * stdio-common/Makefile: Likewise. * sysdeps/unix/sysv/linux/Makefile: Likewise. * sysvipc/Makefile: Likewise. * termios/Makefile: Likewise. * time/Makefile: Likewise. * sysdeps/generic/Makefile (make_siglist-CFLAGS): Likewise. * sysdeps/posix/Makefile: stdio_lim.h -> bits/stdio_lim.h * sysdeps/unix/Makefile: Likewise with local_lim.h, errnos.h, ioctls.h, termbits.h. * sysdeps/unix/sysv/linux/Dist: sys/kernel_termios.h -> kernel_termios.h, sys/socketcall.h -> socketcall.h * elf/elf.h: Use <inttypes.h> definitions instead of __attribute__ for getting the proper length on the ELF types to be friendly to non-gcc compilers. * posix/sys/types.h: Notice when int8_t and friends are defined and don't redefine them. * sysdeps/wordsize-32/inttypes.h: Likewise. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/unix/sysv/linux/arm/profil-counter.h: Get sigcontext via <signal.h> instead. * sysdeps/unix/sysv/linux/i386/profil-counter.h: Likewise. * sysdeps/unix/sysv/linux/sparc/profil-counter.h: Likewise. 1997-06-20 17:59 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp> * hurd/intr-msg.c: More 64bit changes. * mach/msg-destroy.c: Likewise. * sysdeps/mach/hurd/ioctl.c: Likewise. * sysdeps/mach/hurd/ioctls.h: Likewise. * sysdeps/mach/hurd/select.c: Likewise. * sysdeps/mach/hurd/statbuf.h: Likewise. * sysdeps/mach/hurd/mips/dl-machine.c: Hurd/MIPS64 patches. * sysdeps/mach/hurd/mips/exc2signal.c: Likewise. * sysdeps/mach/hurd/mips/init-fault.c: Likewise. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/mach/hurd/mips/intr-msg.h: Likewise. * sysdeps/mach/hurd/mips/longjmp-ctx.c: Likewise. * sysdeps/mach/hurd/mips/longjmp-ts.c: Likewise. * sysdeps/mach/hurd/mips/sigcontext.h: Likewise. * sysdeps/mach/hurd/mips/sigreturn.c: Likewise. * sysdeps/mach/hurd/mips/trampoline.c: Likewise. * sysdeps/mach/mips/cacheflush.c: Likewise. * sysdeps/mach/mips/machine-lock.h: Likewise. * sysdeps/mach/mips/machine-sp.h: Likewise. * sysdeps/mach/mips/syscall.S: Likewise. * sysdeps/mach/mips/sysdep.h: Likewise. * sysdeps/mach/mips/thread_state.h: Likewise. * sysdeps/mach/start.c: Likewise. * sysdeps/mips/dl-machine.h: MIPS changes. * sysdeps/mips/elf/start.S: Likewise. * sysdeps/mips/init-first.c: Likewise. * sysdeps/mips/fpu_control.h: Likewise. * sysdeps/mips/machine-gmon.h: Likewise. * sysdeps/mips/jmp_buf.h: Likewise. * sysdeps/mips/__longjmp.c: Likewise. * sysdeps/mips/bsd-_setjmp.S: Likewise. * sysdeps/mips/bsd-setjmp.S: Likewise. * sysdeps/mips/setjmp.S: Likewise. * sysdeps/mips/setjmp_aux.c: Likewise. * sysdeps/mips/mips64/gmp-mparam.h: Likewise. * sysdeps/mips/add_n.S: New file. * sysdeps/mips/addmul_1.S: Likewise. * sysdeps/mips/lshift.S: Likewise. * sysdeps/mips/mul_1.S: Likewise. * sysdeps/mips/rshift.S: Likewise. * sysdeps/mips/sub_n.S: Likewise. * sysdeps/mips/submul_1.S: Likewise. * sysdeps/mips/mips64/Implies: Likewise. * sysdeps/mips/mips64/add_n.S: Likewise. * sysdeps/mips/mips64/addmul_1.S: Likewise. * sysdeps/mips/mips64/lshift.S: Likewise. * sysdeps/mips/mips64/mul_1.S: Likewise. * sysdeps/mips/mips64/rshift.S: Likewise. * sysdeps/mips/mips64/sub_n.S: Likewise. * sysdeps/mips/mips64/submul_1.S: Likewise. * sysdeps/mips/add_n.S: Removed. * sysdeps/mips/addmul_1.S: Likewise. * sysdeps/mips/lshift.S: Likewise. * sysdeps/mips/mul_1.S: Likewise. * sysdeps/mips/rshift.S: Likewise. * sysdeps/mips/sub_n.S: Likewise. * sysdeps/mips/submul_1.S: Likewise. * nss/Makefile: Prepare for static NSS. * resolv/Makefile: Likewise. * nss/nsswitch.c: Add code for static NSS. * nss/function.def: Define functions for static NSS. 1997-06-19 11:10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add yet more symbols. 1997-06-19 20:33 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (_dl_lookup_versioned_symbol): Don't pass NULL as object name to _dl_signal_error. (do_lookup): Skip objects that could not be opened. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Check that the symbol was found. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Likewise. 1997-06-20 03:13 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp> * ctype/ctype-info.c: Use int32_t where `int' with 4 bytes is assumed. * ctype/ctype.h: Likewise. * math/math_private.h: Likewise. * inet/netinet/in.h: Likewise. * wctype/wctype.h: Likewise. * nss/Makefile: Only inhibit nss_files and nss_db modules if static NSS modules are not enabled. * resolv/Makefile: Likewise for nss_dns. * nss/function.def: New file. List all available lookup functions for static NSS. * nss/nsswitch.c: Add code for static NSS. 1997-06-15 21:15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c (gamma_test): Test for _SVID_ and for normal behaviour. 1997-06-15 20:32 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm.map: Add all necessary functions, correct existing entries. 1997-06-20 02:35 a sun <asun@zoology.washington.edu> * sysdeps/unix/sysv/linux/netipx/ipx.h: Don't use kernel header. 1997-06-19 18:43 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent): Compare pointer with NULL. * login/logout.c (logout): Compare pututline result with NULL. * inet/rcmd.c: Correct a few typos. Reported by Erik Troan.
-rw-r--r--ChangeLog800
-rw-r--r--Makeconfig4
-rw-r--r--Makefile6
-rw-r--r--ansidecl.h108
-rw-r--r--argp/argp-fmtstream.h6
-rw-r--r--argp/argp-parse.c2
-rw-r--r--argp/argp.h6
-rw-r--r--bits/confname.h (renamed from sysdeps/generic/confname.h)0
-rw-r--r--bits/ioctl-types.h (renamed from sysdeps/generic/ioctl-types.h)10
-rw-r--r--bits/mathdef.h (renamed from sysdeps/generic/mathbits.h)8
-rw-r--r--bits/resource.h (renamed from sysdeps/generic/resourcebits.h)0
-rw-r--r--bits/sched.h35
-rw-r--r--bits/select.h (renamed from sysdeps/generic/selectbits.h)8
-rw-r--r--bits/sigaction.h (renamed from sysdeps/generic/sigaction.h)0
-rw-r--r--bits/sigset.h (renamed from sysdeps/generic/sigset.h)0
-rw-r--r--bits/sockaddr.h (renamed from sysdeps/generic/sockaddrcom.h)10
-rw-r--r--bits/socket.h (renamed from sysdeps/generic/socketbits.h)10
-rw-r--r--bits/statfs.h52
-rw-r--r--bits/termios.h (renamed from sysdeps/generic/termbits.h)5
-rw-r--r--bits/types.h (renamed from sysdeps/generic/gnu/types.h)19
-rw-r--r--bits/uio.h32
-rw-r--r--bits/ustat.h (renamed from sysdeps/generic/ustatbits.h)0
-rw-r--r--bits/utmp.h (renamed from sysdeps/generic/utmpbits.h)10
-rw-r--r--bits/utsname.h (renamed from sysdeps/generic/utsnamelen.h)0
-rw-r--r--bits/waitstatus.h (renamed from sysdeps/generic/waitstatus.h)12
-rw-r--r--catgets/nl_types.h1
-rw-r--r--config.h.in3
-rw-r--r--config.make.in1
-rwxr-xr-xconfigure137
-rw-r--r--configure.in18
-rw-r--r--csu/Makefile6
-rw-r--r--ctype/ctype-info.c10
-rw-r--r--ctype/ctype.h7
-rw-r--r--db/db.h7
-rw-r--r--db/mpool.h5
-rw-r--r--db/ndbm.h6
-rw-r--r--dirent/Makefile2
-rw-r--r--dirent/dirent.h10
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-lookup.c7
-rw-r--r--elf/dlfcn.h2
-rw-r--r--elf/elf.h43
-rw-r--r--elf/eval.c4
-rw-r--r--elf/link.h5
-rw-r--r--gmon/sys/gmon.h6
-rw-r--r--gmon/sys/gmon_out.h4
-rw-r--r--grp/fgetgrent.c2
-rw-r--r--grp/grp.h4
-rw-r--r--hurd/hurd/ioctl.h2
-rw-r--r--hurd/intr-msg.c4
-rw-r--r--include/aliases.h (renamed from aliases.h)0
-rw-r--r--include/alloca.h (renamed from alloca.h)0
-rw-r--r--include/argp.h (renamed from argp.h)0
-rw-r--r--include/argz.h (renamed from argz.h)0
-rw-r--r--include/arpa/ftp.h (renamed from arpa/ftp.h)0
-rw-r--r--include/arpa/inet.h (renamed from arpa/inet.h)0
-rw-r--r--include/arpa/nameser.h (renamed from arpa/nameser.h)0
-rw-r--r--include/arpa/telnet.h (renamed from arpa/telnet.h)0
-rw-r--r--include/arpa/tftp.h (renamed from arpa/tftp.h)0
-rw-r--r--include/assert.h (renamed from assert.h)0
-rw-r--r--include/bits/mathcalls.h1
-rw-r--r--include/bits/posix1_lim.h1
-rw-r--r--include/bits/posix2_lim.h1
-rw-r--r--include/bits/stab.def1
-rw-r--r--include/bits/xopen_lim.h (renamed from xopen_lim.h)8
-rw-r--r--include/ctype.h (renamed from ctype.h)0
-rw-r--r--include/db.h (renamed from db.h)0
-rw-r--r--include/dirent.h (renamed from dirent.h)0
-rw-r--r--include/dlfcn.h (renamed from dlfcn.h)0
-rw-r--r--include/elf.h (renamed from elf.h)0
-rw-r--r--include/endian.h (renamed from endian.h)0
-rw-r--r--include/envz.h (renamed from envz.h)0
-rw-r--r--include/err.h (renamed from err.h)0
-rw-r--r--include/errno.h (renamed from errno.h)14
-rw-r--r--include/error.h (renamed from error.h)0
-rw-r--r--include/fcntl.h (renamed from fcntl.h)0
-rw-r--r--include/features.h (renamed from features.h)77
-rw-r--r--include/fnmatch.h (renamed from fnmatch.h)0
-rw-r--r--include/ftw.h (renamed from ftw.h)0
-rw-r--r--include/getopt.h (renamed from getopt.h)0
-rw-r--r--include/glob.h (renamed from glob.h)0
-rw-r--r--include/gnu-versions.h (renamed from gnu-versions.h)0
-rw-r--r--include/grp.h (renamed from grp.h)0
-rw-r--r--include/langinfo.h (renamed from langinfo.h)0
-rw-r--r--include/libc-symbols.h (renamed from libc-symbols.h)0
-rw-r--r--include/libgen.h (renamed from libgen.h)0
-rw-r--r--include/libintl.h (renamed from libintl.h)0
-rw-r--r--include/limits.h (renamed from limits.h)6
-rw-r--r--include/linewrap.h (renamed from linewrap.h)0
-rw-r--r--include/link.h (renamed from link.h)0
-rw-r--r--include/locale.h (renamed from locale.h)0
-rw-r--r--include/malloc.h (renamed from malloc.h)0
-rw-r--r--include/math.h (renamed from math.h)0
-rw-r--r--include/mcheck.h (renamed from mcheck.h)0
-rw-r--r--include/memory.h (renamed from memory.h)0
-rw-r--r--include/monetary.h (renamed from monetary.h)0
-rw-r--r--include/netdb.h (renamed from netdb.h)0
-rw-r--r--include/netgroup.h (renamed from netgroup.h)0
-rw-r--r--include/netinet/ether.h (renamed from netinet/ether.h)0
-rw-r--r--include/netinet/in.h (renamed from netinet/in.h)0
-rw-r--r--include/nlist.h (renamed from nlist.h)0
-rw-r--r--include/nss.h (renamed from nss.h)0
-rw-r--r--include/nsswitch.h (renamed from nsswitch.h)0
-rw-r--r--include/obstack.h (renamed from obstack.h)0
-rw-r--r--include/poll.h (renamed from poll.h)0
-rw-r--r--include/printf.h (renamed from printf.h)0
-rw-r--r--include/protocols/routed.h (renamed from protocols/routed.h)0
-rw-r--r--include/protocols/rwhod.h (renamed from protocols/rwhod.h)0
-rw-r--r--include/protocols/talkd.h (renamed from protocols/talkd.h)0
-rw-r--r--include/protocols/timed.h (renamed from protocols/timed.h)0
-rw-r--r--include/pwd.h (renamed from pwd.h)0
-rw-r--r--include/regex.h (renamed from regex.h)0
-rw-r--r--include/resolv.h (renamed from resolv.h)0
-rw-r--r--include/rpc/auth_unix.h (renamed from rpc/auth_unix.h)0
-rw-r--r--include/rpc/clnt.h (renamed from rpc/clnt.h)0
-rw-r--r--include/rpc/netdb.h (renamed from rpc/netdb.h)0
-rw-r--r--include/rpc/pmap_clnt.h (renamed from rpc/pmap_clnt.h)0
-rw-r--r--include/rpc/pmap_prot.h (renamed from rpc/pmap_prot.h)0
-rw-r--r--include/rpc/pmap_rmt.h (renamed from rpc/pmap_rmt.h)0
-rw-r--r--include/rpc/rpc.h (renamed from rpc/rpc.h)0
-rw-r--r--include/rpc/rpc_msg.h (renamed from rpc/rpc_msg.h)0
-rw-r--r--include/rpc/svc.h (renamed from rpc/svc.h)0
-rw-r--r--include/rpc/svc_auth.h (renamed from rpc/svc_auth.h)0
-rw-r--r--include/rpc/types.h (renamed from rpc/types.h)0
-rw-r--r--include/rpc/xdr.h (renamed from rpc/xdr.h)0
-rw-r--r--include/sched.h (renamed from sched.h)0
-rw-r--r--include/search.h (renamed from search.h)0
-rw-r--r--include/set-hooks.h (renamed from set-hooks.h)31
-rw-r--r--include/setjmp.h (renamed from setjmp.h)0
-rw-r--r--include/sgtty.h (renamed from sgtty.h)0
-rw-r--r--include/shadow.h (renamed from shadow.h)0
-rw-r--r--include/signal.h (renamed from signal.h)0
-rw-r--r--include/stab.h1
-rw-r--r--include/stdio.h (renamed from stdio.h)0
-rw-r--r--include/stdlib.h (renamed from stdlib.h)0
-rw-r--r--include/string.h (renamed from string.h)0
-rw-r--r--include/strings.h (renamed from strings.h)0
-rw-r--r--include/sys/bitypes.h (renamed from sys/bitypes.h)0
-rw-r--r--include/sys/cdefs.h (renamed from sys/cdefs.h)0
-rw-r--r--include/sys/dir.h (renamed from sys/dir.h)0
-rw-r--r--include/sys/errno.h (renamed from sys/errno.h)0
-rw-r--r--include/sys/fcntl.h (renamed from sys/fcntl.h)0
-rw-r--r--include/sys/file.h (renamed from sys/file.h)0
-rw-r--r--include/sys/gmon.h (renamed from sys/gmon.h)0
-rw-r--r--include/sys/ioctl.h (renamed from sys/ioctl.h)0
-rw-r--r--include/sys/ipc.h (renamed from sys/ipc.h)0
-rw-r--r--include/sys/msg.h (renamed from sys/msg.h)0
-rw-r--r--include/sys/poll.h (renamed from sys/poll.h)0
-rw-r--r--include/sys/queue.h (renamed from sys/queue.h)0
-rw-r--r--include/sys/resource.h (renamed from sys/resource.h)0
-rw-r--r--include/sys/select.h (renamed from sys/select.h)0
-rw-r--r--include/sys/sem.h (renamed from sys/sem.h)0
-rw-r--r--include/sys/shm.h (renamed from sys/shm.h)0
-rw-r--r--include/sys/signal.h (renamed from sys/signal.h)0
-rw-r--r--include/sys/socket.h (renamed from sys/socket.h)0
-rw-r--r--include/sys/stat.h (renamed from sys/stat.h)0
-rw-r--r--include/sys/statfs.h (renamed from sys/statfs.h)0
-rw-r--r--include/sys/syslog.h (renamed from sys/syslog.h)0
-rw-r--r--include/sys/termios.h (renamed from sys/termios.h)0
-rw-r--r--include/sys/time.h (renamed from sys/time.h)0
-rw-r--r--include/sys/timeb.h (renamed from sys/timeb.h)0
-rw-r--r--include/sys/times.h (renamed from sys/times.h)0
-rw-r--r--include/sys/types.h (renamed from sys/types.h)0
-rw-r--r--include/sys/uio.h (renamed from sys/uio.h)0
-rw-r--r--include/sys/un.h (renamed from sys/un.h)0
-rw-r--r--include/sys/unistd.h (renamed from sys/unistd.h)0
-rw-r--r--include/sys/utsname.h (renamed from sys/utsname.h)0
-rw-r--r--include/sys/vlimit.h (renamed from sys/vlimit.h)0
-rw-r--r--include/sys/vtimes.h (renamed from sys/vtimes.h)0
-rw-r--r--include/sys/wait.h (renamed from sys/wait.h)0
-rw-r--r--include/syscall.h (renamed from syscall.h)0
-rw-r--r--include/sysexits.h (renamed from sysexits.h)0
-rw-r--r--include/syslog.h (renamed from syslog.h)0
-rw-r--r--include/tar.h (renamed from tar.h)0
-rw-r--r--include/termios.h (renamed from termios.h)0
-rw-r--r--include/time.h (renamed from time.h)0
-rw-r--r--include/ttyent.h (renamed from ttyent.h)0
-rw-r--r--include/unistd.h (renamed from unistd.h)0
-rw-r--r--include/utime.h (renamed from utime.h)0
-rw-r--r--include/utmp.h (renamed from utmp.h)0
-rw-r--r--include/values.h (renamed from values.h)2
-rw-r--r--include/wchar.h (renamed from wchar.h)0
-rw-r--r--include/wctype.h (renamed from wctype.h)0
-rw-r--r--include/wordexp.h (renamed from wordexp.h)0
-rw-r--r--include/xlocale.h (renamed from xlocale.h)0
-rw-r--r--inet/aliases.h2
-rw-r--r--inet/arpa/ftp.h6
-rw-r--r--inet/arpa/inet.h2
-rw-r--r--inet/arpa/telnet.h6
-rw-r--r--inet/arpa/tftp.h6
-rw-r--r--inet/getnameinfo.c2
-rw-r--r--inet/getnetgrent_r.c2
-rw-r--r--inet/inet_ntoa.c2
-rw-r--r--inet/netinet/ether.h4
-rw-r--r--inet/netinet/icmp6.h2
-rw-r--r--inet/netinet/in.h6
-rw-r--r--inet/netinet/ip6.h2
-rw-r--r--inet/protocols/routed.h6
-rw-r--r--inet/protocols/rwhod.h6
-rw-r--r--inet/protocols/talkd.h6
-rw-r--r--inet/protocols/timed.h6
-rw-r--r--intl/libintl.h2
-rw-r--r--io/Makefile4
-rw-r--r--io/fcntl.h6
-rw-r--r--io/fts.h6
-rw-r--r--io/ftw.h4
-rw-r--r--io/sys/poll.h4
-rw-r--r--io/sys/stat.h33
-rw-r--r--io/sys/statfs.h4
-rw-r--r--io/utime.h4
-rw-r--r--libc.map16
-rw-r--r--libio/_G_config.h4
-rw-r--r--libio/libio.h2
-rw-r--r--libio/libioP.h2
-rw-r--r--libio/stdio.h4
-rw-r--r--locale/duplocale.c2
-rw-r--r--locale/freelocale.c2
-rw-r--r--locale/lc-time.c2
-rw-r--r--locale/locale.h2
-rw-r--r--locale/programs/locale.c2
-rw-r--r--locale/setlocale.c2
-rw-r--r--login/Makefile2
-rw-r--r--login/getutent_r.c6
-rw-r--r--login/getutid_r.c2
-rw-r--r--login/getutline_r.c2
-rw-r--r--login/lastlog.h2
-rw-r--r--login/logout.c2
-rw-r--r--login/pty.h4
-rw-r--r--login/utmp-private.h3
-rw-r--r--login/utmp.h7
-rw-r--r--login/utmpname.c2
-rw-r--r--mach/msg-destroy.c24
-rw-r--r--malloc/malloc.h2
-rw-r--r--malloc/mtrace.c2
-rw-r--r--malloc/obstack.h6
-rw-r--r--malloc/thread-m.h2
-rw-r--r--manual/libc.texinfo9
-rw-r--r--math/Makefile12
-rw-r--r--math/bits/cmathcalls.h (renamed from math/cmathcalls.h)2
-rw-r--r--math/bits/mathcalls.h (renamed from math/mathcalls.h)2
-rw-r--r--math/complex.h14
-rw-r--r--math/fenv.h4
-rw-r--r--math/libm-test.c58
-rw-r--r--math/libm.map105
-rw-r--r--math/math.h22
-rw-r--r--math/math_private.h10
-rw-r--r--mathcalls.h1
-rw-r--r--md5-crypt/md5.h2
-rw-r--r--misc/Makefile10
-rw-r--r--misc/ar.h2
-rw-r--r--misc/bits/stab.def (renamed from misc/stab.def)0
-rw-r--r--misc/err.h5
-rw-r--r--misc/error.h6
-rw-r--r--misc/fstab.h6
-rw-r--r--misc/libgen.h2
-rw-r--r--misc/nlist.h2
-rw-r--r--misc/sgtty.h3
-rw-r--r--misc/stab.h2
-rw-r--r--misc/sys/cdefs.h2
-rw-r--r--misc/sys/dir.h2
-rw-r--r--misc/sys/file.h2
-rw-r--r--misc/sys/ioctl.h16
-rw-r--r--misc/sys/queue.h6
-rw-r--r--misc/sys/select.h6
-rw-r--r--misc/sys/syslog.h5
-rw-r--r--misc/sys/uio.h4
-rw-r--r--misc/sys/ustat.h10
-rw-r--r--misc/sysexits.h6
-rw-r--r--misc/syslog.c2
-rw-r--r--misc/ttyent.h6
-rw-r--r--nis/nss_compat/compat-grp.c2
-rw-r--r--nis/nss_compat/compat-pwd.c2
-rw-r--r--nis/nss_compat/compat-spwd.c2
-rw-r--r--nis/nss_nis/nis-alias.c2
-rw-r--r--nis/nss_nis/nis-ethers.c2
-rw-r--r--nis/nss_nis/nis-grp.c2
-rw-r--r--nis/nss_nis/nis-hosts.c2
-rw-r--r--nis/nss_nis/nis-netgrp.c2
-rw-r--r--nis/nss_nis/nis-network.c2
-rw-r--r--nis/nss_nis/nis-proto.c2
-rw-r--r--nis/nss_nis/nis-publickey.c4
-rw-r--r--nis/nss_nis/nis-pwd.c2
-rw-r--r--nis/nss_nis/nis-rpc.c2
-rw-r--r--nis/nss_nis/nis-service.c2
-rw-r--r--nis/nss_nis/nis-spwd.c2
-rw-r--r--nis/nss_nisplus/nisplus-alias.c2
-rw-r--r--nis/nss_nisplus/nisplus-ethers.c2
-rw-r--r--nis/nss_nisplus/nisplus-grp.c8
-rw-r--r--nis/nss_nisplus/nisplus-hosts.c2
-rw-r--r--nis/nss_nisplus/nisplus-netgrp.c24
-rw-r--r--nis/nss_nisplus/nisplus-network.c2
-rw-r--r--nis/nss_nisplus/nisplus-proto.c2
-rw-r--r--nis/nss_nisplus/nisplus-pwd.c2
-rw-r--r--nis/nss_nisplus/nisplus-rpc.c2
-rw-r--r--nis/nss_nisplus/nisplus-service.c2
-rw-r--r--nis/nss_nisplus/nisplus-spwd.c4
-rw-r--r--nis/ypclnt.c2
-rw-r--r--nss/Makefile6
-rw-r--r--nss/function.def95
-rw-r--r--nss/getXXbyYY.c2
-rw-r--r--nss/getXXent.c2
-rw-r--r--nss/getXXent_r.c2
-rw-r--r--nss/nss.h2
-rw-r--r--nss/nss_db/db-XXX.c2
-rw-r--r--nss/nss_db/db-alias.c2
-rw-r--r--nss/nss_db/db-netgrp.c2
-rw-r--r--nss/nss_files/files-XXX.c2
-rw-r--r--nss/nss_files/files-alias.c2
-rw-r--r--nss/nsswitch.c58
-rw-r--r--po/ko.po763
-rw-r--r--posix/Makefile11
-rw-r--r--posix/bits/posix1_lim.h (renamed from posix/posix1_lim.h)11
-rw-r--r--posix/bits/posix2_lim.h (renamed from posix/posix2_lim.h)9
-rw-r--r--posix/fnmatch.h1
-rw-r--r--posix/getopt.h2
-rw-r--r--posix/glob.h1
-rw-r--r--posix/regex.h6
-rw-r--r--posix/sched.h4
-rw-r--r--posix/sys/times.h2
-rw-r--r--posix/sys/types.h29
-rw-r--r--posix/sys/utsname.h5
-rw-r--r--posix/sys/wait.h8
-rw-r--r--posix/tar.h1
-rw-r--r--posix/unistd.h8
-rw-r--r--posix/wordexp.h2
-rw-r--r--posix1_lim.h1
-rw-r--r--posix2_lim.h1
-rw-r--r--pwd/fgetpwent.c2
-rw-r--r--pwd/pwd.h4
-rw-r--r--resolv/Makefile2
-rw-r--r--resolv/arpa/nameser.h6
-rw-r--r--resolv/netdb.h2
-rw-r--r--resolv/resolv.h6
-rw-r--r--resource/Makefile2
-rw-r--r--resource/sys/resource.h6
-rw-r--r--resource/sys/vlimit.h4
-rw-r--r--resource/sys/vtimes.h2
-rw-r--r--setjmp/Makefile2
-rw-r--r--setjmp/setjmp.h7
-rw-r--r--shadow/fgetspent.c2
-rw-r--r--shadow/lckpwdf.c2
-rw-r--r--shadow/sgetspent.c2
-rw-r--r--shadow/shadow.h2
-rw-r--r--signal/Makefile3
-rw-r--r--signal/signal.h10
-rw-r--r--signal/sigsetops.c2
-rw-r--r--socket/Makefile2
-rw-r--r--socket/sys/socket.h4
-rw-r--r--socket/sys/un.h4
-rw-r--r--stdio-common/Makefile2
-rw-r--r--stdio-common/vfprintf.c2
-rw-r--r--stdio-common/vfscanf.c2
-rw-r--r--stdio/stdio.h4
-rw-r--r--stdlib/alloca.h1
-rw-r--r--stdlib/atexit.c2
-rw-r--r--stdlib/exit.h1
-rw-r--r--stdlib/fmtmsg.c2
-rw-r--r--stdlib/fmtmsg.h2
-rw-r--r--stdlib/monetary.h2
-rw-r--r--stdlib/random.c2
-rw-r--r--stdlib/stdlib.h2
-rw-r--r--string/argz.h4
-rw-r--r--string/endian.h3
-rw-r--r--string/envz.h6
-rw-r--r--string/memory.h2
-rw-r--r--string/string.h2
-rw-r--r--string/strings.h2
-rw-r--r--sunrpc/rpc/auth_unix.h2
-rw-r--r--sunrpc/rpc/clnt.h2
-rw-r--r--sunrpc/rpc/netdb.h2
-rw-r--r--sunrpc/rpc/pmap_clnt.h1
-rw-r--r--sunrpc/rpc/pmap_prot.h2
-rw-r--r--sunrpc/rpc/pmap_rmt.h2
-rw-r--r--sunrpc/rpc/rpc.h7
-rw-r--r--sunrpc/rpc/rpc_msg.h1
-rw-r--r--sunrpc/rpc/svc.h6
-rw-r--r--sunrpc/rpc/svc_auth.h2
-rw-r--r--sunrpc/rpc/types.h6
-rw-r--r--sunrpc/rpc/xdr.h6
-rw-r--r--sysdeps/alpha/bits/endian.h (renamed from sysdeps/alpha/bytesex.h)0
-rw-r--r--sysdeps/alpha/bits/setjmp.h (renamed from sysdeps/alpha/jmp_buf.h)0
-rw-r--r--sysdeps/alpha/fpu/bits/fenv.h (renamed from sysdeps/alpha/fpu/fenvbits.h)9
-rw-r--r--sysdeps/alpha/fpu/bits/mathdef.h64
-rw-r--r--sysdeps/alpha/fpu/bits/mathinline.h (renamed from sysdeps/alpha/__math.h)0
-rw-r--r--sysdeps/alpha/w_sqrt.S2
-rw-r--r--sysdeps/arm/__longjmp.S2
-rw-r--r--sysdeps/arm/bits/endian.h (renamed from sysdeps/arm/bytesex.h)0
-rw-r--r--sysdeps/arm/bits/setjmp.h (renamed from sysdeps/arm/jmp_buf.h)0
-rw-r--r--sysdeps/arm/setjmp.S2
-rw-r--r--sysdeps/generic/Makefile2
-rw-r--r--sysdeps/generic/abort.c2
-rw-r--r--sysdeps/generic/bits/confname.h325
-rw-r--r--sysdeps/generic/bits/ioctl-types.h121
-rw-r--r--sysdeps/generic/bits/mathdef.h40
-rw-r--r--sysdeps/generic/bits/resource.h146
-rw-r--r--sysdeps/generic/bits/sched.h35
-rw-r--r--sysdeps/generic/bits/select.h29
-rw-r--r--sysdeps/generic/bits/sigaction.h50
-rw-r--r--sysdeps/generic/bits/sigset.h81
-rw-r--r--sysdeps/generic/bits/sockaddr.h41
-rw-r--r--sysdeps/generic/bits/socket.h200
-rw-r--r--sysdeps/generic/bits/statfs.h52
-rw-r--r--sysdeps/generic/bits/termios.h230
-rw-r--r--sysdeps/generic/bits/types.h94
-rw-r--r--sysdeps/generic/bits/uio.h32
-rw-r--r--sysdeps/generic/bits/ustat.h30
-rw-r--r--sysdeps/generic/bits/utmp.h53
-rw-r--r--sysdeps/generic/bits/utsname.h3
-rw-r--r--sysdeps/generic/bits/waitstatus.h104
-rw-r--r--sysdeps/generic/iovec.h9
-rw-r--r--sysdeps/generic/netinet/ip.h2
-rw-r--r--sysdeps/generic/schedbits.h35
-rw-r--r--sysdeps/generic/setenv.c2
-rw-r--r--sysdeps/generic/statfsbuf.h49
-rw-r--r--sysdeps/generic/sys/mman.h2
-rw-r--r--sysdeps/gnu/bits/utmp.h (renamed from sysdeps/gnu/utmpbits.h)0
-rw-r--r--sysdeps/i386/__longjmp.S2
-rw-r--r--sysdeps/i386/bits/endian.h (renamed from sysdeps/i386/bytesex.h)0
-rw-r--r--sysdeps/i386/bits/huge_val.h (renamed from sysdeps/i386/huge_val.h)8
-rw-r--r--sysdeps/i386/bits/select.h (renamed from sysdeps/i386/selectbits.h)8
-rw-r--r--sysdeps/i386/bits/setjmp.h (renamed from sysdeps/i386/jmp_buf.h)0
-rw-r--r--sysdeps/i386/dl-machine.h4
-rw-r--r--sysdeps/i386/fpu/bits/fenv.h (renamed from sysdeps/i386/fpu/fenvbits.h)8
-rw-r--r--sysdeps/i386/fpu/bits/mathdef.h (renamed from sysdeps/i386/fpu/mathbits.h)8
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h (renamed from sysdeps/i386/fpu/__math.h)6
-rw-r--r--sysdeps/i386/setjmp.S2
-rw-r--r--sysdeps/ieee754/bits/huge_val.h (renamed from sysdeps/ieee754/huge_val.h)13
-rw-r--r--sysdeps/ieee754/bits/nan.h (renamed from sysdeps/ieee754/nan.h)33
-rw-r--r--sysdeps/libm-ieee754/k_standard.c88
-rw-r--r--sysdeps/libm-ieee754/w_gamma.c6
-rw-r--r--sysdeps/libm-ieee754/w_gammaf.c6
-rw-r--r--sysdeps/libm-ieee754/w_gammal.c6
-rw-r--r--sysdeps/m68k/bits/endian.h (renamed from sysdeps/m68k/bytesex.h)0
-rw-r--r--sysdeps/m68k/bits/huge_val.h (renamed from sysdeps/m68k/huge_val.h)26
-rw-r--r--sysdeps/m68k/bits/setjmp.h (renamed from sysdeps/m68k/jmp_buf.h)0
-rw-r--r--sysdeps/m68k/dl-machine.h4
-rw-r--r--sysdeps/m68k/fpu/bits/fenv.h (renamed from sysdeps/m68k/fpu/fenvbits.h)8
-rw-r--r--sysdeps/m68k/fpu/bits/mathdef.h (renamed from sysdeps/m68k/fpu/mathbits.h)8
-rw-r--r--sysdeps/m68k/fpu/bits/mathinline.h (renamed from sysdeps/m68k/fpu/__math.h)0
-rw-r--r--sysdeps/m68k/fpu/switch/bits/mathinline.h (renamed from sysdeps/m68k/fpu/switch/__math.h)0
-rw-r--r--sysdeps/mach/bits/libc-lock.h (renamed from sysdeps/mach/libc-lock.h)6
-rw-r--r--sysdeps/mach/hurd/alpha/bits/sigcontext.h (renamed from sysdeps/mach/hurd/alpha/sigcontext.h)0
-rw-r--r--sysdeps/mach/hurd/bits/errno.h (renamed from sysdeps/mach/hurd/errnos.h)0
-rw-r--r--sysdeps/mach/hurd/bits/fcntl.h (renamed from sysdeps/mach/hurd/fcntlbits.h)10
-rw-r--r--sysdeps/mach/hurd/bits/ioctls.h (renamed from sysdeps/mach/hurd/ioctls.h)44
-rw-r--r--sysdeps/mach/hurd/bits/local_lim.h (renamed from sysdeps/mach/hurd/local_lim.h)0
-rw-r--r--sysdeps/mach/hurd/bits/posix_opt.h (renamed from sysdeps/mach/hurd/posix_opt.h)0
-rw-r--r--sysdeps/mach/hurd/bits/stat.h (renamed from sysdeps/mach/hurd/statbuf.h)17
-rw-r--r--sysdeps/mach/hurd/dirstream.h2
-rw-r--r--sysdeps/mach/hurd/hppa/bits/sigcontext.h (renamed from sysdeps/mach/hurd/hppa/sigcontext.h)0
-rw-r--r--sysdeps/mach/hurd/i386/bits/sigcontext.h (renamed from sysdeps/mach/hurd/i386/sigcontext.h)0
-rw-r--r--sysdeps/mach/hurd/ioctl.c8
-rw-r--r--sysdeps/mach/hurd/jmp-unwind.c2
-rw-r--r--sysdeps/mach/hurd/mips/bits/sigcontext.h (renamed from sysdeps/mach/hurd/mips/sigcontext.h)0
-rw-r--r--sysdeps/mach/hurd/mips/dl-machine.c131
-rw-r--r--sysdeps/mach/hurd/mips/exc2signal.c65
-rw-r--r--sysdeps/mach/hurd/mips/init-fault.c41
-rw-r--r--sysdeps/mach/hurd/mips/init-first.c407
-rw-r--r--sysdeps/mach/hurd/mips/intr-msg.h127
-rw-r--r--sysdeps/mach/hurd/mips/longjmp-ctx.c41
-rw-r--r--sysdeps/mach/hurd/mips/longjmp-ts.c34
-rw-r--r--sysdeps/mach/hurd/mips/sigreturn.c100
-rw-r--r--sysdeps/mach/hurd/mips/trampoline.c217
-rw-r--r--sysdeps/mach/hurd/select.c2
-rw-r--r--sysdeps/mach/mips/cacheflush.c30
-rw-r--r--sysdeps/mach/mips/machine-lock.h63
-rw-r--r--sysdeps/mach/mips/machine-sp.h34
-rw-r--r--sysdeps/mach/mips/syscall.S57
-rw-r--r--sysdeps/mach/mips/sysdep.h58
-rw-r--r--sysdeps/mach/mips/thread_state.h33
-rw-r--r--sysdeps/mach/start.c3
-rw-r--r--sysdeps/mips/add_n.S121
-rw-r--r--sysdeps/mips/add_n.s120
-rw-r--r--sysdeps/mips/addmul_1.S98
-rw-r--r--sysdeps/mips/addmul_1.s97
-rw-r--r--sysdeps/mips/bits/endian.h (renamed from sysdeps/mips/bytesex.h)0
-rw-r--r--sysdeps/mips/bits/setjmp.h53
-rw-r--r--sysdeps/mips/bsd-_setjmp.S43
-rw-r--r--sysdeps/mips/bsd-setjmp.S39
-rw-r--r--sysdeps/mips/dec/bits/endian.h (renamed from sysdeps/mips/dec/bytesex.h)0
-rw-r--r--sysdeps/mips/dl-machine.h387
-rw-r--r--sysdeps/mips/elf/start.S181
-rw-r--r--sysdeps/mips/fpu_control.h96
-rw-r--r--sysdeps/mips/init-first.c64
-rw-r--r--sysdeps/mips/jmp_buf.h53
-rw-r--r--sysdeps/mips/lshift.S97
-rw-r--r--sysdeps/mips/lshift.s95
-rw-r--r--sysdeps/mips/machine-gmon.h57
-rw-r--r--sysdeps/mips/mips64/Implies1
-rw-r--r--sysdeps/mips/mips64/__longjmp.c85
-rw-r--r--sysdeps/mips/mips64/add_n.S129
-rw-r--r--sysdeps/mips/mips64/addmul_1.S106
-rw-r--r--sysdeps/mips/mips64/bits/setjmp.h54
-rw-r--r--sysdeps/mips/mips64/bsd-_setjmp.S36
-rw-r--r--sysdeps/mips/mips64/bsd-setjmp.S36
-rw-r--r--sysdeps/mips/mips64/gmp-mparam.h4
-rw-r--r--sysdeps/mips/mips64/lshift.S104
-rw-r--r--sysdeps/mips/mips64/mul_1.S94
-rw-r--r--sysdeps/mips/mips64/rshift.S101
-rw-r--r--sysdeps/mips/mips64/setjmp.S35
-rw-r--r--sysdeps/mips/mips64/setjmp_aux.c67
-rw-r--r--sysdeps/mips/mips64/sub_n.S129
-rw-r--r--sysdeps/mips/mips64/submul_1.S106
-rw-r--r--sysdeps/mips/mipsel/bits/endian.h (renamed from sysdeps/mips/mipsel/bytesex.h)0
-rw-r--r--sysdeps/mips/mul_1.S86
-rw-r--r--sysdeps/mips/mul_1.s85
-rw-r--r--sysdeps/mips/p40/bits/endian.h (renamed from sysdeps/mips/p40/bytesex.h)0
-rw-r--r--sysdeps/mips/rshift.S94
-rw-r--r--sysdeps/mips/rshift.s92
-rw-r--r--sysdeps/mips/setjmp.S43
-rw-r--r--sysdeps/mips/setjmp_aux.c27
-rw-r--r--sysdeps/mips/sub_n.S121
-rw-r--r--sysdeps/mips/sub_n.s120
-rw-r--r--sysdeps/mips/submul_1.S98
-rw-r--r--sysdeps/mips/submul_1.s97
-rw-r--r--sysdeps/posix/Makefile12
-rw-r--r--sysdeps/posix/mk-stdiolim.c8
-rw-r--r--sysdeps/powerpc/__longjmp.S2
-rw-r--r--sysdeps/powerpc/bits/fenv.h (renamed from sysdeps/powerpc/fenvbits.h)8
-rw-r--r--sysdeps/powerpc/bits/mathdef.h (renamed from sysdeps/powerpc/mathbits.h)8
-rw-r--r--sysdeps/powerpc/bits/mathinline.h (renamed from sysdeps/powerpc/__math.h)0
-rw-r--r--sysdeps/powerpc/bits/setjmp.h (renamed from sysdeps/powerpc/jmp_buf.h)2
-rw-r--r--sysdeps/powerpc/dl-machine.h4
-rw-r--r--sysdeps/powerpc/setjmp.S2
-rw-r--r--sysdeps/sparc/__longjmp.S30
-rw-r--r--sysdeps/sparc/bits/endian.h (renamed from sysdeps/sparc/bytesex.h)0
-rw-r--r--sysdeps/sparc/bits/setjmp.h (renamed from sysdeps/sparc/jmp_buf.h)0
-rw-r--r--sysdeps/sparc/setjmp.S2
-rw-r--r--sysdeps/standalone/arm/bits/errno.h (renamed from sysdeps/standalone/arm/errnos.h)0
-rw-r--r--sysdeps/standalone/bits/stdio_lim.h (renamed from sysdeps/standalone/stdio_lim.h)0
-rw-r--r--sysdeps/standalone/close.c2
-rw-r--r--sysdeps/standalone/filedesc.h2
-rw-r--r--sysdeps/standalone/open.c2
-rw-r--r--sysdeps/stub/bits/dirent.h (renamed from sysdeps/stub/direntry.h)0
-rw-r--r--sysdeps/stub/bits/elfclass.h (renamed from sysdeps/stub/elfclass.h)0
-rw-r--r--sysdeps/stub/bits/endian.h (renamed from sysdeps/stub/bytesex.h)4
-rw-r--r--sysdeps/stub/bits/errno.h (renamed from sysdeps/stub/errnos.h)0
-rw-r--r--sysdeps/stub/bits/fcntl.h (renamed from sysdeps/stub/fcntlbits.h)11
-rw-r--r--sysdeps/stub/bits/fenv.h (renamed from sysdeps/stub/fenvbits.h)8
-rw-r--r--sysdeps/stub/bits/huge_val.h (renamed from sysdeps/stub/huge_val.h)8
-rw-r--r--sysdeps/stub/bits/ioctls.h (renamed from sysdeps/stub/ioctls.h)0
-rw-r--r--sysdeps/stub/bits/ipc.h (renamed from sysdeps/stub/sys/ipc_buf.h)0
-rw-r--r--sysdeps/stub/bits/libc-lock.h (renamed from sysdeps/stub/libc-lock.h)6
-rw-r--r--sysdeps/stub/bits/local_lim.h (renamed from sysdeps/stub/local_lim.h)0
-rw-r--r--sysdeps/stub/bits/mathinline.h (renamed from sysdeps/stub/__math.h)0
-rw-r--r--sysdeps/stub/bits/msq.h47
-rw-r--r--sysdeps/stub/bits/nan.h5
-rw-r--r--sysdeps/stub/bits/posix_opt.h (renamed from sysdeps/stub/posix_opt.h)0
-rw-r--r--sysdeps/stub/bits/sem.h (renamed from sysdeps/stub/sys/sem_buf.h)10
-rw-r--r--sysdeps/stub/bits/setjmp.h (renamed from sysdeps/stub/jmp_buf.h)0
-rw-r--r--sysdeps/stub/bits/shm.h (renamed from sysdeps/stub/sys/shm_buf.h)10
-rw-r--r--sysdeps/stub/bits/sigcontext.h (renamed from sysdeps/stub/sigcontext.h)0
-rw-r--r--sysdeps/stub/bits/signum.h (renamed from sysdeps/stub/signum.h)0
-rw-r--r--sysdeps/stub/bits/stat.h (renamed from sysdeps/stub/statbuf.h)13
-rw-r--r--sysdeps/stub/bits/stdio_lim.h (renamed from sysdeps/stub/stdio_lim.h)0
-rw-r--r--sysdeps/stub/bits/time.h (renamed from sysdeps/stub/timebits.h)12
-rw-r--r--sysdeps/stub/bits/waitflags.h (renamed from sysdeps/stub/waitflags.h)9
-rw-r--r--sysdeps/stub/nan.h6
-rw-r--r--sysdeps/stub/sys/msq_buf.h47
-rw-r--r--sysdeps/unix/Makefile49
-rw-r--r--sysdeps/unix/bsd/bits/dirent.h (renamed from sysdeps/unix/bsd/direntry.h)0
-rw-r--r--sysdeps/unix/bsd/bits/fcntl.h (renamed from sysdeps/unix/bsd/fcntlbits.h)11
-rw-r--r--sysdeps/unix/bsd/bits/posix_opt.h (renamed from sysdeps/unix/bsd/posix_opt.h)0
-rw-r--r--sysdeps/unix/bsd/bits/signum.h (renamed from sysdeps/unix/bsd/signum.h)0
-rw-r--r--sysdeps/unix/bsd/bits/stat.h (renamed from sysdeps/unix/bsd/statbuf.h)11
-rw-r--r--sysdeps/unix/bsd/bits/waitflags.h (renamed from sysdeps/unix/bsd/waitflags.h)9
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/dirent.h (renamed from sysdeps/unix/bsd/bsd4.4/direntry.h)0
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/errno.h (renamed from sysdeps/unix/bsd/bsd4.4/errnos.h)0
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/fcntl.h (renamed from sysdeps/unix/bsd/bsd4.4/fcntlbits.h)11
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/ioctls.h (renamed from sysdeps/unix/bsd/bsd4.4/ioctls.h)0
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (renamed from sysdeps/unix/bsd/bsd4.4/sockaddrcom.h)10
-rw-r--r--sysdeps/unix/bsd/bsd4.4/tcgetattr.c2
-rw-r--r--sysdeps/unix/bsd/bsd4.4/tcsetattr.c2
-rw-r--r--sysdeps/unix/bsd/m68k/sysdep.S2
-rw-r--r--sysdeps/unix/bsd/osf/alpha/bits/stat.h (renamed from sysdeps/unix/bsd/osf/alpha/statbuf.h)14
-rw-r--r--sysdeps/unix/bsd/osf/bits/sigaction.h (renamed from sysdeps/unix/bsd/osf/sigaction.h)0
-rw-r--r--sysdeps/unix/bsd/osf/sys/mman.h2
-rw-r--r--sysdeps/unix/bsd/sun/bits/signum.h (renamed from sysdeps/unix/bsd/sun/signum.h)0
-rw-r--r--sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h (renamed from sysdeps/unix/bsd/sun/m68k/sigcontext.h)0
-rw-r--r--sysdeps/unix/bsd/sun/m68k/sethostid.S2
-rw-r--r--sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h (renamed from sysdeps/unix/bsd/sun/sparc/sigcontext.h)0
-rw-r--r--sysdeps/unix/bsd/sun/sparc/sethostid.S4
-rw-r--r--sysdeps/unix/bsd/sun/sunos4/bits/fcntl.h (renamed from sysdeps/unix/bsd/sun/sunos4/fcntlbits.h)11
-rw-r--r--sysdeps/unix/bsd/sun/sunos4/bits/resource.h (renamed from sysdeps/unix/bsd/sun/sunos4/resourcebits.h)0
-rw-r--r--sysdeps/unix/bsd/sun/sunos4/bits/termios.h (renamed from sysdeps/unix/bsd/sun/sunos4/termbits.h)0
-rw-r--r--sysdeps/unix/bsd/sun/sunos4/bits/utsname.h (renamed from sysdeps/unix/bsd/sun/sunos4/utsnamelen.h)0
-rw-r--r--sysdeps/unix/bsd/sun/sunos4/sys/mman.h2
-rw-r--r--sysdeps/unix/bsd/ultrix4/bits/fcntl.h (renamed from sysdeps/unix/bsd/ultrix4/fcntlbits.h)11
-rw-r--r--sysdeps/unix/bsd/ultrix4/bits/posix_opt.h (renamed from sysdeps/unix/bsd/ultrix4/posix_opt.h)0
-rw-r--r--sysdeps/unix/bsd/ultrix4/bits/utsname.h (renamed from sysdeps/unix/bsd/ultrix4/utsnamelen.h)0
-rw-r--r--sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h (renamed from sysdeps/unix/bsd/ultrix4/mips/sigcontext.h)0
-rw-r--r--sysdeps/unix/bsd/ultrix4/sys/mman.h2
-rw-r--r--sysdeps/unix/bsd/vax/sysdep.S2
-rw-r--r--sysdeps/unix/common/bits/dirent.h (renamed from sysdeps/unix/common/direntry.h)0
-rw-r--r--sysdeps/unix/common/bits/fcntl.h (renamed from sysdeps/unix/common/fcntlbits.h)11
-rw-r--r--sysdeps/unix/dirstream.h2
-rw-r--r--sysdeps/unix/i386/sysdep.S2
-rw-r--r--sysdeps/unix/mips/sysdep.S2
-rw-r--r--sysdeps/unix/mk-local_lim.c3
-rw-r--r--sysdeps/unix/sparc/sysdep.S2
-rw-r--r--sysdeps/unix/sysv/bits/dirent.h (renamed from sysdeps/unix/sysv/direntry.h)0
-rw-r--r--sysdeps/unix/sysv/bits/fcntl.h (renamed from sysdeps/unix/sysv/fcntlbits.h)10
-rw-r--r--sysdeps/unix/sysv/bits/local_lim.h (renamed from sysdeps/unix/sysv/local_lim.h)0
-rw-r--r--sysdeps/unix/sysv/bits/signum.h (renamed from sysdeps/unix/sysv/signum.h)0
-rw-r--r--sysdeps/unix/sysv/bits/stat.h (renamed from sysdeps/unix/sysv/statbuf.h)12
-rw-r--r--sysdeps/unix/sysv/bits/utmp.h57
-rw-r--r--sysdeps/unix/sysv/bits/utsname.h (renamed from sysdeps/unix/sysv/utsnamelen.h)0
-rw-r--r--sysdeps/unix/sysv/irix4/bits/confname.h (renamed from sysdeps/unix/sysv/irix4/confname.h)0
-rw-r--r--sysdeps/unix/sysv/irix4/bits/fcntl.h (renamed from sysdeps/unix/sysv/irix4/fcntlbits.h)11
-rw-r--r--sysdeps/unix/sysv/irix4/bits/signum.h (renamed from sysdeps/unix/sysv/irix4/signum.h)0
-rw-r--r--sysdeps/unix/sysv/irix4/bits/stat.h (renamed from sysdeps/unix/sysv/irix4/statbuf.h)12
-rw-r--r--sysdeps/unix/sysv/irix4/sys/mman.h2
-rw-r--r--sysdeps/unix/sysv/linux/Dist4
-rw-r--r--sysdeps/unix/sysv/linux/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (renamed from sysdeps/unix/sysv/linux/alpha/fcntlbits.h)8
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/ioctls.h (renamed from sysdeps/unix/sysv/linux/alpha/ioctls.h)12
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/ipc.h (renamed from sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/sigaction.h (renamed from sysdeps/unix/sysv/linux/alpha/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/signum.h (renamed from sysdeps/unix/sysv/linux/alpha/signum.h)0
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/stat.h (renamed from sysdeps/unix/sysv/linux/alpha/statbuf.h)10
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/termios.h (renamed from sysdeps/unix/sysv/linux/alpha/termbits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/time.h (renamed from sysdeps/unix/sysv/linux/alpha/timebits.h)12
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/types.h (renamed from sysdeps/unix/sysv/linux/alpha/gnu/types.h)33
-rw-r--r--sysdeps/unix/sysv/linux/alpha/brk.S2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel_termios.h (renamed from sysdeps/unix/sysv/linux/powerpc/sys/kernel_termios.h)15
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h25
-rw-r--r--sysdeps/unix/sysv/linux/arm/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/arm/profil-counter.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/bits/dirent.h (renamed from sysdeps/unix/sysv/linux/direntry.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/errno.h (renamed from sysdeps/unix/sysv/linux/errnos.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/fcntl.h (renamed from sysdeps/unix/sysv/linux/fcntlbits.h)8
-rw-r--r--sysdeps/unix/sysv/linux/bits/ioctl-types.h (renamed from sysdeps/unix/sysv/linux/ioctl-types.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/ioctls.h (renamed from sysdeps/unix/sysv/linux/ioctls.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/ipc.h (renamed from sysdeps/unix/sysv/linux/sys/ipc_buf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/local_lim.h (renamed from sysdeps/unix/sysv/linux/local_lim.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/msq.h (renamed from sysdeps/unix/sysv/linux/sys/msq_buf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/posix_opt.h (renamed from sysdeps/unix/sysv/linux/posix_opt.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/resource.h (renamed from sysdeps/unix/sysv/linux/resourcebits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/sched.h (renamed from sysdeps/unix/sysv/linux/schedbits.h)9
-rw-r--r--sysdeps/unix/sysv/linux/bits/sem.h (renamed from sysdeps/unix/sysv/linux/sys/sem_buf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/shm.h (renamed from sysdeps/unix/sysv/linux/sys/shm_buf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/sigaction.h (renamed from sysdeps/unix/sysv/linux/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/sigcontext.h (renamed from sysdeps/unix/sysv/linux/sigcontext.h)9
-rw-r--r--sysdeps/unix/sysv/linux/bits/signum.h (renamed from sysdeps/unix/sysv/linux/signum.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/sigset.h (renamed from sysdeps/unix/sysv/linux/sigset.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h (renamed from sysdeps/unix/sysv/linux/socketbits.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/stat.h (renamed from sysdeps/unix/sysv/linux/statbuf.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/statfs.h (renamed from sysdeps/unix/sysv/linux/statfsbuf.h)12
-rw-r--r--sysdeps/unix/sysv/linux/bits/termios.h (renamed from sysdeps/unix/sysv/linux/termbits.h)11
-rw-r--r--sysdeps/unix/sysv/linux/bits/time.h (renamed from sysdeps/unix/sysv/linux/timebits.h)10
-rw-r--r--sysdeps/unix/sysv/linux/bits/types.h (renamed from sysdeps/unix/sysv/linux/gnu/types.h)20
-rw-r--r--sysdeps/unix/sysv/linux/bits/uio.h (renamed from sysdeps/unix/sysv/linux/iovec.h)7
-rw-r--r--sysdeps/unix/sysv/linux/bits/ustat.h (renamed from sysdeps/unix/sysv/linux/ustatbits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/utsname.h (renamed from sysdeps/unix/sysv/linux/utsnamelen.h)0
-rw-r--r--sysdeps/unix/sysv/linux/bits/waitflags.h (renamed from sysdeps/unix/sysv/linux/waitflags.h)9
-rw-r--r--sysdeps/unix/sysv/linux/i386/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/i386/profil-counter.h2
-rw-r--r--sysdeps/unix/sysv/linux/i386/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/kernel_termios.h38
-rw-r--r--sysdeps/unix/sysv/linux/m68k/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/netinet/ip.h4
-rw-r--r--sysdeps/unix/sysv/linux/netinet/tcp.h2
-rw-r--r--sysdeps/unix/sysv/linux/netipx/ipx.h90
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/ioctl-types.h (renamed from sysdeps/unix/sysv/linux/powerpc/ioctl-types.h)0
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/termios.h (renamed from sysdeps/unix/sysv/linux/powerpc/termbits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/kernel_termios.h26
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/socketcall.h (renamed from sysdeps/unix/sysv/linux/sys/socketcall.h)0
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (renamed from sysdeps/unix/sysv/linux/sparc/fcntlbits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/ioctls.h (renamed from sysdeps/unix/sysv/linux/sparc/ioctls.h)12
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/sigaction.h (renamed from sysdeps/unix/sysv/linux/sparc/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/signum.h (renamed from sysdeps/unix/sysv/linux/sparc/signum.h)0
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/termios.h (renamed from sysdeps/unix/sysv/linux/sparc/termbits.h)0
-rw-r--r--sysdeps/unix/sysv/linux/sparc/profil-counter.h2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/sys/kernel_termios.h20
-rw-r--r--sysdeps/unix/sysv/linux/sys/mman.h2
-rw-r--r--sysdeps/unix/sysv/linux/sys/syscall.h4
-rw-r--r--sysdeps/unix/sysv/linux/tcgetattr.c2
-rw-r--r--sysdeps/unix/sysv/linux/tcsetattr.c2
-rw-r--r--sysdeps/unix/sysv/minix/bits/sigaction.h (renamed from sysdeps/unix/sysv/minix/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/sco3.2.4/bits/confname.h (renamed from sysdeps/unix/sysv/sco3.2.4/confname.h)0
-rw-r--r--sysdeps/unix/sysv/sco3.2.4/bits/sigaction.h (renamed from sysdeps/unix/sysv/sco3.2.4/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/sco3.2.4/sysconf.S2
-rw-r--r--sysdeps/unix/sysv/sco3.2/bits/local_lim.h (renamed from sysdeps/unix/sysv/sco3.2/local_lim.h)6
-rw-r--r--sysdeps/unix/sysv/sysv4/bits/sigaction.h (renamed from sysdeps/unix/sysv/sysv4/sigaction.h)0
-rw-r--r--sysdeps/unix/sysv/sysv4/bits/signum.h (renamed from sysdeps/unix/sysv/sysv4/signum.h)0
-rw-r--r--sysdeps/unix/sysv/sysv4/bits/sigset.h (renamed from sysdeps/unix/sysv/sysv4/sigset.h)0
-rw-r--r--sysdeps/unix/sysv/sysv4/bits/utsname.h (renamed from sysdeps/unix/sysv/sysv4/utsnamelen.h)0
-rw-r--r--sysdeps/unix/sysv/sysv4/bits/waitflags.h (renamed from sysdeps/unix/sysv/sysv4/waitflags.h)9
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/bits/stat.h (renamed from sysdeps/unix/sysv/sysv4/i386/statbuf.h)12
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/bits/signum.h (renamed from sysdeps/unix/sysv/sysv4/solaris2/signum.h)0
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h (renamed from sysdeps/unix/sysv/sysv4/solaris2/statbuf.h)14
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/sparc/bits/sigcontext.h1
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/sparc/sigcontext.h1
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.S2
-rw-r--r--sysdeps/unix/sysv/utmpbits.h58
-rw-r--r--sysdeps/vax/bits/huge_val.h (renamed from sysdeps/vax/huge_val.h)8
-rw-r--r--sysdeps/vax/bits/setjmp.h (renamed from sysdeps/vax/jmp_buf.h)0
-rw-r--r--sysdeps/wordsize-32/bits/elfclass.h (renamed from sysdeps/wordsize-32/elfclass.h)0
-rw-r--r--sysdeps/wordsize-32/inttypes.h5
-rw-r--r--sysdeps/wordsize-64/bits/elfclass.h (renamed from sysdeps/wordsize-64/elfclass.h)0
-rw-r--r--sysdeps/wordsize-64/inttypes.h5
-rw-r--r--sysvipc/Makefile2
-rw-r--r--sysvipc/sys/ipc.h4
-rw-r--r--sysvipc/sys/msg.h2
-rw-r--r--sysvipc/sys/sem.h6
-rw-r--r--sysvipc/sys/shm.h6
-rw-r--r--termios/Makefile4
-rw-r--r--termios/sys/ttychars.h10
-rw-r--r--termios/termios.h10
-rw-r--r--time/Makefile2
-rw-r--r--time/localtime.c2
-rw-r--r--time/sys/time.h4
-rw-r--r--time/sys/timeb.h2
-rw-r--r--time/time.h6
-rw-r--r--time/tzset.c2
-rw-r--r--wcsmbs/wchar.h2
-rw-r--r--wctype/wctype.h7
724 files changed, 8845 insertions, 3046 deletions
diff --git a/ChangeLog b/ChangeLog
index cb09bdf38b..1c133418a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,808 @@
+1997-06-21 02:48 Ulrich Drepper <drepper@cygnus.com>
+
+ * config.h.in: Add DO_STATIC_NSS.
+ * config.make.in: Add build-static-nss.
+
+ * elf/eval.c: Use __getdelim instead of __getline.
+
+ * locale/programs/locale.c: Correct comment.
+
+ * manual/libc.texinfo: Update copyright and date.
+ Remove A4 option.
+
+ * sysdeps/libm-ieee754/k_standard.c: Always return HUGE_VAL
+ for gamma overflow.
+ * sysdeps/libm-ieee754/w_gamma.c: Handle SVID and ISO C behaviour.
+ * sysdeps/libm-ieee754/w_gammaf.c: Likewise.
+ * sysdeps/libm-ieee754/w_gammalp.c: Likewise.
+
+ * po/ko.po: Update.
+
+1997-06-13 10:06 Richard Henderson <rth@tamu.edu>
+
+ The Great Bit File Move:
+ * configure.in (AC_INIT): Look in include/ for features.h.
+ (sysnames): Add include as the final search directory.
+ (AC_OUTPUT): Create a bits directory in the build directory.
+ * Makeconfig (CPPFLAGS): Look in include/ for libc-symbols.h.
+ * Makefile: Make sure the target directory exists when installing
+ <gnu/stubs.h> and <gnu/lib-names.h>.
+ * csu/Makefile: Use $(compile.S) and $(compile.c) instead of
+ invoking $(CC) directly, as the former have the full include path.
+
+ * ansidecl.h: Removed.
+
+ * aliases.h: Moved to include/.
+ * alloca.h: Likewise.
+ * argp.h: Likewise.
+ * argz.h: Likewise.
+ * arpa/ftp.h: Likewise.
+ * arpa/inet.h: Likewise.
+ * arpa/nameser.h: Likewise.
+ * arpa/telnet.h: Likewise.
+ * arpa/tftp.h: Likewise.
+ * assert.h: Likewise.
+ * ctype.h: Likewise.
+ * db.h: Likewise.
+ * dirent.h: Likewise.
+ * dlfcn.h: Likewise.
+ * elf.h: Likewise.
+ * endian.h: Likewise.
+ * envz.h: Likewise.
+ * err.h: Likewise.
+ * errno.h: Likewise.
+ * error.h: Likewise.
+ * fcntl.h: Likewise.
+ * features.h: Likewise.
+ * fnmatch.h: Likewise.
+ * ftw.h: Likewise.
+ * getopt.h: Likewise.
+ * glob.h: Likewise.
+ * gnu-versions.h: Likewise.
+ * grp.h: Likewise.
+ * langinfo.h: Likewise.
+ * libc-symbols.h: Likewise.
+ * libgen.h: Likewise.
+ * libintl.h: Likewise.
+ * limits.h: Likewise.
+ * linewrap.h: Likewise.
+ * link.h: Likewise.
+ * locale.h: Likewise.
+ * malloc.h: Likewise.
+ * math.h: Likewise.
+ * mathcalls.h: Likewise.
+ * mcheck.h: Likewise.
+ * memory.h: Likewise.
+ * netdb.h: Likewise.
+ * netgroup.h: Likewise.
+ * netinet/ether.h: Likewise.
+ * netinet/in.h: Likewise.
+ * nlist.h: Likewise.
+ * nss.h: Likewise.
+ * nsswitch.h: Likewise.
+ * obstack.h: Likewise.
+ * poll.h: Likewise.
+ * posix1_lim.h: Likewise.
+ * posix2_lim.h: Likewise.
+ * printf.h: Likewise.
+ * protocols/routed.h: Likewise.
+ * protocols/rwhod.h: Likewise.
+ * protocols/talkd.h: Likewise.
+ * protocols/timed.h: Likewise.
+ * pwd.h: Likewise.
+ * regex.h: Likewise.
+ * resolv.h: Likewise.
+ * rpc/auth_unix.h: Likewise.
+ * rpc/clnt.h: Likewise.
+ * rpc/netdb.h: Likewise.
+ * rpc/pmap_clnt.h: Likewise.
+ * rpc/pmap_prot.h: Likewise.
+ * rpc/pmap_rmt.h: Likewise.
+ * rpc/rpc.h: Likewise.
+ * rpc/rpc_msg.h: Likewise.
+ * rpc/svc.h: Likewise.
+ * rpc/svc_auth.h: Likewise.
+ * rpc/types.h: Likewise.
+ * rpc/xdr.h: Likewise.
+ * sched.h: Likewise.
+ * search.h: Likewise.
+ * set-hooks.h: Likewise.
+ * setjmp.h: Likewise.
+ * sgtty.h: Likewise.
+ * shadow.h: Likewise.
+ * signal.h: Likewise.
+ * stab.def: Likewise.
+ * stab.h: Likewise.
+ * stdio.h: Likewise.
+ * stdlib.h: Likewise.
+ * string.h: Likewise.
+ * strings.h: Likewise.
+ * sys/bitypes.h: Likewise.
+ * sys/cdefs.h: Likewise.
+ * sys/dir.h: Likewise.
+ * sys/errno.h: Likewise.
+ * sys/fcntl.h: Likewise.
+ * sys/file.h: Likewise.
+ * sys/gmon.h: Likewise.
+ * sys/ioctl.h: Likewise.
+ * sys/ipc.h: Likewise.
+ * sys/msg.h: Likewise.
+ * sys/poll.h: Likewise.
+ * sys/queue.h: Likewise.
+ * sys/resource.h: Likewise.
+ * sys/select.h: Likewise.
+ * sys/sem.h: Likewise.
+ * sys/shm.h: Likewise.
+ * sys/signal.h: Likewise.
+ * sys/socket.h: Likewise.
+ * sys/stat.h: Likewise.
+ * sys/statfs.h: Likewise.
+ * sys/syslog.h: Likewise.
+ * sys/termios.h: Likewise.
+ * sys/time.h: Likewise.
+ * sys/timeb.h: Likewise.
+ * sys/times.h: Likewise.
+ * sys/types.h: Likewise.
+ * sys/uio.h: Likewise.
+ * sys/un.h: Likewise.
+ * sys/unistd.h: Likewise.
+ * sys/utsname.h: Likewise.
+ * sys/vlimit.h: Likewise.
+ * sys/vtimes.h: Likewise.
+ * sys/wait.h: Likewise.
+ * syscall.h: Likewise.
+ * syslog.h: Likewise.
+ * tar.h: Likewise.
+ * termios.h: Likewise.
+ * time.h: Likewise.
+ * ttyent.h: Likewise.
+ * unistd.h: Likewise.
+ * utime.h: Likewise.
+ * utmp.h: Likewise.
+ * values.h: Likewise.
+ * wchar.h: Likewise.
+ * wctype.h: Likewise.
+ * wordexp.h: Likewise.
+ * xlocale.h: Likewise.
+ * xopen_lim.h: Likewise.
+
+ * linuxthreads/sysdeps/alpha/semaphorebits.h: -> .../bits/semaphore.h.
+ * linuxthreads/sysdeps/powerpc/semaphorebits.h: Likewise.
+ * linuxthreads/sysdeps/pthread/cmpxchg/semaphorebits.h: Likewise.
+ * linuxthreads/sysdeps/pthread/no-cmpxchg/semaphorebits.h: Likewise.
+ * linuxthreads/sysdeps/pthread/libc-lock.h: -> bits/
+ * sysdeps/mach/libc-lock.h: Likewise.
+ * sysdeps/stub/libc-lock.h: Likewise.
+ * linuxthreads/sysdeps/pthread/stdio-lock.h: Likewise.
+ * linuxthreads/sysdeps/unix/sysv/linux/local_lim.h: Likewise.
+ * sysdeps/mach/hurd/local_lim.h: Likewise.
+ * sysdeps/stub/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/linux/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
+ * linuxthreads/sysdeps/unix/sysv/linux/posix_opt.h: Likewise.
+ * sysdeps/mach/hurd/posix_opt.h: Likewise.
+ * sysdeps/stub/posix_opt.h: Likewise.
+ * sysdeps/unix/bsd/posix_opt.h: Likewise.
+ * sysdeps/unix/bsd/ultrix4/posix_opt.h: Likewise.
+ * sysdeps/unix/sysv/linux/posix_opt.h: Likewise.
+ * math/cmathcalls.h: -> bits/
+ * math/mathcalls.h: Likewise.
+ * misc/stab.def: -> bits/
+ * posix/posix1_lim.h: -> bits/
+ * posix/posix2_lim.h: Likewise.
+ * sysdeps/alpha/__math.h: -> .../fpu/bits/mathinline.h
+ * sysdeps/i386/fpu/__math.h: Likewise.
+ * sysdeps/m68k/fpu/__math.h: Likewise.
+ * sysdeps/m68k/fpu/switch/__math.h: Likewise.
+ * sysdeps/powerpc/__math.h: Likewise.
+ * sysdeps/stub/__math.h: Likewise.
+ * sysdeps/alpha/bytesex.h: -> .../bits/endian.h
+ * sysdeps/arm/bytesex.h: Likewise.
+ * sysdeps/i386/bytesex.h: Likewise.
+ * sysdeps/m68k/bytesex.h: Likewise.
+ * sysdeps/mips/bytesex.h: Likewise.
+ * sysdeps/mips/dec/bytesex.h: Likewise.
+ * sysdeps/mips/mipsel/bytesex.h: Likewise.
+ * sysdeps/mips/p40/bytesex.h: Likewise.
+ * sysdeps/sparc/bytesex.h: Likewise.
+ * sysdeps/stub/bytesex.h: Likewise.
+ * sysdeps/alpha/fpu/fenvbits.h: -> .../bits/fenv.h
+ * sysdeps/i386/fpu/fenvbits.h: Likewise.
+ * sysdeps/m68k/fpu/fenvbits.h: Likewise.
+ * sysdeps/powerpc/fenvbits.h: Likewise.
+ * sysdeps/stub/fenvbits.h: Likewise.
+ * sysdeps/alpha/jmp_buf.h: -> .../bits/setenv.h
+ * sysdeps/arm/jmp_buf.h: Likewise.
+ * sysdeps/i386/jmp_buf.h: Likewise.
+ * sysdeps/m68k/jmp_buf.h: Likewise.
+ * sysdeps/mips/jmp_buf.h: Likewise.
+ * sysdeps/sparc/jmp_buf.h: Likewise.
+ * sysdeps/powerpc/jmp_buf.h: Likewise.
+ * sysdeps/stub/jmp_buf.h: Likewise.
+ * sysdeps/vax/jmp_buf.h: Likewise.
+ * sysdeps/generic/confname.h: -> bits/
+ * sysdeps/unix/sysv/irix4/confname.h: Likewise.
+ * sysdeps/unix/sysv/sco3.2.4/confname.h: Likewise.
+ * sysdeps/generic/gnu/types.h: -> ../bits/types.h
+ * sysdeps/unix/sysv/linux/alpha/gnu/types.h: Likewise.
+ * sysdeps/unix/sysv/linux/gnu/types.h: Likewise.
+ * sysdeps/generic/ioctl-types.h: -> bits/
+ * sysdeps/unix/sysv/linux/ioctl-types.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/ioctl-types.h: Likewise.
+ * sysdeps/generic/iovec.h: -> .../bits/uio.h
+ * sysdeps/unix/sysv/linux/iovec.h: Likewise.
+ * sysdeps/generic/mathbits.h: -> .../bits/mathdef.h
+ * sysdeps/i386/fpu/mathbits.h: Likewise.
+ * sysdeps/m68k/fpu/mathbits.h: Likewise.
+ * sysdeps/powerpc/mathbits.h: Likewise.
+ * sysdeps/generic/resourcebits.h: -> .../bits/resource.h
+ * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise.
+ * sysdeps/unix/sysv/linux/resourcebits.h: Likewise.
+ * sysdeps/generic/schedbits.h: -> .../bits/sched.h
+ * sysdeps/unix/sysv/linux/schedbits.h: Likewise.
+ * sysdeps/generic/selectbits.h: -> .../bits/select.h
+ * sysdeps/i386/selectbits.h: Likewise.
+ * sysdeps/generic/sigaction.h: -> bits/
+ * sysdeps/unix/bsd/osf/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/linux/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/minix/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/sco3.2.4/sigaction.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/sigaction.h: Likewise.
+ * sysdeps/generic/sigset.h: -> bits/
+ * sysdeps/unix/sysv/linux/sigset.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/sigset.h: Likewise.
+ * sysdeps/generic/sockaddrcom.h: -> .../bits/sockaddr.h
+ * sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise.
+ * sysdeps/generic/socketbits.h: -> .../bits/socket.h
+ * sysdeps/unix/sysv/linux/socketbits.h: Likewise.
+ * sysdeps/generic/statfsbuf.h: -> .../bits/statfs.h
+ * sysdeps/unix/sysv/linux/statfsbuf.h: Likewise.
+ * sysdeps/generic/termbits.h: -> .../bits/termios.h
+ * sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/termbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/termbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/termbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/termbits.h: Likewise.
+ * sysdeps/generic/ustatbits.h: -> .../bits/ustat.h
+ * sysdeps/unix/sysv/linux/ustatbits.h: Likewise.
+ * sysdeps/generic/utmpbits.h: -> .../bits/utmp.h
+ * sysdeps/gnu/utmpbits.h: Likewise.
+ * sysdeps/unix/sysv/utmpbits.h: Likewise.
+ * sysdeps/generic/utsnamelen.h: -> .../bits/utsname.h
+ * sysdeps/unix/bsd/sun/sunos4/utsnamelen.h: Likewise.
+ * sysdeps/unix/bsd/ultrix4/utsnamelen.h: Likewise.
+ * sysdeps/unix/sysv/linux/utsnamelen.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/utsnamelen.h: Likewise.
+ * sysdeps/unix/sysv/utsnamelen.h: Likewise.
+ * sysdeps/generic/waitstatus.h: -> bits/
+ * sysdeps/i386/huge_val.h: -> bits/
+ * sysdeps/ieee754/huge_val.h: Likewise.
+ * sysdeps/m68k/huge_val.h: Likewise.
+ * sysdeps/stub/huge_val.h: Likewise.
+ * sysdeps/vax/huge_val.h: Likewise.
+ * sysdeps/ieee754/nan.h: Likewise.
+ * sysdeps/stub/nan.h: Likewise.
+ * sysdeps/mach/hurd/alpha/sigcontext.h: -> bits/
+ * sysdeps/mach/hurd/hppa/sigcontext.h: Likewise.
+ * sysdeps/mach/hurd/i386/sigcontext.h: Likewise.
+ * sysdeps/mach/hurd/mips/sigcontext.h: Likewise.
+ * sysdeps/stub/sigcontext.h: Likewise.
+ * sysdeps/unix/bsd/sun/m68k/sigcontext.h: Likewise.
+ * sysdeps/unix/bsd/sun/sparc/sigcontext.h: Likewise.
+ * sysdeps/unix/bsd/ultrix4/mips/sigcontext.h: Likewise.
+ * sysdeps/unix/sysv/linux/sigcontext.h: Likewise.
+ * sysdeps/mach/hurd/errnos.h: -> .../bits/errno.h
+ * sysdeps/standalone/arm/errnos.h: Likewise.
+ * sysdeps/stub/errnos.h: Likewise.
+ * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise.
+ * sysdeps/unix/sysv/linux/errnos.h: Likewise.
+ * sysdeps/mach/hurd/fcntlbits.h: -> .../bits/fcntl.h
+ * sysdeps/stub/fcntlbits.h: Likewise.
+ * sysdeps/unix/bsd/bsd4.4/fcntlbits.h: Likewise.
+ * sysdeps/unix/bsd/fcntlbits.h: Likewise.
+ * sysdeps/unix/bsd/sun/sunos4/fcntlbits.h: Likewise.
+ * sysdeps/unix/bsd/ultrix4/fcntlbits.h: Likewise.
+ * sysdeps/unix/common/fcntlbits.h: Likewise.
+ * sysdeps/unix/sysv/fcntlbits.h: Likewise.
+ * sysdeps/unix/sysv/irix4/fcntlbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/fcntlbits.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/fcntlbits.h: Likewise.
+ * sysdeps/mach/hurd/ioctls.h: -> bits/
+ * sysdeps/stub/ioctls.h: Likewise.
+ * sysdeps/unix/bsd/bsd4.4/ioctls.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/ioctls.h: Likewise.
+ * sysdeps/unix/sysv/linux/ioctls.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/ioctls.h: Likewise.
+ * sysdeps/mach/hurd/statbuf.h: -> .../bits/stat.h
+ * sysdeps/stub/statbuf.h: Likewise.
+ * sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise.
+ * sysdeps/unix/bsd/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/irix4/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/linux/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise.
+ * sysdeps/standalone/stdio_lim.h: -> bits/
+ * sysdeps/stub/stdio_lim.h: Likewise.
+ * sysdeps/stub/direntry.h: -> ../bits/dirent.h
+ * sysdeps/unix/bsd/bsd4.4/direntry.h: Likewise.
+ * sysdeps/unix/bsd/direntry.h: Likewise.
+ * sysdeps/unix/common/direntry.h: Likewise.
+ * sysdeps/unix/sysv/direntry.h: Likewise.
+ * sysdeps/unix/sysv/linux/direntry.h: Likewise.
+ * sysdeps/stub/elfclass.h: -> bits/
+ * sysdeps/wordsize-32/elfclass.h: Likewise.
+ * sysdeps/wordsize-64/elfclass.h: Likewise.
+ * sysdeps/stub/signum.h: -> bits/
+ * sysdeps/unix/bsd/signum.h: Likewise.
+ * sysdeps/unix/bsd/sun/signum.h: Likewise.
+ * sysdeps/unix/sysv/irix4/signum.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/signum.h: Likewise.
+ * sysdeps/unix/sysv/linux/signum.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/signum.h: Likewise.
+ * sysdeps/unix/sysv/signum.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/signum.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise.
+ * sysdeps/stub/sys/ipc_buf.h: -> .../bits/ipc.h
+ * sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h: Likewise.
+ * sysdeps/unix/sysv/linux/sys/ipc_buf.h: Likewise.
+ * sysdeps/stub/sys/msq_buf.h: -> .../bits/msq.h
+ * sysdeps/unix/sysv/linux/sys/msq_buf.h: Likewise.
+ * sysdeps/stub/sys/sem_buf.h: -> .../bits/sem.h
+ * sysdeps/unix/sysv/linux/sys/sem_buf.h: Likewise.
+ * sysdeps/stub/sys/shm_buf.h: -> .../bits/shm.h
+ * sysdeps/unix/sysv/linux/sys/shm_buf.h: Likewise.
+ * sysdeps/stub/timebits.h: -> .../bits/time.h
+ * sysdeps/unix/sysv/linux/alpha/timebits.h: Likewise.
+ * sysdeps/unix/sysv/linux/timebits.h: Likewise.
+ * sysdeps/stub/waitflags.h: -> bits/
+ * sysdeps/unix/bsd/waitflags.h: Likewise.
+ * sysdeps/unix/sysv/linux/waitflags.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/waitflags.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: -> ../
+ * sysdeps/unix/sysv/linux/powerpc/sys/kernel_termios.h: Likewise.
+ * sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise.
+ * sysdeps/unix/sysv/linux/sys/socketcall.h: -> ../
+
+ * argp/argp-fmtstream.h: Standardize the multiple-include protect.
+ * argp/argp.h: Likewise.
+ * catgets/nl_types.h: Likewise.
+ * crypt/sysdeps/unix/crypt.h: Likewise.
+ * ctype/ctype.h: Likewise.
+ * db/db.h: Likewise.
+ * db/mpool.h: Likewise.
+ * db/ndbm.h: Likewise.
+ * dirent/dirent.h: Likewise.
+ * elf/dlfcn.h: Likewise.
+ * elf/elf.h: Likewise.
+ * elf/link.h: Likewise.
+ * gmon/sys/gmon.h: Likewise.
+ * gmon/sys/gmon_out.h: Likewise.
+ * grp/grp.h: Likewise.
+ * inet/aliases.h: Likewise.
+ * inet/arpa/ftp.h: Likewise.
+ * inet/arpa/inet.h: Likewise.
+ * inet/arpa/telnet.h: Likewise.
+ * inet/arpa/tftp.h: Likewise.
+ * inet/netinet/ether.h: Likewise.
+ * inet/netinet/icmp6.h: Likewise.
+ * inet/netinet/in.h: Likewise.
+ * inet/netinet/ip6.h: Likewise.
+ * inet/protocols/routed.h: Likewise.
+ * inet/protocols/rwhod.h: Likewise.
+ * inet/protocols/talkd.h: Likewise.
+ * inet/protocols/timed.h: Likewise.
+ * intl/libintl.h: Likewise.
+ * io/fcntl.h: Likewise.
+ * io/fts.h: Likewise.
+ * io/ftw.h: Likewise.
+ * io/sys/poll.h: Likewise.
+ * io/sys/stat.h: Likewise.
+ * io/sys/statfs.h: Likewise.
+ * io/utime.h: Likewise.
+ * linuxthreads/semaphore.h: Likewise.
+ * linuxthreads/sysdeps/pthread/pthread.h: Likewise.
+ * locale/locale.h: Likewise.
+ * login/pty.h: Likewise.
+ * login/utmp.h: Likewise.
+ * malloc/malloc.h: Likewise.
+ * malloc/obstack.h: Likewise.
+ * math/complex.h: Likewise.
+ * math/fenv.h: Likewise.
+ * math/math.h: Likewise.
+ * md5-crypt/md5.h: Likewise.
+ * misc/ar.h: Likewise.
+ * misc/err.h: Likewise.
+ * misc/error.h: Likewise.
+ * misc/fstab.h: Likewise.
+ * misc/libgen.h: Likewise.
+ * misc/nlist.h: Likewise.
+ * misc/sys/cdefs.h: Likewise.
+ * misc/sys/file.h: Likewise.
+ * misc/sys/ioctl.h: Likewise.
+ * misc/sys/queue.h: Likewise.
+ * misc/sys/select.h: Likewise.
+ * misc/sys/syslog.h: Likewise.
+ * misc/sys/uio.h: Likewise.
+ * misc/sysexits.h: Likewise.
+ * misc/ttyent.h: Likewise.
+ * nss/nss.h: Likewise.
+ * posix/fnmatch.h: Likewise.
+ * posix/getopt.h: Likewise.
+ * posix/glob.h: Likewise.
+ * posix/regex.h: Likewise.
+ * posix/sys/times.h: Likewise.
+ * posix/sys/types.h: Likewise.
+ * posix/sys/utsname.h: Likewise.
+ * posix/sys/wait.h: Likewise.
+ * posix/tar.h: Likewise.
+ * posix/unistd.h: Likewise.
+ * posix/wordexp.h: Likewise.
+ * pwd/pwd.h: Likewise.
+ * resolv/arpa/nameser.h: Likewise.
+ * resolv/netdb.h: Likewise.
+ * resolv/resolv.h: Likewise.
+ * resource/sys/resource.h: Likewise.
+ * resource/sys/vlimit.h: Likewise.
+ * resource/sys/vtimes.h: Likewise.
+ * setjmp/setjmp.h: Likewise.
+ * shadow/shadow.h: Likewise.
+ * socket/sys/socket.h: Likewise.
+ * socket/sys/un.h: Likewise.
+ * stdlib/exit.h: Likewise.
+ * stdlib/fmtmsg.h: Likewise.
+ * stdlib/monetary.h: Likewise.
+ * stdlib/stdlib.h: Likewise.
+ * string/argz.h: Likewise.
+ * string/envz.h: Likewise.
+ * string/memory.h: Likewise.
+ * string/string.h: Likewise.
+ * string/strings.h: Likewise.
+ * sunrpc/rpc/rpc.h: Likewise.
+ * sunrpc/rpc/svc.h: Likewise.
+ * sunrpc/rpc/types.h: Likewise.
+ * sunrpc/rpc/xdr.h: Likewise.
+ * termios/sys/ttychars.h: Likewise.
+ * termios/termios.h: Likewise.
+
+ * argp/argp-parse.c: <foo.h> -> <bits/foo.h>.
+ * crypt/sysdeps/unix/crypt_util.c: Likewise.
+ * dirent/dirent.h: Likewise.
+ * elf/link.h: Likewise.
+ * grp/fgetgrent.c: Likewise.
+ * grp/grp.h: Likewise.
+ * hurd/hurd/ioctl.h: Likewise.
+ * inet/getnameinfo.c: Likewise.
+ * inet/getnetgrent_r.c: Likewise.
+ * inet/inet_ntoa.c: Likewise.
+ * inet/netinet/in.h: Likewise.
+ * io/fcntl.h: Likewise.
+ * io/ftw.h: Likewise.
+ * io/sys/stat.h: Likewise.
+ * io/sys/statfs.h: Likewise.
+ * io/utime.h: Likewise.
+ * libio/_G_config.h: Likewise.
+ * libio/libio.h: Likewise.
+ * libio/libioP.h: Likewise.
+ * libio/stdio.h: Likewise.
+ * linuxthreads/lockfile.c: Likewise.
+ * linuxthreads/semaphore.h: Likewise.
+ * locale/duplocale.c: Likewise.
+ * locale/freelocale.c: Likewise.
+ * locale/lc-time.c: Likewise.
+ * locale/setlocale.c: Likewise.
+ * login/getutent_r.c: Likewise.
+ * login/getutid_r.c: Likewise.
+ * login/getutline_r.c: Likewise.
+ * login/lastlog.h: Likewise.
+ * login/pty.h: Likewise.
+ * login/utmp.h: Likewise.
+ * login/utmpname.c: Likewise.
+ * malloc/mtrace.c: Likewise.
+ * malloc/thread-m.h: Likewise.
+ * math/complex.h: Likewise.
+ * math/fenv.h: Likewise.
+ * math/libm-test.c: Likewise.
+ * math/math.h: Likewise.
+ * misc/sgtty.h: Likewise.
+ * misc/stab.h: Likewise.
+ * misc/sys/ioctl.h: Likewise.
+ * misc/sys/select.h: Likewise.
+ * misc/sys/uio.h: Likewise.
+ * misc/sys/ustat.h: Likewise.
+ * misc/syslog.c: Likewise.
+ * nis/nss_compat/compat-grp.c: Likewise.
+ * nis/nss_compat/compat-pwd.c: Likewise.
+ * nis/nss_compat/compat-spwd.c: Likewise.
+ * nis/nss_nis/nis-alias.c: Likewise.
+ * nis/nss_nis/nis-ethers.c: Likewise.
+ * nis/nss_nis/nis-grp.c: Likewise.
+ * nis/nss_nis/nis-hosts.c: Likewise.
+ * nis/nss_nis/nis-netgrp.c: Likewise.
+ * nis/nss_nis/nis-network.c: Likewise.
+ * nis/nss_nis/nis-proto.c: Likewise.
+ * nis/nss_nis/nis-publickey.c: Likewise.
+ * nis/nss_nis/nis-pwd.c: Likewise.
+ * nis/nss_nis/nis-rpc.c: Likewise.
+ * nis/nss_nis/nis-service.c: Likewise.
+ * nis/nss_nis/nis-spwd.c: Likewise.
+ * nss_nisplus/nisplus-alias.c: Likewise.
+ * nis/nss_nisplus/nisplus-ethers.c: Likewise.
+ * nis/nss_nisplus/nisplus-grp.c: Likewise.
+ * nis/nss_nisplus/nisplus-hosts.c: Likewise.
+ * nis/nss_nisplus/nisplus-netgrp.c: Likewise.
+ * nis/nss_nisplus/nisplus-netgrp.c: Likewise.
+ * nis/nss_nisplus/nisplus-proto.c: Likewise.
+ * nis/nss_nisplus/nisplus-pwd.c: Likewise.
+ * nis/nss_nisplus/nisplus-rpc.c: Likewise.
+ * nis/nss_nisplus/nisplus-service.c: Likewise.
+ * nis/nss_nisplus/nisplus-spwd.c: Likewise.
+ * nis/ypclnt.c: Likewise.
+ * nss/getXXbyYY.c: Likewise.
+ * nss/getXXent.c: Likewise.
+ * nss/getXXent_r.c: Likewise.
+ * nss/nss_db/db-XXX.c: Likewise.
+ * nss/nss_db/db-alias.c: Likewise.
+ * nss/nss_db/db-netgrp.c: Likewise.
+ * nss/nss_files/files-XXX.c: Likewise.
+ * nss/nss_files/files-alias.c: Likewise.
+ * nss/nsswitch.c: Likewise.
+ * posix/sched.h: Likewise.
+ * posix/sys/types.h: Likewise.
+ * posix/sys/utsname.h: Likewise.
+ * posix/sys/wait.h: Likewise.
+ * posix/unistd.h: Likewise.
+ * pwd/fgetpwent.c: Likewise.
+ * pwd/pwd.h: Likewise.
+ * resource/sys/resource.h: Likewise.
+ * setjmp/setjmp.h: Likewise.
+ * shadow/fgetspent.c: Likewise.
+ * shadow/lckpwdf.c: Likewise.
+ * shadow/sgetspent.c: Likewise.
+ * signal/signal.h: Likewise.
+ * signal/sigsetops.c: Likewise.
+ * socket/sys/socket.h: Likewise.
+ * socket/sys/un.h: Likewise.
+ * stdio/stdio.h: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+ * stdio-common/vfscanf.c: Likewise.
+ * stdlib/atexit.c: Likewise.
+ * stdlib/fmtmsg.c: Likewise.
+ * stdlib/random.c: Likewise.
+ * string/endian.h: Likewise.
+ * sysdeps/alpha/w_sqrt.S: Likewise.
+ * sysdeps/arm/__longjmp.S: Likewise.
+ * sysdeps/arm/setjmp.S: Likewise.
+ * sysdeps/generic/abort.c: Likewise.
+ * sysdeps/generic/netinet/ip.h: Likewise.
+ * sysdeps/generic/setenv.c: Likewise.
+ * generic/sys/mman.h: Likewise.
+ * sysdeps/i386/__longjmp.S: Likewise.
+ * sysdeps/i386/setjmp.S: Likewise.
+ * sysdeps/mach/hurd/dirstream.h: Likewise.
+ * sysdeps/mach/hurd/jmp-unwind.c: Likewise.
+ * sysdeps/posix/mk-stdiolim.c: Likewise.
+ * sysdeps/powerpc/__longjmp.S: Likewise.
+ * sysdeps/powerpc/setjmp.S: Likewise.
+ * sysdeps/sparc/__longjmp.S: Likewise.
+ * sysdeps/sparc/setjmp.S: Likewise.
+ * sysdeps/standalone/close.c: Likewise.
+ * sysdeps/standalone/filedesc.h: Likewise.
+ * sysdeps/standalone/open.c: Likewise.
+ * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Likewise.
+ * sysdeps/unix/bsd/m68k/sysdep.S: Likewise.
+ * sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
+ * sysdeps/unix/bsd/sun/m68k/sethostid.S: Likewise.
+ * sysdeps/unix/bsd/sun/sparc/sethostid.S: Likewise.
+ * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
+ * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
+ * sysdeps/unix/bsd/vax/sysdep.S: Likewise.
+ * sysdeps/unix/dirstream.h: Likewise.
+ * sysdeps/unix/i386/sysdep.S: Likewise.
+ * sysdeps/unix/mips/sysdep.S: Likewise.
+ * sysdeps/unix/mk-local_lim.c: Likewise.
+ * sysdeps/unix/sparc/sysdep.S: Likewise.
+ * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/brk.S: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/arm/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/netinet/ip.h: Likewise.
+ * sysdeps/unix/sysv/linux/netinet/tcp.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
+ * sysdeps/unix/sysv/linux/sys/syscall.h: Likewise.
+ * sysdeps/unix/sysv/linux/tcgetattr.c: Likewise.
+ * sysdeps/unix/sysv/sco3.2.4/sysconf.S: Likewise.
+ * sysdeps/unix/sysv/sysv4/i386/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.S: Likewise.
+ * sysvipc/sys/ipc.h: Likewise.
+ * sysvipc/sys/msg.h: Likewise.
+ * sysvipc/sys/sem.h: Likewise.
+ * sysvipc/sys/shm.h: Likewise.
+ * termios/termios.h: Likewise.
+ * time/localtime.c: Likewise.
+ * time/sys/time.h: Likewise.
+ * time/time.h: Likewise.
+ * time/tzset.c: Likewise.
+
+ * sysdeps/unix/sysv/linux/arm/socket.S: socketcall.h change.
+ * sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/socket.S: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/socket.S: Likewise.
+
+ * Makefile (headers): foo.h -> bits/foo.h.
+ * dirent/Makefile: Likewise.
+ * elf/Makefile: Likewise.
+ * io/Makefile: Likewise.
+ * linuxthreads/Makefile: Likewise.
+ * linuxthreads/sysdeps/pthread/Makefile: Likewise.
+ * login/Makefile: Likewise.
+ * math/Makefile: Likewise.
+ * misc/Makefile: Likewise.
+ * posix/Makefile: Likewise.
+ * resource/Makefile: Likewise.
+ * setjmp/Makefile: Likewise.
+ * signal/Makefile: Likewise.
+ * socket/Makefile: Likewise.
+ * stdio-common/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/Makefile: Likewise.
+ * sysvipc/Makefile: Likewise.
+ * termios/Makefile: Likewise.
+ * time/Makefile: Likewise.
+ * sysdeps/generic/Makefile (make_siglist-CFLAGS): Likewise.
+ * sysdeps/posix/Makefile: stdio_lim.h -> bits/stdio_lim.h
+ * sysdeps/unix/Makefile: Likewise with local_lim.h, errnos.h,
+ ioctls.h, termbits.h.
+
+ * sysdeps/unix/sysv/linux/Dist: sys/kernel_termios.h
+ -> kernel_termios.h, sys/socketcall.h -> socketcall.h
+
+ * elf/elf.h: Use <inttypes.h> definitions instead of __attribute__
+ for getting the proper length on the ELF types to be friendly to
+ non-gcc compilers.
+ * posix/sys/types.h: Notice when int8_t and friends are defined
+ and don't redefine them.
+ * sysdeps/wordsize-32/inttypes.h: Likewise.
+ * sysdeps/wordsize-64/inttypes.h: Likewise.
+
+ * sysdeps/unix/sysv/linux/arm/profil-counter.h: Get sigcontext
+ via <signal.h> instead.
+ * sysdeps/unix/sysv/linux/i386/profil-counter.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/profil-counter.h: Likewise.
+
+1997-06-20 17:59 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp>
+
+ * hurd/intr-msg.c: More 64bit changes.
+ * mach/msg-destroy.c: Likewise.
+ * sysdeps/mach/hurd/ioctl.c: Likewise.
+ * sysdeps/mach/hurd/ioctls.h: Likewise.
+ * sysdeps/mach/hurd/select.c: Likewise.
+ * sysdeps/mach/hurd/statbuf.h: Likewise.
+
+ * sysdeps/mach/hurd/mips/dl-machine.c: Hurd/MIPS64 patches.
+ * sysdeps/mach/hurd/mips/exc2signal.c: Likewise.
+ * sysdeps/mach/hurd/mips/init-fault.c: Likewise.
+ * sysdeps/mach/hurd/mips/init-first.c: Likewise.
+ * sysdeps/mach/hurd/mips/intr-msg.h: Likewise.
+ * sysdeps/mach/hurd/mips/longjmp-ctx.c: Likewise.
+ * sysdeps/mach/hurd/mips/longjmp-ts.c: Likewise.
+ * sysdeps/mach/hurd/mips/sigcontext.h: Likewise.
+ * sysdeps/mach/hurd/mips/sigreturn.c: Likewise.
+ * sysdeps/mach/hurd/mips/trampoline.c: Likewise.
+ * sysdeps/mach/mips/cacheflush.c: Likewise.
+ * sysdeps/mach/mips/machine-lock.h: Likewise.
+ * sysdeps/mach/mips/machine-sp.h: Likewise.
+ * sysdeps/mach/mips/syscall.S: Likewise.
+ * sysdeps/mach/mips/sysdep.h: Likewise.
+ * sysdeps/mach/mips/thread_state.h: Likewise.
+ * sysdeps/mach/start.c: Likewise.
+
+ * sysdeps/mips/dl-machine.h: MIPS changes.
+ * sysdeps/mips/elf/start.S: Likewise.
+ * sysdeps/mips/init-first.c: Likewise.
+ * sysdeps/mips/fpu_control.h: Likewise.
+ * sysdeps/mips/machine-gmon.h: Likewise.
+ * sysdeps/mips/jmp_buf.h: Likewise.
+ * sysdeps/mips/__longjmp.c: Likewise.
+ * sysdeps/mips/bsd-_setjmp.S: Likewise.
+ * sysdeps/mips/bsd-setjmp.S: Likewise.
+ * sysdeps/mips/setjmp.S: Likewise.
+ * sysdeps/mips/setjmp_aux.c: Likewise.
+ * sysdeps/mips/mips64/gmp-mparam.h: Likewise.
+ * sysdeps/mips/add_n.S: New file.
+ * sysdeps/mips/addmul_1.S: Likewise.
+ * sysdeps/mips/lshift.S: Likewise.
+ * sysdeps/mips/mul_1.S: Likewise.
+ * sysdeps/mips/rshift.S: Likewise.
+ * sysdeps/mips/sub_n.S: Likewise.
+ * sysdeps/mips/submul_1.S: Likewise.
+ * sysdeps/mips/mips64/Implies: Likewise.
+ * sysdeps/mips/mips64/add_n.S: Likewise.
+ * sysdeps/mips/mips64/addmul_1.S: Likewise.
+ * sysdeps/mips/mips64/lshift.S: Likewise.
+ * sysdeps/mips/mips64/mul_1.S: Likewise.
+ * sysdeps/mips/mips64/rshift.S: Likewise.
+ * sysdeps/mips/mips64/sub_n.S: Likewise.
+ * sysdeps/mips/mips64/submul_1.S: Likewise.
+ * sysdeps/mips/add_n.S: Removed.
+ * sysdeps/mips/addmul_1.S: Likewise.
+ * sysdeps/mips/lshift.S: Likewise.
+ * sysdeps/mips/mul_1.S: Likewise.
+ * sysdeps/mips/rshift.S: Likewise.
+ * sysdeps/mips/sub_n.S: Likewise.
+ * sysdeps/mips/submul_1.S: Likewise.
+
+ * nss/Makefile: Prepare for static NSS.
+ * resolv/Makefile: Likewise.
+ * nss/nsswitch.c: Add code for static NSS.
+ * nss/function.def: Define functions for static NSS.
+
+1997-06-19 11:10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * libc.map: Add yet more symbols.
+
+1997-06-19 20:33 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * elf/dl-lookup.c (_dl_lookup_versioned_symbol): Don't pass NULL
+ as object name to _dl_signal_error.
+ (do_lookup): Skip objects that could not be opened.
+
+ * sysdeps/m68k/dl-machine.h (elf_machine_rela): Check that the
+ symbol was found.
+ * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
+ * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Likewise.
+
+1997-06-20 03:13 Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp>
+
+ * ctype/ctype-info.c: Use int32_t where `int' with 4 bytes is
+ assumed.
+ * ctype/ctype.h: Likewise.
+ * math/math_private.h: Likewise.
+ * inet/netinet/in.h: Likewise.
+ * wctype/wctype.h: Likewise.
+
+ * nss/Makefile: Only inhibit nss_files and nss_db modules if static
+ NSS modules are not enabled.
+ * resolv/Makefile: Likewise for nss_dns.
+ * nss/function.def: New file. List all available lookup functions
+ for static NSS.
+ * nss/nsswitch.c: Add code for static NSS.
+
+1997-06-15 21:15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * math/libm-test.c (gamma_test): Test for _SVID_ and for normal
+ behaviour.
+
+1997-06-15 20:32 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * math/libm.map: Add all necessary functions, correct existing entries.
+
+1997-06-20 02:35 a sun <asun@zoology.washington.edu>
+
+ * sysdeps/unix/sysv/linux/netipx/ipx.h: Don't use kernel header.
+
+1997-06-19 18:43 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent):
+ Compare pointer with NULL.
+
+ * login/logout.c (logout): Compare pututline result with NULL.
+
1997-06-19 19:38 Ulrich Drepper <drepper@cygnus.com>
* features.h: Define __STDC_IEC_559__ and _STDC_IEC_559_COMPLEX__.
* elf/dl-minimal.c (__dcgettext): Remove assertion.
- * inet/rcmd.c: Correct a few typos. Reported by Eric Troan.
+ * inet/rcmd.c: Correct a few typos. Reported by Erik Troan.
* manual/Makefile (distribute): Add dir.
* manual/dir: New file.
diff --git a/Makeconfig b/Makeconfig
index fbff6b3d3e..29d06caa33 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -491,14 +491,14 @@ endif # $(+cflags) == ""
# and in the parent library source directory.
# `+sysdep-includes' will be defined by Makerules.
+includes = -I. $(filter-out -I,-I$(patsubst %/,%,$(..))) $($(stdio)-include) \
- $(includes) $(+sysdep-includes) $(last-includes)
+ $(includes) $(+sysdep-includes) $(last-includes)
# Since libio has several internal header files, we use a -I instead
# of many little headers in the top level source directory.
libio-include = -I$(..)libio
# These are the variables that the implicit compilation rules use.
-CPPFLAGS = $(+includes) $(defines) -include $(..)libc-symbols.h \
+CPPFLAGS = $(+includes) $(defines) -include $(..)include/libc-symbols.h \
$(sysdep-CPPFLAGS) $(CPPFLAGS-$(suffix $@)) $(CPPFLAGS-$(<F)) \
$(CPPFLAGS-$(@F))
override CFLAGS = $(+cflags) $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) \
diff --git a/Makefile b/Makefile
index 7c5ba3bf31..bedfc8f138 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ subdirs := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
subdir_install \
$(addprefix install-, no-libc.a bin lib data headers others)
-headers := errno.h sys/errno.h errnos.h limits.h values.h \
- features.h gnu-versions.h libc-lock.h xopen_lim.h
+headers := errno.h sys/errno.h bits/errno.h limits.h values.h \
+ features.h gnu-versions.h bits/libc-lock.h bits/xopen_lim.h
aux = sysdep $(libc-init) version
before-compile += $(objpfx)version-info.h
@@ -181,6 +181,7 @@ subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)stub-$(dir))
# the subdir's stubs file. Having more direct dependencies would result in
# extra iterations over the list for subdirs and many recursive makes.
$(inst_includedir)/gnu/stubs.h: subdir_install
+ $(make-target-directory)
@rm -f $(objpfx)stubs.h
(echo '/* This file is automatically generated.';\
echo ' It defines a symbol `__stub_FUNCTION'\'' for each function';\
@@ -195,6 +196,7 @@ $(inst_includedir)/gnu/stubs.h: subdir_install
ifeq (yes,$(build-shared))
$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h
+ $(make-target-directory)
if test -r $@ && cmp -s $< $@; \
then echo 'gnu/lib-names.h unchanged'; \
else $(INSTALL_DATA) $< $@; fi
diff --git a/ansidecl.h b/ansidecl.h
deleted file mode 100644
index c351653b62..0000000000
--- a/ansidecl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (C) 1991 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 General Public License as published by
-the Free Software Foundation; either version 1, 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* ANSI and traditional C compatibility macros
-
- ANSI C is assumed if __STDC__ is #defined.
-
- Macro ANSI C definition Traditional C definition
- ----- ---- - ---------- ----------- - ----------
- PTR `void *' `char *'
- LONG_DOUBLE `long double' `double'
- CONST `const' `'
- VOLATILE `volatile' `'
- SIGNED `signed' `'
- PTRCONST `void *const' `char *'
-
- DEFUN(name, arglist, args)
-
- Defines function NAME.
-
- ARGLIST lists the arguments, separated by commas and enclosed in
- parentheses. ARGLIST becomes the argument list in traditional C.
-
- ARGS list the arguments with their types. It becomes a prototype in
- ANSI C, and the type declarations in traditional C. Arguments should
- be separated with `AND'. For functions with a variable number of
- arguments, the last thing listed should be `DOTS'.
-
- DEFUN_VOID(name)
-
- Defines a function NAME, which takes no arguments.
-
- EXFUN(name, prototype)
-
- Is used in an external function declaration.
- In ANSI C it is `NAMEPROTOTYPE' (so PROTOTYPE should be enclosed in
- parentheses). In traditional C it is `NAME()'.
- For a function that takes no arguments, PROTOTYPE should be `(NOARGS)'.
-
- For example:
- extern int EXFUN(printf, (CONST char *format DOTS));
- int DEFUN(fprintf, (stream, format),
- FILE *stream AND CONST char *format DOTS) { ... }
- void DEFUN_VOID(abort) { ... }
-*/
-
-#ifndef _ANSIDECL_H
-
-#define _ANSIDECL_H 1
-
-
-/* Every source file includes this file,
- so they will all get the switch for lint. */
-/* LINTLIBRARY */
-
-
-#ifdef __STDC__
-
-#define PTR void *
-#define PTRCONST void *CONST
-#define LONG_DOUBLE long double
-
-#define AND ,
-#define NOARGS void
-#define CONST const
-#define VOLATILE volatile
-#define SIGNED signed
-#define DOTS , ...
-
-#define EXFUN(name, proto) name proto
-#define DEFUN(name, arglist, args) name(args)
-#define DEFUN_VOID(name) name(NOARGS)
-
-#else /* Not ANSI C. */
-
-#define PTR char *
-#define PTRCONST PTR
-#define LONG_DOUBLE double
-
-#define AND ;
-#define NOARGS
-#define CONST
-#define VOLATILE
-#define SIGNED
-#define DOTS
-
-#define EXFUN(name, proto) name()
-#define DEFUN(name, arglist, args) name arglist args;
-#define DEFUN_VOID(name) name()
-
-#endif /* ANSI C. */
-
-
-#endif /* ansidecl.h */
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index d1a262a786..ebc68380c0 100644
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -23,8 +23,8 @@
that. This header file is only used internally while compiling argp, and
shouldn't be installed. */
-#ifndef __ARGP_FMTSTREAM_H__
-#define __ARGP_FMTSTREAM_H__
+#ifndef _ARGP_FMTSTREAM_H
+#define _ARGP_FMTSTREAM_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -294,4 +294,4 @@ __argp_fmtstream_point (argp_fmtstream_t __fs)
#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
-#endif /* __ARGP_FMTSTREAM_H__ */
+#endif /* argp-fmtstream.h */
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 018a97807e..553dd88552 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -42,7 +42,7 @@
#endif
#if _LIBC - 0
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#else
#ifdef HAVE_CTHREADS_H
#include <cthreads.h>
diff --git a/argp/argp.h b/argp/argp.h
index 2305590a5d..600264e6b7 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -18,8 +18,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __ARGP_H__
-#define __ARGP_H__
+#ifndef _ARGP_H
+#define _ARGP_H
#include <stdio.h>
#include <ctype.h>
@@ -551,7 +551,7 @@ __option_is_end (__const struct argp_option *__opt)
# undef __option_is_short
# undef __option_is_end
#endif
-
+#endif /* argp.h */
#endif /* __OPTIMIZE__ */
#ifdef __cplusplus
diff --git a/sysdeps/generic/confname.h b/bits/confname.h
index 5b5cf742b6..5b5cf742b6 100644
--- a/sysdeps/generic/confname.h
+++ b/bits/confname.h
diff --git a/sysdeps/generic/ioctl-types.h b/bits/ioctl-types.h
index 50fe19adcf..1d5c8a002f 100644
--- a/sysdeps/generic/ioctl-types.h
+++ b/bits/ioctl-types.h
@@ -17,8 +17,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _IOCTL_TYPES_H
-#define _IOCTL_TYPES_H 1
+/*
+ * Never include this file directly; use <sys/ioctl.h> instead.
+ */
+
+#ifndef _BITS_IOCTL_TYPES_H
+#define _BITS_IOCTL_TYPES_H 1
#if defined(TIOCGETC) || defined(TIOCSETC)
@@ -114,4 +118,4 @@ struct ttysize
#endif
-#endif /* ioctl-types.h */
+#endif /* bits/ioctl-types.h */
diff --git a/sysdeps/generic/mathbits.h b/bits/mathdef.h
index b14b52d901..93b60bd25f 100644
--- a/sysdeps/generic/mathbits.h
+++ b/bits/mathdef.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _MATHBITS_H
-#define _MATHBITS_H 1
+#ifndef _MATH_H
+# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
/* Normally, there is no long double type and the `float' and `double'
expressions are evaluated as `double'. */
@@ -36,5 +38,3 @@ typedef double double_t; /* `double' expressions are evaluated as
/* The values returned by `ilogb' for 0 and NaN respectively. */
#define FP_ILOGB0 0x80000001
#define FP_ILOGBNAN 0x7fffffff
-
-#endif /* mathbits.h */
diff --git a/sysdeps/generic/resourcebits.h b/bits/resource.h
index 2c35c12a47..2c35c12a47 100644
--- a/sysdeps/generic/resourcebits.h
+++ b/bits/resource.h
diff --git a/bits/sched.h b/bits/sched.h
new file mode 100644
index 0000000000..bb5da5676f
--- /dev/null
+++ b/bits/sched.h
@@ -0,0 +1,35 @@
+/* Definitions of constants and data structure for POSIX 1003.1b-1993
+ scheduling interface.
+ Copyright (C) 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, write to the Free Software Foundation, Inc., 59 Temple Place
+ Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef _SCHED_H
+#error "Never use <bits/sched.h> directly; include <sched.h> instead."
+#endif
+
+
+/* Scheduling algorithms. */
+#define SCHED_OTHER 0
+#define SCHED_FIFO 1
+#define SCHED_RR 2
+
+/* Data structure to describe a process' schedulability. */
+struct sched_param
+{
+ int sched_priority;
+};
diff --git a/sysdeps/generic/selectbits.h b/bits/select.h
index e2bdf6049e..613919577c 100644
--- a/sysdeps/generic/selectbits.h
+++ b/bits/select.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SELECTBITS_H
-#define _SELECTBITS_H 1
+#ifndef _SYS_SELECT_H
+#error "Never use <bits/select.h> directly; include <sys/select.h> instead."
+#endif
+
/* This line MUST be split! Otherwise m4 will not change it. */
#define __FD_ZERO(set) \
@@ -25,5 +27,3 @@
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
#define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
#define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
-
-#endif /* selectbits.h */
diff --git a/sysdeps/generic/sigaction.h b/bits/sigaction.h
index 1676b1ce8e..1676b1ce8e 100644
--- a/sysdeps/generic/sigaction.h
+++ b/bits/sigaction.h
diff --git a/sysdeps/generic/sigset.h b/bits/sigset.h
index 9fad4538d7..9fad4538d7 100644
--- a/sysdeps/generic/sigset.h
+++ b/bits/sigset.h
diff --git a/sysdeps/generic/sockaddrcom.h b/bits/sockaddr.h
index 8b1de11c15..73a0e26ec4 100644
--- a/sysdeps/generic/sockaddrcom.h
+++ b/bits/sockaddr.h
@@ -17,8 +17,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SOCKADDRCOM_H
-#define _SOCKADDRCOM_H 1
+/*
+ * Never include this file directly; use <sys/socket.h> instead.
+ */
+
+#ifndef _BITS_SOCKADDR_H
+#define _BITS_SOCKADDR_H 1
/* POSIX.1g specifies this type name for the `sa_family' member. */
@@ -34,4 +38,4 @@ typedef unsigned short int sa_family_t;
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
-#endif /* sockaddrcom.h */
+#endif /* bits/sockaddr.h */
diff --git a/sysdeps/generic/socketbits.h b/bits/socket.h
index 5d85a8e079..d12d96cc14 100644
--- a/sysdeps/generic/socketbits.h
+++ b/bits/socket.h
@@ -17,9 +17,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SOCKETBITS_H
+#ifndef _SYS_SOCKET_H
+#error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+#endif
+
-#define _SOCKETBITS_H 1
#include <features.h>
__BEGIN_DECLS
@@ -114,7 +116,7 @@ enum __socket_type
/* Get the definition of the macro to define the common sockaddr members. */
-#include <sockaddrcom.h>
+#include <bits/sockaddr.h>
/* Structure describing a generic socket address. */
struct sockaddr
@@ -196,5 +198,3 @@ struct linger
};
__END_DECLS
-
-#endif /* socketbits.h */
diff --git a/bits/statfs.h b/bits/statfs.h
new file mode 100644
index 0000000000..10bc0728b2
--- /dev/null
+++ b/bits/statfs.h
@@ -0,0 +1,52 @@
+/* Definition of `struct statfs', information about a filesystem.
+ Copyright (C) 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/statfs.h> instead.
+ */
+
+#ifndef _BITS_STATFS_H
+#define _BITS_STATFS_H 1
+
+#include <bits/types.h>
+
+/* GNU Hurd NOTE: The size of this structure (16 ints) is known in
+ <hurd/hurd_types.defs>, since it is used in the `file_statfs' RPC. MiG
+ does not cope at all well with the passed C structure not being of the
+ expected size. There are some filler words at the end to allow for
+ future expansion. To increase the size of the structure used in the RPC
+ and retain binary compatibility, we would need to assign a new message
+ number. */
+
+struct statfs
+ {
+ unsigned int f_type;
+ unsigned int f_bsize;
+ unsigned int f_blocks;
+ unsigned int f_bfree;
+ unsigned int f_bavail;
+ unsigned int f_files;
+ unsigned int f_ffree;
+ __fsid_t f_fsid;
+ unsigned int f_namelen;
+ unsigned int f_spare[6];
+ };
+
+
+#endif /* bits/statfs.h */
diff --git a/sysdeps/generic/termbits.h b/bits/termios.h
index adf0ee2f75..9a6aed2bba 100644
--- a/sysdeps/generic/termbits.h
+++ b/bits/termios.h
@@ -17,8 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* These macros are also defined in some ioctls.h files (with numerically
- identical values), but this serves to shut up cpp's complaining. */
+/* These macros are also defined in some <bits/ioctls.h> files (with
+ numerically identical values), but this serves to shut up cpp's
+ complaining. */
#ifdef __USE_BSD
#ifdef MDMBUF
diff --git a/sysdeps/generic/gnu/types.h b/bits/types.h
index 85f17a4fb1..c264adc917 100644
--- a/sysdeps/generic/gnu/types.h
+++ b/bits/types.h
@@ -16,9 +16,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _GNU_TYPES_H
+/*
+ * Never include this file directly; use <sys/types.h> instead.
+ */
-#define _GNU_TYPES_H 1
+#ifndef _BITS_TYPES_H
+#define _BITS_TYPES_H 1
/* Convenience types. */
@@ -39,6 +42,16 @@ typedef struct
__u_long __val[2];
} __u_quad_t;
#endif
+typedef signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef signed short int __int16_t;
+typedef unsigned short int __uint16_t;
+typedef signed int __int32_t;
+typedef unsigned int __uint32_t;
+#ifdef __GNUC__
+typedef signed long long int __int64_t;
+typedef unsigned long long int __uint64_t;
+#endif
typedef __quad_t *__qaddr_t;
typedef int __dev_t; /* Type of device numbers. */
typedef unsigned int __uid_t; /* Type of user identifications. */
@@ -78,4 +91,4 @@ typedef struct
typedef unsigned long int __fd_mask;
-#endif /* gnu/types.h */
+#endif /* bits/types.h */
diff --git a/bits/uio.h b/bits/uio.h
new file mode 100644
index 0000000000..1a12697008
--- /dev/null
+++ b/bits/uio.h
@@ -0,0 +1,32 @@
+/* Copyright (C) 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_UIO_H
+#error "Never use <bits/uio.h> directly; include <sys/uio.h> instead."
+#endif
+
+
+/* `struct iovec' -- Structure describing a section of memory. */
+
+struct iovec
+{
+ /* Starting address. */
+ __ptr_t iov_base;
+ /* Length in bytes. */
+ size_t iov_len;
+};
diff --git a/sysdeps/generic/ustatbits.h b/bits/ustat.h
index aa5d493e63..aa5d493e63 100644
--- a/sysdeps/generic/ustatbits.h
+++ b/bits/ustat.h
diff --git a/sysdeps/generic/utmpbits.h b/bits/utmp.h
index cbd3457bd4..b8decb0598 100644
--- a/sysdeps/generic/utmpbits.h
+++ b/bits/utmp.h
@@ -1,5 +1,5 @@
/* The `struct utmp' type, describing entries in the utmp file. Generic/BSDish
- Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -16,9 +16,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _UTMPBITS_H
+#ifndef _UTMP_H
+#error "Never use <bits/utmp.h> directly; include <utmp.h> instead."
+#endif
+
-#define _UTMPBITS_H 1
#include <features.h>
#include <paths.h>
@@ -49,5 +51,3 @@ struct utmp {
__END_DECLS
-
-#endif /* utmpbits.h */
diff --git a/sysdeps/generic/utsnamelen.h b/bits/utsname.h
index 5594bcc4da..5594bcc4da 100644
--- a/sysdeps/generic/utsnamelen.h
+++ b/bits/utsname.h
diff --git a/sysdeps/generic/waitstatus.h b/bits/waitstatus.h
index 4fbcbe87aa..8e97f2702c 100644
--- a/sysdeps/generic/waitstatus.h
+++ b/bits/waitstatus.h
@@ -1,5 +1,5 @@
/* Definitions of status bits for `wait' et al.
- Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1994, 1996, 1997 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,10 +17,13 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef _SYS_WAIT_H
+#error "Never use <bits/waitstatus.h> directly; include <sys/wait.h> instead."
+#endif
+
+
/* Everything extant so far uses these same bits. */
-#ifndef _WAITSTATUS_H
-#define _WAITSTATUS_H
/* If WIFEXITED(STATUS), the low-order 8 bits of the status. */
#define __WEXITSTATUS(status) (((status) & 0xff00) >> 8)
@@ -99,6 +102,3 @@ union wait
#define w_stopval __wait_stopped.__w_stopval
#endif /* Use BSD. */
-
-
-#endif /* waitstatus.h */
diff --git a/catgets/nl_types.h b/catgets/nl_types.h
index 40fb965508..bf07fcd1e4 100644
--- a/catgets/nl_types.h
+++ b/catgets/nl_types.h
@@ -18,6 +18,7 @@
#ifndef _NL_TYPES_H
#define _NL_TYPES_H 1
+
#include <features.h>
/* The default message set used by the gencat program. */
diff --git a/config.h.in b/config.h.in
index 2b9ca028af..390b228529 100644
--- a/config.h.in
+++ b/config.h.in
@@ -46,6 +46,9 @@
/* Define if versioning of the library is wanted. */
#undef DO_VERSIONING
+/* Define if static NSS modules are wanted. */
+#undef DO_STATIC_NSS
+
/*
*/
diff --git a/config.make.in b/config.make.in
index e807a4cba2..2bf33b487f 100644
--- a/config.make.in
+++ b/config.make.in
@@ -40,6 +40,7 @@ build-shared = @shared@
build-profile = @profile@
build-omitfp = @omitfp@
build-bounded = @bounded@
+build-static-nss = @static_nss@
stdio = @stdio@
add-ons = @subdirs@
cross-compiling = @cross_compiling@
diff --git a/configure b/configure
index 3d8b4a224c..13545165ad 100755
--- a/configure
+++ b/configure
@@ -45,6 +45,8 @@ ac_help="$ac_help
--enable-bounded build with runtime bounds checking [default=no]"
ac_help="$ac_help
--enable-add-ons=DIR... configure and build named extra directories"
+ac_help="$ac_help
+ --enable-static-nss build static NSS modules [default=no]"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -484,7 +486,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=features.h
+ac_unique_file=include/features.h
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
@@ -727,6 +729,21 @@ if test x"$add_ons" != x; then
done
fi
+# Check whether --enable-static-nss or --disable-static-nss was given.
+if test "${enable_static_nss+set}" = set; then
+ enableval="$enable_static_nss"
+ static_nss=$enableval
+else
+ static_nss=no
+fi
+
+if test x"$static_nss" = xyes; then
+ cat >> confdefs.h <<\EOF
+#define DO_STATIC_NSS 1
+EOF
+
+fi
+
# Make sure we can run config.sub.
if $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -734,7 +751,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:738: checking host system type" >&5
+echo "configure:755: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -816,7 +833,7 @@ esac
# This can take a while to compute.
sysdep_dir=$srcdir/sysdeps
echo $ac_n "checking sysdep dirs""... $ac_c" 1>&6
-echo "configure:820: checking sysdep dirs" >&5
+echo "configure:837: checking sysdep dirs" >&5
# Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1.
os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
@@ -998,10 +1015,10 @@ while test $# -gt 0; do
done
# Add the default directories.
-sysnames="$names sysdeps/generic sysdeps/stub"
+sysnames="$names sysdeps/generic sysdeps/stub include"
# The other names were emitted during the scan.
-echo "$ac_t""sysdeps/generic sysdeps/stub" 1>&6
+echo "$ac_t""sysdeps/generic sysdeps/stub include" 1>&6
### Locate tools.
@@ -1017,7 +1034,7 @@ echo "$ac_t""sysdeps/generic sysdeps/stub" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1021: checking for a BSD compatible install" >&5
+echo "configure:1038: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1071,7 +1088,7 @@ if test "$INSTALL" = "${srcdir}/install-sh -c"; then
INSTALL='$(..)./install-sh -c'
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1075: checking whether ln -s works" >&5
+echo "configure:1092: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1096,7 +1113,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1100: checking for $ac_word" >&5
+echo "configure:1117: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1129,7 +1146,7 @@ test -n "$MSGFMT" || MSGFMT=":"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1133: checking for $ac_word" >&5
+echo "configure:1150: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1158,7 +1175,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1162: checking for $ac_word" >&5
+echo "configure:1179: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1206,7 +1223,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1227: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1216,11 +1233,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 1220 "configure"
+#line 1237 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1243,13 +1260,13 @@ else
cross_linkable=yes
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1247: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1264: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1253: checking whether we are using GNU C" >&5
+echo "configure:1270: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1258,7 +1275,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1275,7 +1292,7 @@ if test $ac_cv_prog_gcc = yes; then
yes;
#endif
EOF
- if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if test -z "$CFLAGS"; then
CFLAGS="-g -O2"
fi
@@ -1287,7 +1304,7 @@ else
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1291: checking build system type" >&5
+echo "configure:1308: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1310,7 +1327,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1314: checking for $ac_word" >&5
+echo "configure:1331: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1341,7 +1358,7 @@ done
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1345: checking how to run the C preprocessor" >&5
+echo "configure:1362: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1356,13 +1373,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1377 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -1373,13 +1390,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1377 "configure"
+#line 1394 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -1410,7 +1427,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1414: checking for $ac_word" >&5
+echo "configure:1431: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1441,7 +1458,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1445: checking for $ac_word" >&5
+echo "configure:1462: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1472,7 +1489,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1476: checking for $ac_word" >&5
+echo "configure:1493: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1507,7 +1524,7 @@ fi
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1511: checking for $ac_word" >&5
+echo "configure:1528: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1548,7 +1565,7 @@ if test "$BASH" = no; then
# Extract the first word of "ksh", so it can be a program name with args.
set dummy ksh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1552: checking for $ac_word" >&5
+echo "configure:1569: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1590,7 +1607,7 @@ fi
echo $ac_n "checking for signed size_t type""... $ac_c" 1>&6
-echo "configure:1594: checking for signed size_t type" >&5
+echo "configure:1611: checking for signed size_t type" >&5
if eval "test \"`echo '$''{'libc_cv_signed_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1614,12 +1631,12 @@ EOF
fi
echo $ac_n "checking for libc-friendly stddef.h""... $ac_c" 1>&6
-echo "configure:1618: checking for libc-friendly stddef.h" >&5
+echo "configure:1635: checking for libc-friendly stddef.h" >&5
if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1623 "configure"
+#line 1640 "configure"
#include "confdefs.h"
#define __need_size_t
#define __need_wchar_t
@@ -1634,7 +1651,7 @@ size_t size; wchar_t wchar;
if (&size == NULL || &wchar == NULL) abort ();
; return 0; }
EOF
-if { (eval echo configure:1638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
libc_cv_friendly_stddef=yes
else
@@ -1653,7 +1670,7 @@ override stddef.h = # The installed <stddef.h> seems to be libc-friendly."
fi
echo $ac_n "checking whether we need to use -P to assemble .S files""... $ac_c" 1>&6
-echo "configure:1657: checking whether we need to use -P to assemble .S files" >&5
+echo "configure:1674: checking whether we need to use -P to assemble .S files" >&5
if eval "test \"`echo '$''{'libc_cv_need_minus_P'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1676,7 +1693,7 @@ asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
fi
echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&6
-echo "configure:1680: checking for assembler global-symbol directive" >&5
+echo "configure:1697: checking for assembler global-symbol directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1706,7 +1723,7 @@ EOF
fi
echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&6
-echo "configure:1710: checking for .set assembler directive" >&5
+echo "configure:1727: checking for .set assembler directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1740,7 +1757,7 @@ EOF
fi
echo $ac_n "checking for .symver assembler directive""... $ac_c" 1>&6
-echo "configure:1744: checking for .symver assembler directive" >&5
+echo "configure:1761: checking for .symver assembler directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_symver_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1759,7 +1776,7 @@ fi
echo "$ac_t""$libc_cv_asm_symver_directive" 1>&6
echo $ac_n "checking for ld --version-script""... $ac_c" 1>&6
-echo "configure:1763: checking for ld --version-script" >&5
+echo "configure:1780: checking for ld --version-script" >&5
if eval "test \"`echo '$''{'libc_cv_ld_version_script_option'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1776,7 +1793,7 @@ VERS {
EOF
if ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.s 1>&5 2>&5; then
if { ac_try='${CC-cc} $CFLAGS --shared -o conftest.so conftest.o
- -Wl,--version-script,conftest.map'; { (eval echo configure:1780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
+ -Wl,--version-script,conftest.map'; { (eval echo configure:1797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
then
libc_cv_ld_version_script_option=yes
else
@@ -1806,7 +1823,7 @@ fi
if test $elf = yes; then
echo $ac_n "checking for .previous assembler directive""... $ac_c" 1>&6
-echo "configure:1810: checking for .previous assembler directive" >&5
+echo "configure:1827: checking for .previous assembler directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_previous_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1814,7 +1831,7 @@ else
.section foo_section
.previous
EOF
- if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:1818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:1835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
libc_cv_asm_previous_directive=yes
else
libc_cv_asm_previous_directive=no
@@ -1830,7 +1847,7 @@ EOF
else
echo $ac_n "checking for .popsection assembler directive""... $ac_c" 1>&6
-echo "configure:1834: checking for .popsection assembler directive" >&5
+echo "configure:1851: checking for .popsection assembler directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_popsection_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1838,7 +1855,7 @@ else
.pushsection foo_section
.popsection
EOF
- if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
libc_cv_asm_popsection_directive=yes
else
libc_cv_asm_popsection_directive=no
@@ -1858,12 +1875,12 @@ fi
if test $elf != yes; then
echo $ac_n "checking for .init and .fini sections""... $ac_c" 1>&6
-echo "configure:1862: checking for .init and .fini sections" >&5
+echo "configure:1879: checking for .init and .fini sections" >&5
if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1867 "configure"
+#line 1884 "configure"
#include "confdefs.h"
int main() {
@@ -1872,7 +1889,7 @@ asm (".section .init");
asm (".text");
; return 0; }
EOF
-if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
libc_cv_have_initfini=yes
else
@@ -1897,19 +1914,19 @@ if test $elf = yes; then
libc_cv_asm_underscores=no
else
echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&6
-echo "configure:1901: checking for _ prefix on C symbol names" >&5
+echo "configure:1918: checking for _ prefix on C symbol names" >&5
if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1906 "configure"
+#line 1923 "configure"
#include "confdefs.h"
asm ("_glibc_foobar:");
int main() {
glibc_foobar ();
; return 0; }
EOF
-if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
libc_cv_asm_underscores=yes
else
@@ -1936,7 +1953,7 @@ if test $elf = yes; then
libc_cv_asm_weakext_directive=no
else
echo $ac_n "checking for assembler .weak directive""... $ac_c" 1>&6
-echo "configure:1940: checking for assembler .weak directive" >&5
+echo "configure:1957: checking for assembler .weak directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_weak_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1959,7 +1976,7 @@ echo "$ac_t""$libc_cv_asm_weak_directive" 1>&6
if test $libc_cv_asm_weak_directive = no; then
echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&6
-echo "configure:1963: checking for assembler .weakext directive" >&5
+echo "configure:1980: checking for assembler .weakext directive" >&5
if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1996,7 +2013,7 @@ EOF
fi
echo $ac_n "checking for ld --no-whole-archive""... $ac_c" 1>&6
-echo "configure:2000: checking for ld --no-whole-archive" >&5
+echo "configure:2017: checking for ld --no-whole-archive" >&5
if eval "test \"`echo '$''{'libc_cv_ld_no_whole_archive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2007,7 +2024,7 @@ __throw () {}
EOF
if { ac_try='${CC-cc} $CFLAGS
-nostdlib -nostartfiles -Wl,--no-whole-archive
- -o conftest conftest.c'; { (eval echo configure:2011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ -o conftest conftest.c'; { (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
libc_cv_ld_no_whole_archive=yes
else
libc_cv_ld_no_whole_archive=no
@@ -2018,7 +2035,7 @@ fi
echo "$ac_t""$libc_cv_ld_no_whole_archive" 1>&6
echo $ac_n "checking for gcc -fno-exceptions""... $ac_c" 1>&6
-echo "configure:2022: checking for gcc -fno-exceptions" >&5
+echo "configure:2039: checking for gcc -fno-exceptions" >&5
if eval "test \"`echo '$''{'libc_cv_gcc_no_exceptions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2029,7 +2046,7 @@ __throw () {}
EOF
if { ac_try='${CC-cc} $CFLAGS
-nostdlib -nostartfiles -fno-exceptions
- -o conftest conftest.c'; { (eval echo configure:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ -o conftest conftest.c'; { (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
libc_cv_gcc_no_exceptions=yes
else
libc_cv_gcc_no_exceptions=no
@@ -2081,7 +2098,7 @@ if test "$uname" = "sysdeps/generic"; then
fi
echo $ac_n "checking OS release for uname""... $ac_c" 1>&6
-echo "configure:2085: checking OS release for uname" >&5
+echo "configure:2102: checking OS release for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2103,7 +2120,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6
uname_release="$libc_cv_uname_release"
echo $ac_n "checking OS version for uname""... $ac_c" 1>&6
-echo "configure:2107: checking OS version for uname" >&5
+echo "configure:2124: checking OS version for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2125,7 +2142,7 @@ else
fi
echo $ac_n "checking stdio selection""... $ac_c" 1>&6
-echo "configure:2129: checking stdio selection" >&5
+echo "configure:2146: checking stdio selection" >&5
case $stdio in
libio) cat >> confdefs.h <<\EOF
@@ -2178,6 +2195,7 @@ fi
+
if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
config_makefile=
else
@@ -2365,6 +2383,7 @@ s%@shared@%$shared%g
s%@profile@%$profile%g
s%@omitfp@%$omitfp%g
s%@bounded@%$bounded%g
+s%@static_nss@%$static_nss%g
s%@DEFINES@%$DEFINES%g
s%@VERSION@%$VERSION%g
@@ -2621,7 +2640,7 @@ while test -n "$ac_sources"; do
done
EOF
cat >> $CONFIG_STATUS <<EOF
-echo '$config_vars' >> config.make
+echo '$config_vars' >> config.make; test -d bits || mkdir bits
EOF
cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index 667ac7e0c2..150843c54b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
Dnl Process this file with autoconf to produce a configure script.
AC_REVISION([$CVSid$])
AC_PREREQ(2.11)dnl dnl Minimum Autoconf version required.
-AC_INIT(features.h)
+AC_INIT(include/features.h)
AC_CONFIG_HEADER(config.h)
# This will get text that should go into config.make.
@@ -92,6 +92,15 @@ if test x"$add_ons" != x; then
done
fi
+dnl On some platforms we cannot use dynamic loading. We must provide
+dnl static NSS modules.
+AC_ARG_ENABLE(static-nss, dnl
+[ --enable-static-nss build static NSS modules [default=no]],
+ static_nss=$enableval, static_nss=no)
+if test x"$static_nss" = xyes; then
+ AC_DEFINE(DO_STATIC_NSS)
+fi
+
AC_CANONICAL_HOST
# The way shlib-versions is used to generate soversions.mk uses a
@@ -345,10 +354,10 @@ changequote([,])dnl
done
# Add the default directories.
-sysnames="$names sysdeps/generic sysdeps/stub"
+sysnames="$names sysdeps/generic sysdeps/stub include"
AC_SUBST(sysnames)
# The other names were emitted during the scan.
-AC_MSG_RESULT(sysdeps/generic sysdeps/stub)
+AC_MSG_RESULT(sysdeps/generic sysdeps/stub include)
### Locate tools.
@@ -811,6 +820,7 @@ fi
AC_SUBST(profile)
AC_SUBST(omitfp)
AC_SUBST(bounded)
+AC_SUBST(static_nss)
AC_SUBST(DEFINES)
@@ -823,5 +833,5 @@ fi
VERSION=`sed -e 's/^#define VERSION "\([^"]*\)"/\1/p' -e d < $srcdir/version.h`
AC_SUBST(VERSION)
-AC_OUTPUT(config.make glibcbug ${config_makefile} ${config_uname}, ,
+ [echo '$config_vars' >> config.make; test -d bits || mkdir bits])
[echo '$config_vars' >> config.make])
diff --git a/csu/Makefile b/csu/Makefile
index 5888d1098e..c13ec1ec88 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -59,11 +59,11 @@ omit-deps += $(crtstuff)
# Special rules for the building of crti.o and crtn.o
$(objpfx)crt%.o: $(objpfx)crt%.S $(objpfx)defs.h
- $(CC) -c -fPIC -g0 -I$(..) -I$(common-objpfx) -DASSEMBLER $< -o $@
+ $(compile.S) -fPIC -g0 -o $@
$(objpfx)initfini.s: initfini.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -g0 -S -fPIC -finhibit-size-directive \
- $(no-exceptions) $< -o $@
+ $(compile.c) -g0 -S -fPIC -finhibit-size-directive \
+ $(no-exceptions) -o $@
$(objpfx)crti.S: $(objpfx)initfini.s
sed -n -e '1,/@HEADER_ENDS/p' \
diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c
index a7688f7d00..30b1cce6ff 100644
--- a/ctype/ctype-info.c
+++ b/ctype/ctype-info.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <ctype.h>
-#include "../locale/localeinfo.h"
+#include <locale/localeinfo.h>
/* Defined in locale/C-ctype.c. */
extern const char _nl_C_LC_CTYPE_class[];
@@ -30,8 +30,8 @@ extern const char _nl_C_LC_CTYPE_width[];
#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o);
const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
-const unsigned int *__ctype32_b = b (unsigned int, class32, 0);
-const int *__ctype_tolower = b (int, tolower, 128);
-const int *__ctype_toupper = b (int, toupper, 128);
-const unsigned int *__ctype_names = b (unsigned int, names, 0);
+const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
+const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
+const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
+const __uint32_t *__ctype_names = b (__uint32_t, names, 0);
const unsigned char *__ctype_width = b (unsigned char, width, 0);
diff --git a/ctype/ctype.h b/ctype/ctype.h
index bd128445bc..22b17c1ed7 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -21,9 +21,10 @@
*/
#ifndef _CTYPE_H
-
#define _CTYPE_H 1
+
#include <features.h>
+#include <gnu/types.h>
__BEGIN_DECLS
@@ -72,8 +73,8 @@ enum
doesn't fit into an `unsigned char'. But today more important is that
the arrays are also used for multi-byte character sets. */
extern __const unsigned short int *__ctype_b; /* Characteristics. */
-extern __const int *__ctype_tolower; /* Case conversions. */
-extern __const int *__ctype_toupper; /* Case conversions. */
+extern __const __int32_t *__ctype_tolower; /* Case conversions. */
+extern __const __int32_t *__ctype_toupper; /* Case conversions. */
#define __isctype(c, type) \
(__ctype_b[(int) (c)] & (unsigned short int) type)
diff --git a/db/db.h b/db/db.h
index 8f1a9de9e2..f00c4df9f9 100644
--- a/db/db.h
+++ b/db/db.h
@@ -33,8 +33,8 @@
* @(#)db.h 8.7 (Berkeley) 6/16/94
*/
-#ifndef _DB_H_
-#define _DB_H_
+#ifndef _DB_H
+#define _DB_H 1
#include <sys/types.h>
#include <sys/cdefs.h>
@@ -234,4 +234,5 @@ DB *__rec_open __P((const char *, int, int, const RECNOINFO *, int));
void __dbpanic __P((DB *dbp));
#endif
__END_DECLS
-#endif /* !_DB_H_ */
+
+#endif /* db.h */
diff --git a/db/mpool.h b/db/mpool.h
index e533072a65..56f17f90db 100644
--- a/db/mpool.h
+++ b/db/mpool.h
@@ -33,6 +33,9 @@
* @(#)mpool.h 8.2 (Berkeley) 7/14/94
*/
+#ifndef _MPOOL_H
+#define _MPOOL_H 1
+
#include <sys/queue.h>
/*
@@ -105,3 +108,5 @@ int mpool_close __P((MPOOL *));
void mpool_stat __P((MPOOL *));
#endif
__END_DECLS
+
+#endif /* mpool.h */
diff --git a/db/ndbm.h b/db/ndbm.h
index 48c4083a2b..db14dff2ed 100644
--- a/db/ndbm.h
+++ b/db/ndbm.h
@@ -36,8 +36,8 @@
* @(#)ndbm.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _NDBM_H_
-#define _NDBM_H_
+#ifndef _NDBM_H
+#define _NDBM_H 1
#include <db.h>
@@ -76,4 +76,4 @@ int dbm_error __P((DBM *));
int dbm_clearerr __P((DBM *));
__END_DECLS
-#endif /* !_NDBM_H_ */
+#endif /* ndbm.h */
diff --git a/dirent/Makefile b/dirent/Makefile
index 4b64498d28..a7f3553df0 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -21,7 +21,7 @@
#
subdir := dirent
-headers := dirent.h direntry.h
+headers := dirent.h bits/dirent.h
routines := opendir closedir readdir readdir_r rewinddir \
seekdir telldir scandir alphasort versionsort \
getdents dirfd
diff --git a/dirent/dirent.h b/dirent/dirent.h
index 9caf272aa1..a9a9a39e97 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -21,13 +21,13 @@
*/
#ifndef _DIRENT_H
-
#define _DIRENT_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
/* This file defines `struct dirent'.
@@ -44,7 +44,7 @@ __BEGIN_DECLS
member that gives the type of the file.
*/
-#include <direntry.h>
+#include <bits/dirent.h>
#if (defined __USE_BSD || defined __USE_MISC) && !defined d_fileno
# define d_ino d_fileno /* Backward compatibility. */
@@ -142,7 +142,7 @@ extern int dirfd __P ((DIR *__dirp));
# ifndef MAXNAMLEN
/* Get the definitions of the POSIX.1 limits. */
-# include <posix1_lim.h>
+# include <bits/posix1_lim.h>
/* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'. */
# ifdef NAME_MAX
@@ -152,7 +152,7 @@ extern int dirfd __P ((DIR *__dirp));
# endif
# endif
-# include <gnu/types.h>
+# include <bits/types.h>
# define __need_size_t
# include <stddef.h>
diff --git a/elf/Makefile b/elf/Makefile
index 489a565945..ef9207c07b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -20,7 +20,7 @@
subdir := elf
-headers = elf.h elfclass.h link.h dlfcn.h
+headers = elf.h bits/elfclass.h link.h dlfcn.h
routines = $(dl-routines) dl-open dl-close dl-symbol dl-support \
dl-version enbl-secure
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index f2ce4c9c3c..15da23d95c 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -83,6 +83,11 @@ do_lookup (const char *undef_name, unsigned long int hash,
if (skip != NULL && map == skip)
continue;
+ /* Skip objects that could not be opened, which can occur in trace
+ mode. */
+ if (map->l_opencount == 0)
+ continue;
+
/* Don't search the executable when resolving a copy reloc. */
if (elf_machine_lookup_noexec_p (reloc_type) &&
map->l_type == lt_executable)
@@ -285,7 +290,7 @@ _dl_lookup_versioned_symbol (const char *undef_name, const ElfW(Sym) **ref,
if (res < 0)
/* Oh, oh. The file named in the relocation entry does not
contain the needed symbol. */
- _dl_signal_error (0, *reference_name ? reference_name : NULL,
+ _dl_signal_error (0, reference_name,
make_string ("symbol ", undef_name, ", version ",
version->name,
" not defined in file ",
diff --git a/elf/dlfcn.h b/elf/dlfcn.h
index 94e1fae8a4..9b06988e96 100644
--- a/elf/dlfcn.h
+++ b/elf/dlfcn.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _DLFCN_H
-
#define _DLFCN_H 1
+
#include <features.h>
/* The MODE argument to `dlopen' contains one of the following: */
diff --git a/elf/elf.h b/elf/elf.h
index 76f6c6865d..63d36b141c 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -19,46 +19,47 @@
Boston, MA 02111-1307, USA. */
#ifndef _ELF_H
-
#define _ELF_H 1
+
#include <sys/cdefs.h>
__BEGIN_DECLS
-/* Standard ELF types. Using __attribute__ mode ensures that GCC
- will choose the right number of bits for these types. */
+/* Standard ELF types. */
+
+#include <inttypes.h>
/* Type for a 16-bit quantity. */
-typedef unsigned int Elf32_Half __attribute__ ((mode (HI)));
-typedef unsigned int Elf64_Half __attribute__ ((mode (HI)));
+typedef uint16_t Elf32_Half;
+typedef uint16_t Elf64_Half;
/* Types for signed and unsigned 32-bit quantities. */
-typedef unsigned int Elf32_Word __attribute__ ((mode (SI)));
-typedef int Elf32_Sword __attribute__ ((mode (SI)));
-typedef unsigned int Elf64_Word __attribute__ ((mode (SI)));
-typedef int Elf64_Sword __attribute__ ((mode (SI)));
+typedef uint32_t Elf32_Word;
+typedef int32_t Elf32_Sword;
+typedef uint32_t Elf64_Word;
+typedef int32_t Elf64_Sword;
/* Types for signed and unsigned 64-bit quantities. */
-typedef unsigned int Elf32_Xword __attribute__ ((mode (DI)));
-typedef int Elf32_Sxword __attribute__ ((mode (DI)));
-typedef unsigned int Elf64_Xword __attribute__ ((mode (DI)));
-typedef int Elf64_Sxword __attribute__ ((mode (DI)));
+typedef uint64_t Elf32_Xword;
+typedef int64_t Elf32_Sxword;
+typedef uint64_t Elf64_Xword;
+typedef int64_t Elf64_Sxword;
/* Type of addresses. */
-typedef unsigned int Elf32_Addr __attribute__ ((mode (SI)));
-typedef unsigned int Elf64_Addr __attribute__ ((mode (DI)));
+typedef uint32_t Elf32_Addr;
+typedef uint64_t Elf64_Addr;
/* Type of file offsets. */
-typedef unsigned int Elf32_Off __attribute__ ((mode (SI)));
-typedef unsigned int Elf64_Off __attribute__ ((mode (DI)));
+typedef uint32_t Elf32_Off;
+typedef uint64_t Elf64_Off;
/* Type for section indices, which are 16-bit quantities. */
-typedef unsigned int Elf32_Section __attribute__ ((mode (HI)));
-typedef unsigned int Elf64_Section __attribute__ ((mode (HI)));
+typedef uint16_t Elf32_Section;
+typedef uint16_t Elf64_Section;
/* Type of symbol indices. */
-typedef unsigned int Elf32_Symndx __attribute__ ((mode (SI)));
-typedef unsigned int Elf64_Symndx __attribute__ ((mode (DI)));
+typedef uint32_t Elf32_Symndx;
+typedef uint64_t Elf64_Symndx;
/* The ELF file header. This appears at the start of every ELF file. */
diff --git a/elf/eval.c b/elf/eval.c
index 7d53671f6c..ce452b722c 100644
--- a/elf/eval.c
+++ b/elf/eval.c
@@ -1,5 +1,5 @@
/* You don't really want to know what this hack is for.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 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
@@ -128,7 +128,7 @@ _start (void)
char *buf = NULL;
size_t bufsz = 0;
- while (__getline (&buf, &bufsz, stdin) > 0)
+ while (__getdelim (&buf, &bufsz, '\n', stdin) > 0)
{
char *p = buf;
eval (&p);
diff --git a/elf/link.h b/elf/link.h
index c894540e5e..6c272fe054 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _LINK_H
-
#define _LINK_H 1
+
#include <features.h>
#define __need_size_t
@@ -36,7 +36,8 @@ __BEGIN_DECLS
#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type)
#define _ElfW(e,w,t) _ElfW_1 (e, w, _##t)
#define _ElfW_1(e,w,t) e##w##t
-#include <elfclass.h> /* Defines __ELF_NATIVE_CLASS. */
+
+#include <bits/elfclass.h> /* Defines __ELF_NATIVE_CLASS. */
/* Rendezvous structure used by the run-time dynamic linker to communicate
details of shared object loading to the debugger. If the executable's
diff --git a/gmon/sys/gmon.h b/gmon/sys/gmon.h
index d963797cd2..2eff69b01c 100644
--- a/gmon/sys/gmon.h
+++ b/gmon/sys/gmon.h
@@ -33,9 +33,9 @@
* @(#)gmon.h 8.2 (Berkeley) 1/4/94
*/
-#ifndef _SYS_GMON_H_
+#ifndef _SYS_GMON_H
+#define _SYS_GMON_H 1
-#define _SYS_GMON_H_ 1
#include <features.h>
#include <sys/types.h>
@@ -176,4 +176,4 @@ void _mcleanup __P ((void));
__END_DECLS
-#endif /* !_SYS_GMON_H_ */
+#endif /* sys/gmon.h */
diff --git a/gmon/sys/gmon_out.h b/gmon/sys/gmon_out.h
index 36059cc572..bb80a1a16f 100644
--- a/gmon/sys/gmon_out.h
+++ b/gmon/sys/gmon_out.h
@@ -26,8 +26,8 @@
identifying the type of records, followed by records specific data. */
#ifndef _SYS_GMON_OUT_H
-
#define _SYS_GMON_OUT_H 1
+
#include <features.h>
#define GMON_MAGIC "gmon" /* magic cookie */
@@ -74,4 +74,4 @@ struct gmon_cg_arc_record
__END_DECLS
-#endif /* _SYS_GMON_OUT_H */
+#endif /* sys/gmon_out.h */
diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 0b461ad5fe..24fdcd86d9 100644
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <grp.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
diff --git a/grp/grp.h b/grp/grp.h
index 292bd26ec0..72b8925a8c 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -21,13 +21,13 @@
*/
#ifndef _GRP_H
-
#define _GRP_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
#define __need_size_t
#include <stddef.h>
diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h
index 8c6dbfd0be..b18f8a1586 100644
--- a/hurd/hurd/ioctl.h
+++ b/hurd/hurd/ioctl.h
@@ -22,7 +22,7 @@
#define __need___va_list
#include <stdarg.h>
-#include <ioctls.h>
+#include <bits/ioctls.h>
/* Type of handler function, called like ioctl to do its entire job. */
diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index 533099223a..eb7adbef66 100644
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -132,8 +132,8 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
int i;
} check =
{ t: {
- MACH_MSG_TYPE_INTEGER_32,
- 32,
+ MACH_MSG_TYPE_INTEGER_T,
+ MACH_MSG_TYPE_INTEGER_T,
1,
TRUE,
FALSE,
diff --git a/aliases.h b/include/aliases.h
index cfe459d02d..cfe459d02d 100644
--- a/aliases.h
+++ b/include/aliases.h
diff --git a/alloca.h b/include/alloca.h
index 34eeeab78e..34eeeab78e 100644
--- a/alloca.h
+++ b/include/alloca.h
diff --git a/argp.h b/include/argp.h
index 92be5f90f1..92be5f90f1 100644
--- a/argp.h
+++ b/include/argp.h
diff --git a/argz.h b/include/argz.h
index 179e693106..179e693106 100644
--- a/argz.h
+++ b/include/argz.h
diff --git a/arpa/ftp.h b/include/arpa/ftp.h
index c716d68156..c716d68156 100644
--- a/arpa/ftp.h
+++ b/include/arpa/ftp.h
diff --git a/arpa/inet.h b/include/arpa/inet.h
index 65733b618c..65733b618c 100644
--- a/arpa/inet.h
+++ b/include/arpa/inet.h
diff --git a/arpa/nameser.h b/include/arpa/nameser.h
index 944fe732a6..944fe732a6 100644
--- a/arpa/nameser.h
+++ b/include/arpa/nameser.h
diff --git a/arpa/telnet.h b/include/arpa/telnet.h
index 742c04cfe3..742c04cfe3 100644
--- a/arpa/telnet.h
+++ b/include/arpa/telnet.h
diff --git a/arpa/tftp.h b/include/arpa/tftp.h
index 21d5197f24..21d5197f24 100644
--- a/arpa/tftp.h
+++ b/include/arpa/tftp.h
diff --git a/assert.h b/include/assert.h
index e2fa7020c1..e2fa7020c1 100644
--- a/assert.h
+++ b/include/assert.h
diff --git a/include/bits/mathcalls.h b/include/bits/mathcalls.h
new file mode 100644
index 0000000000..d75b598cc7
--- /dev/null
+++ b/include/bits/mathcalls.h
@@ -0,0 +1 @@
+#include <math/bits/mathcalls.h>
diff --git a/include/bits/posix1_lim.h b/include/bits/posix1_lim.h
new file mode 100644
index 0000000000..c3c67d1c84
--- /dev/null
+++ b/include/bits/posix1_lim.h
@@ -0,0 +1 @@
+#include <posix/bits/posix1_lim.h>
diff --git a/include/bits/posix2_lim.h b/include/bits/posix2_lim.h
new file mode 100644
index 0000000000..49a539438c
--- /dev/null
+++ b/include/bits/posix2_lim.h
@@ -0,0 +1 @@
+#include <posix/bits/posix2_lim.h>
diff --git a/include/bits/stab.def b/include/bits/stab.def
new file mode 100644
index 0000000000..d153eba4de
--- /dev/null
+++ b/include/bits/stab.def
@@ -0,0 +1 @@
+#include <misc/bits/stab.def>
diff --git a/xopen_lim.h b/include/bits/xopen_lim.h
index 04a11ba320..c8b847fbc2 100644
--- a/xopen_lim.h
+++ b/include/bits/xopen_lim.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 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,6 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+/*
+ * Never include this file directly; use <limits.h> instead.
+ */
+
/* Additional definitions from X/Open Portability Guide, Issue 4, Version 2
System Interfaces and Headers, 4.16 <limits.h>
@@ -87,4 +91,4 @@
/* Default process priority. */
#define NZERO 20
-#endif /* xopen_lim.h */
+#endif /* bits/xopen_lim.h */
diff --git a/ctype.h b/include/ctype.h
index 7b51e1f5eb..7b51e1f5eb 100644
--- a/ctype.h
+++ b/include/ctype.h
diff --git a/db.h b/include/db.h
index a04f7746ef..a04f7746ef 100644
--- a/db.h
+++ b/include/db.h
diff --git a/dirent.h b/include/dirent.h
index f59a6b778b..f59a6b778b 100644
--- a/dirent.h
+++ b/include/dirent.h
diff --git a/dlfcn.h b/include/dlfcn.h
index 92804a1c1c..92804a1c1c 100644
--- a/dlfcn.h
+++ b/include/dlfcn.h
diff --git a/elf.h b/include/elf.h
index 8a1764f956..8a1764f956 100644
--- a/elf.h
+++ b/include/elf.h
diff --git a/endian.h b/include/endian.h
index cacf2fe9b7..cacf2fe9b7 100644
--- a/endian.h
+++ b/include/endian.h
diff --git a/envz.h b/include/envz.h
index 0a476ed62a..0a476ed62a 100644
--- a/envz.h
+++ b/include/envz.h
diff --git a/err.h b/include/err.h
index 915720aa4c..915720aa4c 100644
--- a/err.h
+++ b/include/err.h
diff --git a/errno.h b/include/errno.h
index b8486728b7..23e0b8f9a9 100644
--- a/errno.h
+++ b/include/errno.h
@@ -33,16 +33,16 @@ __BEGIN_DECLS
/* Get the error number constants from the system-specific file.
This file will test __need_Emath and _ERRNO_H. */
-#include <errnos.h>
+#include <bits/errno.h>
#undef __need_Emath
#ifdef _ERRNO_H
/* Declare the `errno' variable, unless it's defined as a macro by
- errnos.h. This is the case in GNU, where it is a per-thread variable.
- This redeclaration using the macro still works, but it will be a
- function declaration without a prototype and may trigger a
- -Wstrict-prototypes warning. */
+ bits/errno.h. This is the case in GNU, where it is a per-thread
+ variable. This redeclaration using the macro still works, but it
+ will be a function declaration without a prototype and may trigger
+ a -Wstrict-prototypes warning. */
#ifndef errno
extern int errno;
#endif
@@ -60,8 +60,8 @@ __END_DECLS
#endif /* _ERRNO_H */
-/* The Hurd <errnos.h> defines `error_t' as an enumerated type so that
- printing `error_t' values in the debugger shows the names. We
+/* The Hurd <bits/errno.h> defines `error_t' as an enumerated type so
+ that printing `error_t' values in the debugger shows the names. We
might need this definition sometimes even if this file was included
before. */
#if defined __USE_GNU || defined __need_error_t
diff --git a/error.h b/include/error.h
index 70f3192fa6..70f3192fa6 100644
--- a/error.h
+++ b/include/error.h
diff --git a/fcntl.h b/include/fcntl.h
index bac1e8685d..bac1e8685d 100644
--- a/fcntl.h
+++ b/include/fcntl.h
diff --git a/features.h b/include/features.h
index c38480e637..d1f4ae3d29 100644
--- a/features.h
+++ b/include/features.h
@@ -17,7 +17,6 @@
Boston, MA 02111-1307, USA. */
#ifndef _FEATURES_H
-
#define _FEATURES_H 1
/* These are defined by the user (or the compiler)
@@ -105,20 +104,20 @@
/* If _GNU_SOURCE was defined by the user, turn on all the other features. */
#ifdef _GNU_SOURCE
-#undef _ISOC9X_SOURCE
-#define _ISOC9X_SOURCE 1
-#undef _POSIX_SOURCE
-#define _POSIX_SOURCE 1
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 199309L
-#undef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#undef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
-#undef _BSD_SOURCE
-#define _BSD_SOURCE 1
-#undef _SVID_SOURCE
-#define _SVID_SOURCE 1
+# undef _ISOC9X_SOURCE
+# define _ISOC9X_SOURCE 1
+# undef _POSIX_SOURCE
+# define _POSIX_SOURCE 1
+# undef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 199309L
+# undef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 1
+# undef _XOPEN_SOURCE_EXTENDED
+# define _XOPEN_SOURCE_EXTENDED 1
+# undef _BSD_SOURCE
+# define _BSD_SOURCE 1
+# undef _SVID_SOURCE
+# define _SVID_SOURCE 1
#endif
/* If nothing (other than _GNU_SOURCE) is defined,
@@ -127,65 +126,65 @@
!defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE && \
!defined _XOPEN_SOURCE && !defined _XOPEN_SOURCE_EXTENDED && \
!defined _BSD_SOURCE && !defined _SVID_SOURCE)
-#define _BSD_SOURCE 1
-#define _SVID_SOURCE 1
+# define _BSD_SOURCE 1
+# define _SVID_SOURCE 1
#endif
/* This is to enable the ISO C 9x extension. It will go away as soon
as this standard is officially released. */
#ifdef _ISOC9X_SOURCE
-#define __USE_ISOC9X 1
+# define __USE_ISOC9X 1
#endif
/* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2
(and IEEE Std 1003.1b-1993 unless _XOPEN_SOURCE is defined). */
#if (!defined __STRICT_ANSI__ && !defined _POSIX_SOURCE && \
!defined _POSIX_C_SOURCE)
-#define _POSIX_SOURCE 1
-#ifdef _XOPEN_SOURCE
-#define _POSIX_C_SOURCE 2
-#else
-#define _POSIX_C_SOURCE 199309L
-#endif
+# define _POSIX_SOURCE 1
+# ifdef _XOPEN_SOURCE
+# define _POSIX_C_SOURCE 2
+# else
+# define _POSIX_C_SOURCE 199309L
+# endif
#endif
#if defined _POSIX_SOURCE || _POSIX_C_SOURCE >= 1 || defined _XOPEN_SOURCE
-#define __USE_POSIX 1
+# define __USE_POSIX 1
#endif
#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 2 || defined _XOPEN_SOURCE
-#define __USE_POSIX2 1
+# define __USE_POSIX2 1
#endif
#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 199309L
-#define __USE_POSIX199309 1
+# define __USE_POSIX199309 1
#endif
#ifdef _XOPEN_SOURCE
-#define __USE_XOPEN 1
-#ifdef _XOPEN_SOURCE_EXTENDED
-#define __USE_XOPEN_EXTENDED 1
-#endif
+# define __USE_XOPEN 1
+# ifdef _XOPEN_SOURCE_EXTENDED
+# define __USE_XOPEN_EXTENDED 1
+# endif
#endif
#if defined _BSD_SOURCE || defined _SVID_SOURCE
-#define __USE_MISC 1
+# define __USE_MISC 1
#endif
#ifdef _BSD_SOURCE
-#define __USE_BSD 1
+# define __USE_BSD 1
#endif
#ifdef _SVID_SOURCE
-#define __USE_SVID 1
+# define __USE_SVID 1
#endif
#ifdef _GNU_SOURCE
-#define __USE_GNU 1
+# define __USE_GNU 1
#endif
#if defined _REENTRANT || defined _THREAD_SAFE
-#define __USE_REENTRANT 1
+# define __USE_REENTRANT 1
#endif
/* We do support the IEC 559 math functionality, real and complex. */
@@ -210,13 +209,13 @@
#if !defined __GNUC__ || __GNUC__ < 2
/* In GCC version 2, (__extension__ EXPR) will not complain
about GCC extensions used in EXPR under -ansi or -pedantic. */
-#define __extension__
+# define __extension__
#endif
/* This is here only because every header file already includes this one. */
#ifndef __ASSEMBLER__
-#include <sys/cdefs.h>
+# include <sys/cdefs.h>
#endif
/* This is here only because every header file already includes this one. */
@@ -230,7 +229,7 @@
this #include were done for the library source code, then every object
file would depend on stubs.h. */
-#include <gnu/stubs.h>
+# include <gnu/stubs.h>
#endif
#endif /* features.h */
diff --git a/fnmatch.h b/include/fnmatch.h
index b12b786df0..b12b786df0 100644
--- a/fnmatch.h
+++ b/include/fnmatch.h
diff --git a/ftw.h b/include/ftw.h
index 4fb654cf22..4fb654cf22 100644
--- a/ftw.h
+++ b/include/ftw.h
diff --git a/getopt.h b/include/getopt.h
index 74ca6d453a..74ca6d453a 100644
--- a/getopt.h
+++ b/include/getopt.h
diff --git a/glob.h b/include/glob.h
index ce047bb177..ce047bb177 100644
--- a/glob.h
+++ b/include/glob.h
diff --git a/gnu-versions.h b/include/gnu-versions.h
index 7085895a0a..7085895a0a 100644
--- a/gnu-versions.h
+++ b/include/gnu-versions.h
diff --git a/grp.h b/include/grp.h
index 250092cbf1..250092cbf1 100644
--- a/grp.h
+++ b/include/grp.h
diff --git a/langinfo.h b/include/langinfo.h
index 2a81c6ddaf..2a81c6ddaf 100644
--- a/langinfo.h
+++ b/include/langinfo.h
diff --git a/libc-symbols.h b/include/libc-symbols.h
index 07a35f1b53..07a35f1b53 100644
--- a/libc-symbols.h
+++ b/include/libc-symbols.h
diff --git a/libgen.h b/include/libgen.h
index 4795d8e561..4795d8e561 100644
--- a/libgen.h
+++ b/include/libgen.h
diff --git a/libintl.h b/include/libintl.h
index be1062ca03..be1062ca03 100644
--- a/libintl.h
+++ b/include/libintl.h
diff --git a/limits.h b/include/limits.h
index c7b1278638..31d8792d9d 100644
--- a/limits.h
+++ b/include/limits.h
@@ -24,15 +24,15 @@
#ifdef __USE_POSIX
/* POSIX adds things to <limits.h>. */
-# include <posix1_lim.h>
+# include <bits/posix1_lim.h>
#endif
#ifdef __USE_POSIX2
-# include <posix2_lim.h>
+# include <bits/posix2_lim.h>
#endif
#ifdef __USE_XOPEN
-# include <xopen_lim.h>
+# include <bits/xopen_lim.h>
#endif
diff --git a/linewrap.h b/include/linewrap.h
index 03ca090301..03ca090301 100644
--- a/linewrap.h
+++ b/include/linewrap.h
diff --git a/link.h b/include/link.h
index 0999f0bbfc..0999f0bbfc 100644
--- a/link.h
+++ b/include/link.h
diff --git a/locale.h b/include/locale.h
index 6e0bd916dc..6e0bd916dc 100644
--- a/locale.h
+++ b/include/locale.h
diff --git a/malloc.h b/include/malloc.h
index 448e0a8c6b..448e0a8c6b 100644
--- a/malloc.h
+++ b/include/malloc.h
diff --git a/math.h b/include/math.h
index f837293f81..f837293f81 100644
--- a/math.h
+++ b/include/math.h
diff --git a/mcheck.h b/include/mcheck.h
index 90a48d5f9a..90a48d5f9a 100644
--- a/mcheck.h
+++ b/include/mcheck.h
diff --git a/memory.h b/include/memory.h
index 1ec3e63fc9..1ec3e63fc9 100644
--- a/memory.h
+++ b/include/memory.h
diff --git a/monetary.h b/include/monetary.h
index 4735dc6c8a..4735dc6c8a 100644
--- a/monetary.h
+++ b/include/monetary.h
diff --git a/netdb.h b/include/netdb.h
index e2e1868cbb..e2e1868cbb 100644
--- a/netdb.h
+++ b/include/netdb.h
diff --git a/netgroup.h b/include/netgroup.h
index 4b2b284cdb..4b2b284cdb 100644
--- a/netgroup.h
+++ b/include/netgroup.h
diff --git a/netinet/ether.h b/include/netinet/ether.h
index 60ef5a3abf..60ef5a3abf 100644
--- a/netinet/ether.h
+++ b/include/netinet/ether.h
diff --git a/netinet/in.h b/include/netinet/in.h
index 9139cfaeee..9139cfaeee 100644
--- a/netinet/in.h
+++ b/include/netinet/in.h
diff --git a/nlist.h b/include/nlist.h
index 897a93c7fe..897a93c7fe 100644
--- a/nlist.h
+++ b/include/nlist.h
diff --git a/nss.h b/include/nss.h
index 0541335c18..0541335c18 100644
--- a/nss.h
+++ b/include/nss.h
diff --git a/nsswitch.h b/include/nsswitch.h
index a876d23185..a876d23185 100644
--- a/nsswitch.h
+++ b/include/nsswitch.h
diff --git a/obstack.h b/include/obstack.h
index 2339cbc4d5..2339cbc4d5 100644
--- a/obstack.h
+++ b/include/obstack.h
diff --git a/poll.h b/include/poll.h
index 778488accb..778488accb 100644
--- a/poll.h
+++ b/include/poll.h
diff --git a/printf.h b/include/printf.h
index 777e958fb9..777e958fb9 100644
--- a/printf.h
+++ b/include/printf.h
diff --git a/protocols/routed.h b/include/protocols/routed.h
index 2e97bfd187..2e97bfd187 100644
--- a/protocols/routed.h
+++ b/include/protocols/routed.h
diff --git a/protocols/rwhod.h b/include/protocols/rwhod.h
index 6fc35a0c41..6fc35a0c41 100644
--- a/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
diff --git a/protocols/talkd.h b/include/protocols/talkd.h
index 4fd7a34fdf..4fd7a34fdf 100644
--- a/protocols/talkd.h
+++ b/include/protocols/talkd.h
diff --git a/protocols/timed.h b/include/protocols/timed.h
index 58dbafeaf2..58dbafeaf2 100644
--- a/protocols/timed.h
+++ b/include/protocols/timed.h
diff --git a/pwd.h b/include/pwd.h
index 28d59a6a0a..28d59a6a0a 100644
--- a/pwd.h
+++ b/include/pwd.h
diff --git a/regex.h b/include/regex.h
index 22bfc89e77..22bfc89e77 100644
--- a/regex.h
+++ b/include/regex.h
diff --git a/resolv.h b/include/resolv.h
index 95b9eebef8..95b9eebef8 100644
--- a/resolv.h
+++ b/include/resolv.h
diff --git a/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 36299392ba..36299392ba 100644
--- a/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
diff --git a/rpc/clnt.h b/include/rpc/clnt.h
index b4493d1d90..b4493d1d90 100644
--- a/rpc/clnt.h
+++ b/include/rpc/clnt.h
diff --git a/rpc/netdb.h b/include/rpc/netdb.h
index a9d93e13ad..a9d93e13ad 100644
--- a/rpc/netdb.h
+++ b/include/rpc/netdb.h
diff --git a/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index dfe537c96f..dfe537c96f 100644
--- a/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
diff --git a/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 06d7d378cf..06d7d378cf 100644
--- a/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
diff --git a/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 1585c13039..1585c13039 100644
--- a/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
diff --git a/rpc/rpc.h b/include/rpc/rpc.h
index 1b5c5cd8de..1b5c5cd8de 100644
--- a/rpc/rpc.h
+++ b/include/rpc/rpc.h
diff --git a/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 3c63730c1f..3c63730c1f 100644
--- a/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
diff --git a/rpc/svc.h b/include/rpc/svc.h
index 68aa67b429..68aa67b429 100644
--- a/rpc/svc.h
+++ b/include/rpc/svc.h
diff --git a/rpc/svc_auth.h b/include/rpc/svc_auth.h
index e2c226312e..e2c226312e 100644
--- a/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
diff --git a/rpc/types.h b/include/rpc/types.h
index 53df7e666b..53df7e666b 100644
--- a/rpc/types.h
+++ b/include/rpc/types.h
diff --git a/rpc/xdr.h b/include/rpc/xdr.h
index 4c9083d08a..4c9083d08a 100644
--- a/rpc/xdr.h
+++ b/include/rpc/xdr.h
diff --git a/sched.h b/include/sched.h
index b9bebc9dee..b9bebc9dee 100644
--- a/sched.h
+++ b/include/sched.h
diff --git a/search.h b/include/search.h
index ff24508172..ff24508172 100644
--- a/search.h
+++ b/include/search.h
diff --git a/set-hooks.h b/include/set-hooks.h
index 10d0b10176..995bdf4120 100644
--- a/set-hooks.h
+++ b/include/set-hooks.h
@@ -1,23 +1,24 @@
/* Macros for using symbol sets for running lists of functions.
-Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ Copyright (C) 1994, 1995, 1997 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 Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
+ 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
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#ifndef _SET_HOOKS_H
+#define _SET_HOOKS_H 1
#define __need_size_t
#include <stddef.h>
@@ -53,4 +54,4 @@ do { \
DEFINE_HOOK (name, proto); void runner proto { RUN_HOOK (name, args); }
-#endif
+#endif /* set-hooks.h */
diff --git a/setjmp.h b/include/setjmp.h
index c78a964566..c78a964566 100644
--- a/setjmp.h
+++ b/include/setjmp.h
diff --git a/sgtty.h b/include/sgtty.h
index ffb62401cb..ffb62401cb 100644
--- a/sgtty.h
+++ b/include/sgtty.h
diff --git a/shadow.h b/include/shadow.h
index 4848197be1..4848197be1 100644
--- a/shadow.h
+++ b/include/shadow.h
diff --git a/signal.h b/include/signal.h
index d9939c4e83..d9939c4e83 100644
--- a/signal.h
+++ b/include/signal.h
diff --git a/include/stab.h b/include/stab.h
new file mode 100644
index 0000000000..2e278fc778
--- /dev/null
+++ b/include/stab.h
@@ -0,0 +1 @@
+#include <misc/stab.h>
diff --git a/stdio.h b/include/stdio.h
index 457eabe32f..457eabe32f 100644
--- a/stdio.h
+++ b/include/stdio.h
diff --git a/stdlib.h b/include/stdlib.h
index c0887a99e9..c0887a99e9 100644
--- a/stdlib.h
+++ b/include/stdlib.h
diff --git a/string.h b/include/string.h
index b557c65f39..b557c65f39 100644
--- a/string.h
+++ b/include/string.h
diff --git a/strings.h b/include/strings.h
index b1bb339d3d..b1bb339d3d 100644
--- a/strings.h
+++ b/include/strings.h
diff --git a/sys/bitypes.h b/include/sys/bitypes.h
index 137945172d..137945172d 100644
--- a/sys/bitypes.h
+++ b/include/sys/bitypes.h
diff --git a/sys/cdefs.h b/include/sys/cdefs.h
index 200abb4f02..200abb4f02 100644
--- a/sys/cdefs.h
+++ b/include/sys/cdefs.h
diff --git a/sys/dir.h b/include/sys/dir.h
index 5453e743fc..5453e743fc 100644
--- a/sys/dir.h
+++ b/include/sys/dir.h
diff --git a/sys/errno.h b/include/sys/errno.h
index 339f4fc10c..339f4fc10c 100644
--- a/sys/errno.h
+++ b/include/sys/errno.h
diff --git a/sys/fcntl.h b/include/sys/fcntl.h
index dec2157be6..dec2157be6 100644
--- a/sys/fcntl.h
+++ b/include/sys/fcntl.h
diff --git a/sys/file.h b/include/sys/file.h
index fb3cd7544e..fb3cd7544e 100644
--- a/sys/file.h
+++ b/include/sys/file.h
diff --git a/sys/gmon.h b/include/sys/gmon.h
index 987589fcfe..987589fcfe 100644
--- a/sys/gmon.h
+++ b/include/sys/gmon.h
diff --git a/sys/ioctl.h b/include/sys/ioctl.h
index 8cc77757f6..8cc77757f6 100644
--- a/sys/ioctl.h
+++ b/include/sys/ioctl.h
diff --git a/sys/ipc.h b/include/sys/ipc.h
index 7bd257684b..7bd257684b 100644
--- a/sys/ipc.h
+++ b/include/sys/ipc.h
diff --git a/sys/msg.h b/include/sys/msg.h
index 0f8026dda1..0f8026dda1 100644
--- a/sys/msg.h
+++ b/include/sys/msg.h
diff --git a/sys/poll.h b/include/sys/poll.h
index 5231e6845e..5231e6845e 100644
--- a/sys/poll.h
+++ b/include/sys/poll.h
diff --git a/sys/queue.h b/include/sys/queue.h
index 5c9823b7eb..5c9823b7eb 100644
--- a/sys/queue.h
+++ b/include/sys/queue.h
diff --git a/sys/resource.h b/include/sys/resource.h
index 33e6f4de9e..33e6f4de9e 100644
--- a/sys/resource.h
+++ b/include/sys/resource.h
diff --git a/sys/select.h b/include/sys/select.h
index f793af7bf0..f793af7bf0 100644
--- a/sys/select.h
+++ b/include/sys/select.h
diff --git a/sys/sem.h b/include/sys/sem.h
index b0fb201bd0..b0fb201bd0 100644
--- a/sys/sem.h
+++ b/include/sys/sem.h
diff --git a/sys/shm.h b/include/sys/shm.h
index 1878fcc5be..1878fcc5be 100644
--- a/sys/shm.h
+++ b/include/sys/shm.h
diff --git a/sys/signal.h b/include/sys/signal.h
index b2110df1ae..b2110df1ae 100644
--- a/sys/signal.h
+++ b/include/sys/signal.h
diff --git a/sys/socket.h b/include/sys/socket.h
index 999a683016..999a683016 100644
--- a/sys/socket.h
+++ b/include/sys/socket.h
diff --git a/sys/stat.h b/include/sys/stat.h
index 37a526069f..37a526069f 100644
--- a/sys/stat.h
+++ b/include/sys/stat.h
diff --git a/sys/statfs.h b/include/sys/statfs.h
index d42df4b65d..d42df4b65d 100644
--- a/sys/statfs.h
+++ b/include/sys/statfs.h
diff --git a/sys/syslog.h b/include/sys/syslog.h
index 247528b430..247528b430 100644
--- a/sys/syslog.h
+++ b/include/sys/syslog.h
diff --git a/sys/termios.h b/include/sys/termios.h
index 27e4de5f4b..27e4de5f4b 100644
--- a/sys/termios.h
+++ b/include/sys/termios.h
diff --git a/sys/time.h b/include/sys/time.h
index 5595a957a0..5595a957a0 100644
--- a/sys/time.h
+++ b/include/sys/time.h
diff --git a/sys/timeb.h b/include/sys/timeb.h
index 9f4509c35e..9f4509c35e 100644
--- a/sys/timeb.h
+++ b/include/sys/timeb.h
diff --git a/sys/times.h b/include/sys/times.h
index 16ca91138a..16ca91138a 100644
--- a/sys/times.h
+++ b/include/sys/times.h
diff --git a/sys/types.h b/include/sys/types.h
index 716732f4d4..716732f4d4 100644
--- a/sys/types.h
+++ b/include/sys/types.h
diff --git a/sys/uio.h b/include/sys/uio.h
index 03afd84b87..03afd84b87 100644
--- a/sys/uio.h
+++ b/include/sys/uio.h
diff --git a/sys/un.h b/include/sys/un.h
index bdbee99980..bdbee99980 100644
--- a/sys/un.h
+++ b/include/sys/un.h
diff --git a/sys/unistd.h b/include/sys/unistd.h
index 8ca19e5516..8ca19e5516 100644
--- a/sys/unistd.h
+++ b/include/sys/unistd.h
diff --git a/sys/utsname.h b/include/sys/utsname.h
index ff81bdf48e..ff81bdf48e 100644
--- a/sys/utsname.h
+++ b/include/sys/utsname.h
diff --git a/sys/vlimit.h b/include/sys/vlimit.h
index 8a76d2fd00..8a76d2fd00 100644
--- a/sys/vlimit.h
+++ b/include/sys/vlimit.h
diff --git a/sys/vtimes.h b/include/sys/vtimes.h
index dd666ca443..dd666ca443 100644
--- a/sys/vtimes.h
+++ b/include/sys/vtimes.h
diff --git a/sys/wait.h b/include/sys/wait.h
index 379d5cc7a5..379d5cc7a5 100644
--- a/sys/wait.h
+++ b/include/sys/wait.h
diff --git a/syscall.h b/include/syscall.h
index 8c53cfb204..8c53cfb204 100644
--- a/syscall.h
+++ b/include/syscall.h
diff --git a/sysexits.h b/include/sysexits.h
index 139e3cfa13..139e3cfa13 100644
--- a/sysexits.h
+++ b/include/sysexits.h
diff --git a/syslog.h b/include/syslog.h
index 4cfb7723bb..4cfb7723bb 100644
--- a/syslog.h
+++ b/include/syslog.h
diff --git a/tar.h b/include/tar.h
index 05efa1fc0e..05efa1fc0e 100644
--- a/tar.h
+++ b/include/tar.h
diff --git a/termios.h b/include/termios.h
index 3f754ac900..3f754ac900 100644
--- a/termios.h
+++ b/include/termios.h
diff --git a/time.h b/include/time.h
index b2a33bf5c3..b2a33bf5c3 100644
--- a/time.h
+++ b/include/time.h
diff --git a/ttyent.h b/include/ttyent.h
index ba790e3542..ba790e3542 100644
--- a/ttyent.h
+++ b/include/ttyent.h
diff --git a/unistd.h b/include/unistd.h
index 77901d9846..77901d9846 100644
--- a/unistd.h
+++ b/include/unistd.h
diff --git a/utime.h b/include/utime.h
index 6dadc53ad6..6dadc53ad6 100644
--- a/utime.h
+++ b/include/utime.h
diff --git a/utmp.h b/include/utmp.h
index c0c21a4436..c0c21a4436 100644
--- a/utmp.h
+++ b/include/utmp.h
diff --git a/values.h b/include/values.h
index 3c82842870..26421724c4 100644
--- a/values.h
+++ b/include/values.h
@@ -21,8 +21,8 @@
<limits.h> and/or <float.h> instead of <values.h>. */
#ifndef _VALUES_H
-
#define _VALUES_H 1
+
#include <features.h>
#include <limits.h>
diff --git a/wchar.h b/include/wchar.h
index c87ffb851b..c87ffb851b 100644
--- a/wchar.h
+++ b/include/wchar.h
diff --git a/wctype.h b/include/wctype.h
index c76f50c866..c76f50c866 100644
--- a/wctype.h
+++ b/include/wctype.h
diff --git a/wordexp.h b/include/wordexp.h
index 64e036e062..64e036e062 100644
--- a/wordexp.h
+++ b/include/wordexp.h
diff --git a/xlocale.h b/include/xlocale.h
index 5280ef0bc4..5280ef0bc4 100644
--- a/xlocale.h
+++ b/include/xlocale.h
diff --git a/inet/aliases.h b/inet/aliases.h
index 4c89a04113..c6e829007e 100644
--- a/inet/aliases.h
+++ b/inet/aliases.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _ALIASES_H
-
#define _ALIASES_H 1
+
#include <features.h>
#include <sys/types.h>
diff --git a/inet/arpa/ftp.h b/inet/arpa/ftp.h
index 64532b9e25..ac864aa708 100644
--- a/inet/arpa/ftp.h
+++ b/inet/arpa/ftp.h
@@ -33,8 +33,8 @@
* @(#)ftp.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _FTP_H_
-#define _FTP_H_
+#ifndef _ARPA_FTP_H
+#define _ARPA_FTP_H 1
/* Definitions for FTP; see RFC-765. */
@@ -106,4 +106,4 @@ char *modenames[] = {"0", "Stream", "Block", "Compressed" };
#define BLK_BYTECOUNT 2 /* Bytes in this block */
-#endif /* !_FTP_H_ */
+#endif /* arpa/ftp.h */
diff --git a/inet/arpa/inet.h b/inet/arpa/inet.h
index 0593c8fad6..ab4f0c9ea6 100644
--- a/inet/arpa/inet.h
+++ b/inet/arpa/inet.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _ARPA_INET_H
-
#define _ARPA_INET_H 1
+
#include <features.h>
#include <sys/types.h>
diff --git a/inet/arpa/telnet.h b/inet/arpa/telnet.h
index 17255a1c7b..3309e5d727 100644
--- a/inet/arpa/telnet.h
+++ b/inet/arpa/telnet.h
@@ -33,8 +33,8 @@
* @(#)telnet.h 8.2 (Berkeley) 12/15/93
*/
-#ifndef _TELNET_H_
-#define _TELNET_H_
+#ifndef _ARPA_TELNET_H
+#define _ARPA_TELNET_H 1
/*
* Definitions for the TELNET protocol.
@@ -317,4 +317,4 @@ extern char *enctype_names[];
#define ENCTYPE_NAME_OK(x) ((unsigned int)(x) < ENCTYPE_CNT)
#define ENCTYPE_NAME(x) enctype_names[x]
-#endif /* !_TELNET_H_ */
+#endif /* arpa/telnet.h */
diff --git a/inet/arpa/tftp.h b/inet/arpa/tftp.h
index e2651a5019..0904407c73 100644
--- a/inet/arpa/tftp.h
+++ b/inet/arpa/tftp.h
@@ -33,8 +33,8 @@
* @(#)tftp.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _TFTP_H_
-#define _TFTP_H_
+#ifndef _ARPA_TFTP_H
+#define _ARPA_TFTP_H 1
/*
* Trivial File Transfer Protocol (IEN-133)
@@ -77,4 +77,4 @@ struct tftphdr {
#define EEXISTS 6 /* file already exists */
#define ENOUSER 7 /* no such user */
-#endif /* !_TFTP_H_ */
+#endif /* arpa/tftp.h */
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 95ed6bf3f9..7c28e551b3 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <unistd.h>
#include <alloca.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <arpa/inet.h>
#ifndef AF_LOCAL
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 1ef043a326..5afe82561c 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <netdb.h>
#include <stdlib.h>
#include <string.h>
diff --git a/inet/inet_ntoa.c b/inet/inet_ntoa.c
index b6087a982f..3e9636c5df 100644
--- a/inet/inet_ntoa.c
+++ b/inet/inet_ntoa.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
/* The interface of this function is completely stupid, it requires a
static buffer. We relax this a bit in that we allow at least one
diff --git a/inet/netinet/ether.h b/inet/netinet/ether.h
index 06d01b1508..c7985d7acc 100644
--- a/inet/netinet/ether.h
+++ b/inet/netinet/ether.h
@@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __NETINET_ETHER_H
+#ifndef _NETINET_ETHER_H
+#define _NETINET_ETHER_H 1
-#define __NETINET_ETHER_H 1
#include <features.h>
/* Get definition of `struct ether_addr'. */
diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h
index 90c61afda8..7d8d86665e 100644
--- a/inet/netinet/icmp6.h
+++ b/inet/netinet/icmp6.h
@@ -185,4 +185,4 @@ struct nd6_opt_mtu /* MTU option */
u_int32_t opt_mtu;
};
-#endif /* _NETINET6_ICMPV6_H */
+#endif /* netinet/icmpv6.h */
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index a85dccd6de..7a9d42d5fa 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _NETINET_IN_H
-
#define _NETINET_IN_H 1
+
#include <features.h>
#include <sys/socket.h>
@@ -90,7 +90,7 @@ enum
/* Internet address. */
struct in_addr
{
- unsigned int s_addr;
+ u_int32_t s_addr;
};
@@ -164,7 +164,7 @@ extern const struct in6_addr in6addr_loopback; /* ::1 */
#define INET6_ADDRSTRLEN 46
/* Get the definition of the macro to define the common sockaddr members. */
-#include <sockaddrcom.h>
+#include <bits/sockaddr.h>
/* Structure describing an Internet socket address. */
diff --git a/inet/netinet/ip6.h b/inet/netinet/ip6.h
index 65bf7211e8..e4e0e672ff 100644
--- a/inet/netinet/ip6.h
+++ b/inet/netinet/ip6.h
@@ -42,4 +42,4 @@ struct ipv6hdr
struct in6_addr ipv6_dst;
};
-#endif /* _NETINET_IP6_H */
+#endif /* netinet/ip6.h */
diff --git a/inet/protocols/routed.h b/inet/protocols/routed.h
index f41fc2182a..f342239db9 100644
--- a/inet/protocols/routed.h
+++ b/inet/protocols/routed.h
@@ -33,8 +33,8 @@
* @(#)routed.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _ROUTED_H_
-#define _ROUTED_H_
+#ifndef _PROTOCOLS_ROUTED_H
+#define _PROTOCOLS_ROUTED_H 1
/*
* Routing Information Protocol
@@ -101,4 +101,4 @@ char *ripcmds[RIPCMD_MAX] =
#define EXPIRE_TIME 180 /* time to mark entry invalid */
#define GARBAGE_TIME 240 /* time to garbage collect */
-#endif /* !_ROUTED_H_ */
+#endif /* protocols/routed.h */
diff --git a/inet/protocols/rwhod.h b/inet/protocols/rwhod.h
index 4ce44906a0..e5d9f991a8 100644
--- a/inet/protocols/rwhod.h
+++ b/inet/protocols/rwhod.h
@@ -33,8 +33,8 @@
* @(#)rwhod.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _RWHOD_H_
-#define _RWHOD_H_
+#ifndef _PROTOCOLS_RWHOD_H
+#define _PROTOCOLS_RWHOD_H 1
#include <sys/types.h>
@@ -67,4 +67,4 @@ struct whod {
#define _PATH_RWHODIR "/var/rwho"
-#endif /* !_RWHOD_H_ */
+#endif /* protocols/rwhod.h */
diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h
index 6d893adfb5..5bec984d1f 100644
--- a/inet/protocols/talkd.h
+++ b/inet/protocols/talkd.h
@@ -33,8 +33,8 @@
* @(#)talkd.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _TALKD_H_
-#define _TALKD_H_
+#ifndef _PROTOCOLS_TALKD_H
+#define _PROTOCOLS_TALKD_H 1
/*
* This describes the protocol used by the talk server and clients.
@@ -113,4 +113,4 @@ typedef struct {
/* RING_WAIT should be 10's of seconds less than MAX_LIFE */
#define RING_WAIT 30 /* time to wait before resending invitation */
-#endif /* !_TALKD_H_ */
+#endif /* protocols/talkd.h */
diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
index 1b569f5312..a2c9fb8ce4 100644
--- a/inet/protocols/timed.h
+++ b/inet/protocols/timed.h
@@ -33,8 +33,8 @@
* @(#)timed.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _TIMED_H_
-#define _TIMED_H_
+#ifndef _PROTOCOLS_TIMED_H
+#define _PROTOCOLS_TIMED_H 1
/*
* Time Synchronization Protocol
@@ -96,4 +96,4 @@ char *tsptype[TSPTYPENUMBER] =
"TEST", "SETDATE", "SETDATEREQ", "LOOP" };
#endif
-#endif /* !_TIMED_H_ */
+#endif /* protocols/timed.h */
diff --git a/intl/libintl.h b/intl/libintl.h
index 34cd5e0d51..86b44650e8 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -22,8 +22,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _LIBINTL_H
-
#define _LIBINTL_H 1
+
#include <features.h>
/* We define an additional symbol to signal that we use the GNU
diff --git a/io/Makefile b/io/Makefile
index d199f9110b..055dabeba6 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -21,8 +21,8 @@
#
subdir := io
-headers := sys/stat.h statbuf.h sys/statfs.h statfsbuf.h sys/vfs.h \
- fcntl.h sys/fcntl.h fcntlbits.h \
+headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
+ fcntl.h sys/fcntl.h bits/fcntl.h \
poll.h sys/poll.h \
utime.h ftw.h fts.h
diff --git a/io/fcntl.h b/io/fcntl.h
index 4e1b38a58e..519230019c 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -21,16 +21,16 @@
*/
#ifndef _FCNTL_H
-
#define _FCNTL_H 1
+
#include <features.h>
-/* This must be early so <fcntlbits.h> can define types winningly. */
+/* This must be early so <bits/fcntl.h> can define types winningly. */
__BEGIN_DECLS
/* Get the definitions of O_*, F_*, FD_*: all the
numbers and flag bits for `open', `fcntl', et al. */
-#include <fcntlbits.h>
+#include <bits/fcntl.h>
#ifdef __USE_MISC
#ifndef R_OK /* Verbatim from <unistd.h>. Ugh. */
diff --git a/io/fts.h b/io/fts.h
index a6548c2d79..55194db9e2 100644
--- a/io/fts.h
+++ b/io/fts.h
@@ -33,8 +33,8 @@
* @(#)fts.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _FTS_H_
-#define _FTS_H_
+#ifndef _FTS_H
+#define _FTS_H 1
#include <sys/cdefs.h>
#include <sys/types.h>
@@ -123,4 +123,4 @@ FTSENT *fts_read __P((FTS *));
int fts_set __P((FTS *, FTSENT *, int));
__END_DECLS
-#endif /* !_FTS_H_ */
+#endif /* fts.h */
diff --git a/io/ftw.h b/io/ftw.h
index d283e6937e..d788b39d16 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -21,12 +21,12 @@
*/
#ifndef _FTW_H
-
#define _FTW_H 1
+
#include <features.h>
#include <sys/types.h>
-#include <statbuf.h>
+#include <bits/stat.h>
__BEGIN_DECLS
diff --git a/io/sys/poll.h b/io/sys/poll.h
index f9880a140c..e694fe37d5 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_POLL_H
-
#define _SYS_POLL_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -64,4 +64,4 @@ extern int poll __P ((struct pollfd *__fds, unsigned long int __nfds,
__END_DECLS
-#endif /* _SYS_POLL_H */
+#endif /* sys/poll.h */
diff --git a/io/sys/stat.h b/io/sys/stat.h
index f51c56aabd..5485976ca6 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -21,15 +21,15 @@
*/
#ifndef _SYS_STAT_H
-
#define _SYS_STAT_H 1
+
#include <features.h>
-#include <gnu/types.h> /* For __mode_t and __dev_t. */
+#include <bits/types.h> /* For __mode_t and __dev_t. */
__BEGIN_DECLS
-#include <statbuf.h>
+#include <bits/stat.h>
#if defined(__USE_BSD) || defined(__USE_MISC)
#define S_IFMT __S_IFMT
@@ -173,19 +173,20 @@ extern int mknod __P ((__const char *__path,
/* Create a new FIFO named PATH, with permission bits MODE. */
extern int mkfifo __P ((__const char *__path, __mode_t __mode));
-/* To allow the `struct stat' structure and the file type `mode_t' bits to
- vary without changing shared library major version number, the `stat'
- family of functions and `mknod' are in fact inline wrappers around calls
- to `xstat', `fxstat', `lxstat', and `xmknod', which all take a leading
- version-number argument designating the data structure and bits used.
- <statbuf.h> defines _STAT_VER with the version number corresponding to
- `struct stat' as defined in that file; and _MKNOD_VER with the version
- number corresponding to the S_IF* macros defined therein. It is
- arranged that when not inlined these function are always statically
- linked; that way a dynamically-linked executable always encodes the
- version number corresponding to the data structures it uses, so the `x'
- functions in the shared library can adapt without needing to recompile
- all callers. */
+/* To allow the `struct stat' structure and the file type `mode_t'
+ bits to vary without changing shared library major version number,
+ the `stat' family of functions and `mknod' are in fact inline
+ wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod',
+ which all take a leading version-number argument designating the
+ data structure and bits used. <bits/stat.h> defines _STAT_VER with
+ the version number corresponding to `struct stat' as defined in
+ that file; and _MKNOD_VER with the version number corresponding to
+ the S_IF* macros defined therein. It is arranged that when not
+ inlined these function are always statically linked; that way a
+ dynamically-linked executable always encodes the version number
+ corresponding to the data structures it uses, so the `x' functions
+ in the shared library can adapt without needing to recompile all
+ callers. */
#ifndef _STAT_VER
#define _STAT_VER 0
diff --git a/io/sys/statfs.h b/io/sys/statfs.h
index 4871e50723..49c154d216 100644
--- a/io/sys/statfs.h
+++ b/io/sys/statfs.h
@@ -18,12 +18,12 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_STATFS_H
-
#define _SYS_STATFS_H 1
+
#include <features.h>
/* Get the system-specific definition of `struct statfs'. */
-#include <statfsbuf.h>
+#include <bits/statfs.h>
__BEGIN_DECLS
diff --git a/io/utime.h b/io/utime.h
index 7ab772b042..7cb4724f93 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -21,13 +21,13 @@
*/
#ifndef _UTIME_H
-
#define _UTIME_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
/* Structure describing file times. */
struct utimbuf
diff --git a/libc.map b/libc.map
index c5100b829a..3254be9343 100644
--- a/libc.map
+++ b/libc.map
@@ -6,7 +6,11 @@ GLIBC_2.0 {
_IO_stderr_; _IO_stdin_; _IO_stdout_;
_nl_msg_cat_cntr; __environ; _environ; _res;
___brk_addr; __curbrk; _nl_current_LC_CTYPE; _libc_intl_domainname;
- _sys_errlist; _sys_siglist; __progname;
+ _sys_errlist; _sys_siglist; __progname; _nl_default_dirname;
+ __timezone; __daylight;
+ _nl_current_LC_COLLATE; __collate_element_hash;
+ __collate_element_strings; __collate_symbol_classes;
+ __collate_symbol_hash; __collate_symbol_strings;
# helper functions
__errno_location; __libc_init_first; __h_errno_location;
@@ -28,7 +32,9 @@ GLIBC_2.0 {
__libc_valloc;
# functions with required interface outside normal name space
- _exit; __ivaliduser;
+ _exit; __ivaliduser; __open_catalog;
+ __argz_count; __argz_stringify; __argz_next;
+ __check_rhosts_file; __rcmd_errstr;
# functions from the experimental locale implementation
__*_l; __newlocale; __duplocale; __freelocale;
@@ -42,16 +48,18 @@ GLIBC_2.0 {
_obstack_free; _obstack_memory_used; _obstack_newchunk;
__assert_fail; __assert_perror_fail;
_IO_getc; _IO_peekc_unlocked; _IO_putc; _IO_feof; _IO_ferror;
+ __xstat; __fxstat; __lxstat; __xmknod; __dcgettext;
+ __uflow; __underflow; __overflow; __iswctype; __sigpause;
# functions used in other libraries
- __printf_fp; __stpncpy; _dcgettext;
+ __printf_fp; __stpncpy;
_nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent;
__nss_database_lookup; __internal_endnetgrent; __internal_getnetgrent_r;
__internal_setnetgrent; __gmtime_r; __secure_getenv;
__select; __sched_get_priority_max; __sched_get_priority_min;
__sched_getparam; __sched_getscheduler; __sched_setscheduler;
__sched_yield; __on_exit; __gettimeofday; __fork; __clone;
- __nss_configure_lookup; _dl_open; _IO_file_setbuf;
+ __nss_configure_lookup; _dl_open; _dl_close; _IO_file_setbuf;
_IO_file_init; _IO_file_attach; _IO_do_write; _IO_seekoff;
_IO_link_in; _IO_file_open; _IO_file_doallocate; _IO_file_fopen;
_IO_file_overflow; _IO_file_underflow; _IO_file_sync; _IO_file_seekoff;
diff --git a/libio/_G_config.h b/libio/_G_config.h
index 64738886b8..84a552b41e 100644
--- a/libio/_G_config.h
+++ b/libio/_G_config.h
@@ -6,7 +6,7 @@
/* Define types for libio in terms of the standard internal type names. */
-#include <gnu/types.h>
+#include <bits/types.h>
#define __need_size_t
#define __need_wint_t
#include <stddef.h>
@@ -45,7 +45,7 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
#define _G_HAVE_MMAP 1
#define _G_HAVE_LONG_DOUBLE_IO 1
-/* This is defined by <statbuf.h> if `st_blksize' exists. */
+/* This is defined by <bits/stat.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
#define _G_BUFSIZ 8192
diff --git a/libio/libio.h b/libio/libio.h
index 20eb5a9e1a..88bd0ae576 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -153,7 +153,7 @@ struct _IO_jump_t; struct _IO_FILE;
/* Handle lock. */
#ifdef _IO_MTSAFE_IO
-#include <stdio-lock.h>
+#include <bits/stdio-lock.h>
#else
typedef void _IO_lock_t;
#endif
diff --git a/libio/libioP.h b/libio/libioP.h
index 8fe11084df..c93f0b9aad 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -26,7 +26,7 @@ the executable file might be covered by the GNU General Public License. */
#ifndef errno
extern int errno;
#endif
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include "iolibio.h"
diff --git a/libio/stdio.h b/libio/stdio.h
index 8ab11e6a91..a85062d5c2 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -32,7 +32,7 @@ __BEGIN_DECLS
#define __need_NULL
#include <stddef.h>
-#include <gnu/types.h>
+#include <bits/types.h>
#endif /* Don't need FILE. */
#undef __need_FILE
@@ -110,7 +110,7 @@ extern void __libc_fatal __P ((__const char *__message))
L_cuserid How long an array to pass to `cuserid'.
FOPEN_MAX Minimum number of files that can be open at once.
FILENAME_MAX Maximum length of a filename. */
-#include <stdio_lim.h>
+#include <bits/stdio_lim.h>
/* Standard streams. */
diff --git a/locale/duplocale.c b/locale/duplocale.c
index 7b188efc6d..b3aa4af68c 100644
--- a/locale/duplocale.c
+++ b/locale/duplocale.c
@@ -19,7 +19,7 @@
Boston, MA 02111-1307, USA. */
#include <locale.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include <localeinfo.h>
diff --git a/locale/freelocale.c b/locale/freelocale.c
index 26860aa15a..a09a744ebf 100644
--- a/locale/freelocale.c
+++ b/locale/freelocale.c
@@ -20,7 +20,7 @@
#include <locale.h>
#include <stdlib.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include "localeinfo.h"
diff --git a/locale/lc-time.c b/locale/lc-time.c
index 7bed6aea13..5090e6d905 100644
--- a/locale/lc-time.c
+++ b/locale/lc-time.c
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
diff --git a/locale/locale.h b/locale/locale.h
index c16d83bb7b..18771d7da8 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -21,8 +21,8 @@
*/
#ifndef _LOCALE_H
-
#define _LOCALE_H 1
+
#include <features.h>
#define __need_NULL
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 52ae56a819..cf2789c9d9 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -1,4 +1,4 @@
-/* Implementation of the locale program according to POSIX 1003.2.
+/* Implementation of the locale program according to POSIX 9945-2.
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 3e63b25ac2..0964b8387c 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -19,7 +19,7 @@
#include <alloca.h>
#include <argz.h>
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <locale.h>
#include <stdlib.h>
#include <string.h>
diff --git a/login/Makefile b/login/Makefile
index e4f9a9e9be..6ee21d2285 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -22,7 +22,7 @@
subdir := login
-headers := utmp.h utmpbits.h lastlog.h pty.h
+headers := utmp.h bits/utmp.h lastlog.h pty.h
routines := getutent getutent_r getutid getutline getutid_r getutline_r \
utmp_file utmp_daemon utmpname updwtmp
diff --git a/login/getutent_r.c b/login/getutent_r.c
index 9e1d4e8768..340e4747bd 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -19,7 +19,7 @@
Boston, MA 02111-1307, USA. */
#include <assert.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@ -52,7 +52,7 @@ struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions;
/* We need to protect the opening of the file. */
__libc_lock_define_initialized (, __libc_utmp_lock)
-
+
void
__setutent (void)
{
@@ -90,7 +90,7 @@ setutent_unknown (int reset)
(*__libc_utmp_file_functions.setutent) (reset);
__libc_utmp_jump_table = &__libc_utmp_file_functions;
}
-
+
return 0;
}
diff --git a/login/getutid_r.c b/login/getutid_r.c
index 52b83cd862..ee3a39a3bd 100644
--- a/login/getutid_r.c
+++ b/login/getutid_r.c
@@ -19,7 +19,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <string.h>
#include <unistd.h>
#include <utmp.h>
diff --git a/login/getutline_r.c b/login/getutline_r.c
index 2285248ece..9b4180fe4a 100644
--- a/login/getutline_r.c
+++ b/login/getutline_r.c
@@ -19,7 +19,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <string.h>
#include <unistd.h>
#include <utmp.h>
diff --git a/login/lastlog.h b/login/lastlog.h
index f2443eb702..8cc4254364 100644
--- a/login/lastlog.h
+++ b/login/lastlog.h
@@ -1,4 +1,4 @@
/* This header file is used in 4.3BSD to define `struct lastlog',
- which we define in <utmpbits.h>. */
+ which we define in <bits/utmp.h>. */
#include <utmp.h>
diff --git a/login/logout.c b/login/logout.c
index 5ab5e618fb..8a406c01ca 100644
--- a/login/logout.c
+++ b/login/logout.c
@@ -59,7 +59,7 @@ logout (const char *line)
ut->ut_type = DEAD_PROCESS;
#endif
- if (pututline (ut) >= 0)
+ if (pututline (ut) != NULL)
result = 1;
}
diff --git a/login/pty.h b/login/pty.h
index 731ab12d82..0005f10e2d 100644
--- a/login/pty.h
+++ b/login/pty.h
@@ -18,11 +18,11 @@
Boston, MA 02111-1307, USA. */
#ifndef _PTY_H
-
#define _PTY_H 1
+
#include <features.h>
-#include <ioctl-types.h>
+#include <bits/ioctl-types.h>
#include <termios.h>
diff --git a/login/utmp-private.h b/login/utmp-private.h
index c5e7742a4d..87860d5d33 100644
--- a/login/utmp-private.h
+++ b/login/utmp-private.h
@@ -49,6 +49,3 @@ extern struct utfuncs *__libc_utmp_jump_table;
extern const char *__libc_utmp_file_name;
#endif /* utmp-private.h */
-
-
-
diff --git a/login/utmp.h b/login/utmp.h
index 799b1a17ac..82f3fcce9a 100644
--- a/login/utmp.h
+++ b/login/utmp.h
@@ -16,10 +16,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef _UTMP_H
+#define _UTMP_H 1
-#ifndef _UTMP_H_
-
-#define _UTMP_H_ 1
#include <features.h>
#include <sys/types.h>
@@ -28,7 +27,7 @@
__BEGIN_DECLS
/* Get system dependent values and data structures. */
-#include <utmpbits.h>
+#include <bits/utmp.h>
/* Compatibility names for the strings of the canonical file names. */
#define UTMP_FILE _PATH_UTMP
diff --git a/login/utmpname.c b/login/utmpname.c
index 2692b71ff9..c0b6df2ce7 100644
--- a/login/utmpname.c
+++ b/login/utmpname.c
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include <string.h>
#include <utmp.h>
diff --git a/mach/msg-destroy.c b/mach/msg-destroy.c
index 585b9e2a54..1e618df0bf 100644
--- a/mach/msg-destroy.c
+++ b/mach/msg-destroy.c
@@ -1,31 +1,34 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
/*
* HISTORY
* $Log$
+ * Revision 1.5 1997/06/21 01:40:07 drepper
+ * More 64bit changes.
+ *
* Revision 1.4 1996/11/15 19:44:43 thomas
* Tue Nov 12 16:58:41 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
*
@@ -45,14 +48,14 @@
*
* Revision 2.4 91/05/14 17:53:15 mrt
* Correcting copyright
- *
+ *
* Revision 2.3 91/02/14 14:17:43 mrt
* Added new Mach copyright
* [91/02/13 12:44:15 mrt]
- *
+ *
* Revision 2.2 90/08/06 17:24:22 rpd
* Created.
- *
+ *
*/
#if 1
@@ -118,7 +121,8 @@ __mach_msg_destroy(msg)
}
/* calculate length of data in bytes, rounding up */
- length = ((((number * size) + 7) >> 3) + 3) &~ 3;
+ length = (((((number * size) + 7) >> 3) + sizeof (int) - 1)
+ &~ (sizeof (int) - 1));
addr = is_inline ? saddr : * (vm_offset_t *) saddr;
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 53b9d1b206..a72102e607 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -199,4 +199,4 @@ extern void __malloc_check_init __MALLOC_P ((void));
}; /* end of extern "C" */
#endif
-#endif /* !defined(_MALLOC_H) */
+#endif /* malloc.h */
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 35380a09a1..3f0cbb9726 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -25,7 +25,7 @@
#define _MALLOC_INTERNAL
#include <malloc.h>
#include <mcheck.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#endif
#include <stdio.h>
diff --git a/malloc/obstack.h b/malloc/obstack.h
index b60828b6ae..ad6b830fcb 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -104,8 +104,8 @@ Summary:
/* Don't do the contents of this file more than once. */
-#ifndef __OBSTACK_H__
-#define __OBSTACK_H__
+#ifndef _OBSTACK_H
+#define _OBSTACK_H 1
#ifdef __cplusplus
extern "C" {
@@ -587,4 +587,4 @@ __extension__ \
} /* C++ */
#endif
-#endif /* not __OBSTACK_H__ */
+#endif /* obstack.h */
diff --git a/malloc/thread-m.h b/malloc/thread-m.h
index 8307f256ff..9afd058ccb 100644
--- a/malloc/thread-m.h
+++ b/malloc/thread-m.h
@@ -28,7 +28,7 @@
#if defined(_LIBC) /* The GNU C library, a special case of Posix threads */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#ifdef PTHREAD_MUTEX_INITIALIZER
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index 2951f66fcc..7d81247cdb 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -14,15 +14,12 @@
@c place of the node name, when no section title is explicitly given.
@set xref-automatic-section-title
@c @smallbook
-@iftex
-@afourpaper
-@end iftex
@comment %**end of header (This is for running Texinfo on a region.)
@c sold 0.06/1.09, print run out 21may96
@set EDITION 0.07 DRAFT
@set VERSION 2.00 Beta
-@set UPDATED 4 Oct 1996
+@set UPDATED 20 Jun 1997
@set ISBN 1-882114-53-1
@ifinfo
@@ -31,7 +28,7 @@ This file documents the GNU C library.
This is Edition @value{EDITION}, last updated @value{UPDATED},
of @cite{The GNU C Library Reference Manual}, for Version @value{VERSION}.
-Copyright (C) 1993, '94, '95, '96 Free Software Foundation, Inc.
+Copyright (C) 1993, '94, '95, '96, '97 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -77,7 +74,7 @@ Foundation.
@center for version @value{VERSION}
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1993, '94, '95, '96 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, '94, '95, '96, '97 Free Software Foundation, Inc.
@sp 2
Published by the Free Software Foundation @*
59 Temple Place -- Suite 330, @*
diff --git a/math/Makefile b/math/Makefile
index bd4506b99e..4f2537d680 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -21,15 +21,17 @@
subdir := math
# Installed header files.
-headers := math.h mathcalls.h __math.h huge_val.h nan.h \
- fpu_control.h complex.h cmathcalls.h fenv.h \
- fenvbits.h mathbits.h
+headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
+ bits/nan.h fpu_control.h complex.h bits/cmathcalls.h \
+ fenv.h bits/fenv.h bits/mathdef.h
# Internal header files.
distribute := math_private.h machine/asm.h machine/endian.h
# FPU support code.
-aux := fpu_control setfpucw
+aux := fpu_control setfpucw s_matherr
+
+static-only-routines := s_matherr
# Build the -lm library.
@@ -38,7 +40,7 @@ extra-libs-others = $(extra-libs)
libm-map := libm.map
-libm-support = k_standard s_lib_version s_matherr s_signgam \
+libm-support = k_standard s_lib_version s_signgam \
s_lrint s_llrint s_lround s_llround \
fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg \
ftestexcept fegetround fesetround fegetenv feholdexcpt \
diff --git a/math/cmathcalls.h b/math/bits/cmathcalls.h
index 1f74f56e0b..d94e764930 100644
--- a/math/cmathcalls.h
+++ b/math/bits/cmathcalls.h
@@ -42,7 +42,7 @@
both a `NAME' and a `NAMEf' that takes `float' arguments. */
#ifndef _COMPLEX_H
- #error "Never include cmathcalls.h directly; include <complex.h> instead."
+#error "Never use <bits/cmathcalls.h> directly; include <complex.h> instead."
#endif
#define _Mdouble_complex_ _Mdouble_ complex
diff --git a/math/mathcalls.h b/math/bits/mathcalls.h
index 735b5953a7..e0bf1008d3 100644
--- a/math/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -41,7 +41,7 @@
both a `NAME' and a `NAMEf' that takes `float' arguments. */
#ifndef _MATH_H
- #error "Never include mathcalls.h directly; include <math.h> instead."
+ #error "Never include <bits/mathcalls.h> directly; include <math.h> instead."
#endif
diff --git a/math/complex.h b/math/complex.h
index 938823b5fb..fe4c4ce545 100644
--- a/math/complex.h
+++ b/math/complex.h
@@ -21,8 +21,8 @@
*/
#ifndef _COMPLEX_H
-
#define _COMPLEX_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -52,9 +52,9 @@ __BEGIN_DECLS
#define CX_LIMITED_RANGE_DEFAULT
-/* The file <cmathcalls.h> contains the prototypes for all the actual
- math functions. These macros are used for those prototypes, so
- we can easily declare each function as both `name' and `__name',
+/* The file <bits/cmathcalls.h> contains the prototypes for all the
+ actual math functions. These macros are used for those prototypes,
+ so we can easily declare each function as both `name' and `__name',
and can declare the float versions `namef' and `__namef'. */
#define __MATHCALL(function, args) \
@@ -67,7 +67,7 @@ __BEGIN_DECLS
#define _Mdouble_ double
#define __MATH_PRECNAME(name) name
-#include <cmathcalls.h>
+#include <bits/cmathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -81,7 +81,7 @@ __BEGIN_DECLS
#else
#define __MATH_PRECNAME(name) name/**/f
#endif
-#include <cmathcalls.h>
+#include <bits/cmathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -96,7 +96,7 @@ __BEGIN_DECLS
#else
#define __MATH_PRECNAME(name) name/**/l
#endif
-#include <cmathcalls.h>
+#include <bits/cmathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
#undef __MATHDECL_1
diff --git a/math/fenv.h b/math/fenv.h
index e4dff29a2e..aa524b7a16 100644
--- a/math/fenv.h
+++ b/math/fenv.h
@@ -21,8 +21,8 @@
*/
#ifndef _FENV_H
-
#define _FENV_H 1
+
#include <features.h>
/* Get the architecture dependend definitions. The following definitions
@@ -55,7 +55,7 @@
FE_DOWNWARD round toward -Inf
FE_TOWARDZERO round toward 0
*/
-#include <fenvbits.h>
+#include <bits/fenv.h>
__BEGIN_DECLS
diff --git a/math/libm-test.c b/math/libm-test.c
index 5bf968f844..2b149f739a 100644
--- a/math/libm-test.c
+++ b/math/libm-test.c
@@ -56,7 +56,7 @@
ccos, ccosh, cexp, clog, cpow, csin, csinh, csqrt, ctanh.
At the moment the following functions aren't tested:
- cabs, carg, conj, cproj, cimag, creal, drem,
+ cabs, carg, conj, cproj, cimag, creal, ctan, drem,
j0, j1, jn, y0, y1, yn,
significand,
nan, comparison macros (isless,isgreater,...).
@@ -814,6 +814,14 @@ check_isinfn_exc (const char *test_name, MATHTYPE computed,
}
+/* This is to prevent messages from the SVID libm emulation. */
+int
+matherr (struct exception *x __attribute__ ((unused)))
+{
+ return 1;
+}
+
+
/****************************************************************************
Test for single functions of libm
****************************************************************************/
@@ -1298,10 +1306,15 @@ signbit_test (void)
}
-
+/*
+ gamma has different semantics depending on _LIB_VERSION:
+ if _LIB_VERSION is _SVID, gamma is just an alias for lgamma,
+ otherwise gamma is the real gamma function as definied in ISO C 9X.
+*/
static void
gamma_test (void)
{
+ int save_lib_version = _LIB_VERSION;
errno = 0;
FUNC(gamma) (0);
if (errno == ENOSYS)
@@ -1309,6 +1322,40 @@ gamma_test (void)
return;
feclearexcept (FE_ALL_EXCEPT);
+
+ _LIB_VERSION = _SVID_;
+
+ check_isinfp ("gamma (+inf) == +inf", FUNC(gamma) (plus_infty));
+ check_isinfp_exc ("gamma (0) == +inf plus divide by zero exception",
+ FUNC(gamma) (0), DIVIDE_BY_ZERO_EXCEPTION);
+
+ check_isinfp_exc ("gamma (x) == +inf plus divide by zero exception for integer x <= 0",
+ FUNC(gamma) (-3), DIVIDE_BY_ZERO_EXCEPTION);
+ check_isnan_exc ("gamma (-inf) == NaN plus invalid exception",
+ FUNC(gamma) (minus_infty), INVALID_EXCEPTION);
+
+ signgam = 0;
+ check ("gamma (1) == 0", FUNC(gamma) (1), 0);
+ check_int ("gamma (0) sets signgam to 1", signgam, 1);
+
+ signgam = 0;
+ check ("gamma (3) == M_LN2", FUNC(gamma) (3), M_LN2);
+ check_int ("gamma (3) sets signgam to 1", signgam, 1);
+
+ signgam = 0;
+ check_eps ("gamma (0.5) == log(sqrt(pi))", FUNC(gamma) (0.5),
+ FUNC(log) (FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 1e-7));
+ check_int ("gamma (0.5) sets signgam to 1", signgam, 1);
+
+ signgam = 0;
+ check_eps ("gamma (-0.5) == log(2*sqrt(pi))", FUNC(gamma) (-0.5),
+ FUNC(log) (2*FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 0));
+
+ check_int ("gamma (-0.5) sets signgam to -1", signgam, -1);
+
+
+ _LIB_VERSION = _IEEE_;
+
check_isinfp ("gamma (+inf) == +inf", FUNC(gamma) (plus_infty));
check_isnan_exc ("gamma (0) == NaN plus invalid exception",
FUNC(gamma) (0), INVALID_EXCEPTION);
@@ -1326,6 +1373,7 @@ gamma_test (void)
check ("gamma (1) == 1", FUNC(gamma) (1), 1);
check ("gamma (4) == 6", FUNC(gamma) (4), 6);
+ _LIB_VERSION = save_lib_version;
}
@@ -1348,16 +1396,20 @@ lgamma_test (void)
check_isnan_exc ("lgamma (-inf) == NaN plus invalid exception",
FUNC(lgamma) (minus_infty), INVALID_EXCEPTION);
+ signgam = 0;
check ("lgamma (1) == 0", FUNC(lgamma) (1), 0);
check_int ("lgamma (0) sets signgam to 1", signgam, 1);
+ signgam = 0;
check ("lgamma (3) == M_LN2", FUNC(lgamma) (3), M_LN2);
check_int ("lgamma (3) sets signgam to 1", signgam, 1);
+ signgam = 0;
check_eps ("lgamma (0.5) == log(sqrt(pi))", FUNC(lgamma) (0.5),
FUNC(log) (FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 1e-7));
check_int ("lgamma (0.5) sets signgam to 1", signgam, 1);
+ signgam = 0;
check_eps ("lgamma (-0.5) == log(2*sqrt(pi))", FUNC(lgamma) (-0.5),
FUNC(log) (2*FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 0));
@@ -4725,7 +4777,7 @@ basic_tests (void)
check_bool ("NaN != NaN", NaN_var != NaN_var);
/*
- the same tests but this time with NAN from <nan.h>
+ the same tests but this time with NAN from <bits/nan.h>
NAN is a double const
*/
check_bool ("isnan (NAN)", isnan (NAN));
diff --git a/math/libm.map b/math/libm.map
index b7c9b363d9..aff0ccd73f 100644
--- a/math/libm.map
+++ b/math/libm.map
@@ -1,16 +1,111 @@
GLIBC_2.0 {
global:
- # all functions and variables in the normal name space
- a*; b*; c*; d*; e*; f*; g*; h*; i*; j*; k*; l*; m*;
- n*; o*; p*; q*; r*; s*; t*; u*; v*; w*; x*; y*; z*;
+ # mathematical functions
+ acos; acosf; acosl;
+ acosh; acoshf; acoshl;
+ asin; asinf; asinl;
+ asinh; asinhf; asinhl;
+ atan2; atan2f; atan2l;
+ atan; atanf; atanl;
+ atanh; atanhf; atanhl;
+ cbrt; cbrtf; cbrtl;
+ ceil; ceilf; ceill;
+ copysign; copysignf; copysignl;
+ cos; cosf; cosl;
+ coshf; cosh; coshl;
+ drem; dremf; dreml;
+ erf; erff; erfl;
+ erfc; erfcf; erfcl;
+ exp2; exp2f; exp2l;
+ exp; expf; expl;
+ expm1; expm1f; expm1l;
+ fabs; fabsf; fabsl;
+ fdim; fdimf; fdiml;
+ finite; finitef; finitel;
+ floor; floorf; floorl;
+ fmax; fmaxf; fmaxl;
+ fmin; fminf; fminl;
+ fmod; fmodf; fmodl;
+ frexp; frexpf; frexpl;
+ gamma; gammaf; gammal;
+ gamma_r; gammaf_r; gammal_r;
+ hypot; hypotf; hypotl;
+ ilogb; ilogbf; ilogbl;
+ j0; j0f; j0l;
+ j1; j1f; j1l;
+ jn; jnf; jnl;
+ ldexp; ldexpf; ldexpl;
+ lgamma; lgammaf; lgammal;
+ lgamma_r; lgammaf_r; lgammal_r;
+ log10; log10f; log10l;
+ log1p; log1pf; log1pl;
+ log2; log2f; log2l;
+ log; logf; logl;
+ logb; logbf; logbl;
+ matherr;
+ modf; modff; modfl;
+ nan; nanf; nanl;
+ nearbyint; nearbyintf; nearbyintl;
+ nextafter; nextafterf; nextafterl;
+ pow; powf; powl;
+ remainder; remainderf; remainderl;
+ remquo; remquof; remquol;
+ rint; rintf; rintl;
+ lrint; llrint;
+ round; roundf; roundl;
+ lround; llround;
+ scalb; scalbf; scalbl;
+ scalbn; scalbnf; scalbnl;
+ significand; significandf; significandl;
+ sin; sinf; sinl;
+ sincos; sincosf; sincosl;
+ sinh; sinhf; sinhl;
+ sqrt; sqrtf; sqrtl;
+ tan; tanf; tanl;
+ tanh; tanhf; tanhl;
+ trunc; truncf; truncl;
+ y0; y0f; y0l;
+ y1; y1f; y1l;
+ yn; ynf; ynl;
+
+ # complex functions
+ cabs; cabsf; cabsl;
+ cacos; cacosf; cacosl;
+ cacosh; cacoshf; cacoshl;
+ carg; cargf; cargl;
+ casin; casinf; casinl;
+ casinh; casinhf; casinhl;
+ catan; catanf; catanl;
+ catanh; catanhf; catanhl;
+ ccos; ccosf; ccosl;
+ ccosh; ccoshf; ccoshl;
+ cexp; cexpf; cexpl;
+ cimag; cimagf; cimagl;
+ clog; clogf; clogl;
+ conj; conjf; conjl;
+ cpow; cpowf; cpowl;
+ cproj; cprojf; cprojl;
+ creal; crealf; creall;
+ csin; csinf; csinl;
+ csinh; csinhf; csinhl;
+ csqrt; csqrtf; csqrtl;
+ ctan; ctanf; ctanl;
+ ctanh; ctanhf; ctanhl;
+
+ # fp environment functions
+ feclearexcept; fegetenv; fegetexceptflag;
+ fegetround; feholdexcept; feraiseexcept;
+ fesetenv; fesetexceptflag; fesetround;
+ fetestexcept; feupdateenv;
+
# global variables
- _LIB_VERSION;
+ _LIB_VERSION; signgam;
# functions used in inline functions or macros
__fpclassify; __fpclassifyf; __fpclassifyl;
__signbit; __signbitf; __signbitl;
- __finite; __finitef; __fintitel;
+ __finite; __finitef; __finitel;
__log1p;
diff --git a/math/math.h b/math/math.h
index aa37f71f3c..2007509035 100644
--- a/math/math.h
+++ b/math/math.h
@@ -22,25 +22,25 @@
*/
#ifndef _MATH_H
-
#define _MATH_H 1
+
#include <features.h>
__BEGIN_DECLS
/* Get machine-dependent HUGE_VAL value (returned on overflow).
On all IEEE754 machines, this is +Infinity. */
-#include <huge_val.h>
+#include <bits/huge_val.h>
/* Get machine-dependent NAN value (returned for some domain errors). */
#ifdef __USE_GNU
-#include <nan.h>
+#include <bits/nan.h>
#endif
-/* The file <mathcalls.h> contains the prototypes for all the actual
- math functions. These macros are used for those prototypes, so
- we can easily declare each function as both `name' and `__name',
+/* The file <bits/mathcalls.h> contains the prototypes for all the
+ actual math functions. These macros are used for those prototypes,
+ so we can easily declare each function as both `name' and `__name',
and can declare the float versions `namef' and `__namef'. */
#define __MATHCALL(function,suffix, args) \
@@ -58,7 +58,7 @@ __BEGIN_DECLS
#define _Mdouble_ double
#define __MATH_PRECNAME(name,r) __CONCAT(name,r)
-#include <mathcalls.h>
+#include <bits/mathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -77,7 +77,7 @@ __BEGIN_DECLS
#else
#define __MATH_PRECNAME(name,r) name/**/f/**/r
#endif
-#include <mathcalls.h>
+#include <bits/mathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -94,7 +94,7 @@ __BEGIN_DECLS
#else
#define __MATH_PRECNAME(name,r) name/**/l/**/r
#endif
-#include <mathcalls.h>
+#include <bits/mathcalls.h>
#undef _Mdouble_
#undef __MATH_PRECNAME
@@ -132,7 +132,7 @@ extern int signgam;
INFINITY representation of the infinity value of type `float_t'
*/
-#include <mathbits.h>
+#include <bits/mathdef.h>
/* All floating-point numbers can be put in one of these categories. */
enum
@@ -318,7 +318,7 @@ extern int matherr __P ((struct exception *));
/* Get machine-dependent inline versions (if there are any). */
#if (!defined __NO_MATH_INLINES && defined __OPTIMIZE__) \
|| defined __LIBC_M81_MATH_INLINES
-#include <__math.h>
+#include <bits/mathinline.h>
#endif
diff --git a/math/math_private.h b/math/math_private.h
index a7a4f3d74e..74b729d419 100644
--- a/math/math_private.h
+++ b/math/math_private.h
@@ -269,7 +269,7 @@ extern double __ieee754_y1 __P((double));
extern double __ieee754_jn __P((int,double));
extern double __ieee754_yn __P((int,double));
extern double __ieee754_remainder __P((double,double));
-extern int __ieee754_rem_pio2 __P((double,double*));
+extern int32_t __ieee754_rem_pio2 __P((double,double*));
extern double __ieee754_scalb __P((double,double));
/* fdlibm kernel function */
@@ -277,7 +277,8 @@ extern double __kernel_standard __P((double,double,int));
extern double __kernel_sin __P((double,double,int));
extern double __kernel_cos __P((double,double));
extern double __kernel_tan __P((double,double,int));
-extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*));
+extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,
+ const int32_t*));
/* ieee style elementary float functions */
@@ -306,14 +307,15 @@ extern float __ieee754_y1f __P((float));
extern float __ieee754_jnf __P((int,float));
extern float __ieee754_ynf __P((int,float));
extern float __ieee754_remainderf __P((float,float));
-extern int __ieee754_rem_pio2f __P((float,float*));
+extern int32_t __ieee754_rem_pio2f __P((float,float*));
extern float __ieee754_scalbf __P((float,float));
/* float versions of fdlibm kernel functions */
extern float __kernel_sinf __P((float,float,int));
extern float __kernel_cosf __P((float,float));
extern float __kernel_tanf __P((float,float,int));
-extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*));
+extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,
+ const int32_t*));
/* ieee style elementary long double functions */
diff --git a/mathcalls.h b/mathcalls.h
deleted file mode 100644
index 20e0854402..0000000000
--- a/mathcalls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <math/mathcalls.h>
diff --git a/md5-crypt/md5.h b/md5-crypt/md5.h
index f7babfb5ed..b668a64284 100644
--- a/md5-crypt/md5.h
+++ b/md5-crypt/md5.h
@@ -143,7 +143,7 @@ extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
extern int __md5_stream __P ((FILE *stream, void *resblock));
-extern int md5_stream __P ((FILE *stream, void *resblock));
+#endif /* md5.h */
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
diff --git a/misc/Makefile b/misc/Makefile
index e2db14daa0..4cca2f32c1 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -22,14 +22,14 @@
subdir := misc
-headers := sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \
+headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
- ar.h a.out.h libgen.h stab.h stab.def sgtty.h \
+ ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \
- sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\
+ sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h \
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
- sys/select.h ustat.h sys/ustat.h ustatbits.h sys/sysinfo.h \
- regexp.h selectbits.h
+ sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
+ regexp.h bits/select.h
routines := brk sbrk sstk ioctl \
readv writev \
diff --git a/misc/ar.h b/misc/ar.h
index 5e131f2586..2b54ecb87f 100644
--- a/misc/ar.h
+++ b/misc/ar.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _AR_H
-
#define _AR_H 1
+
#include <sys/cdefs.h>
/* Archive files start with the ARMAG identifying string. Then follows a
diff --git a/misc/stab.def b/misc/bits/stab.def
index dd4fbf0e8b..dd4fbf0e8b 100644
--- a/misc/stab.def
+++ b/misc/bits/stab.def
diff --git a/misc/err.h b/misc/err.h
index 403ef7f701..fa971cabf0 100644
--- a/misc/err.h
+++ b/misc/err.h
@@ -17,8 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _ERR_H_
-#define _ERR_H_ 1
+#ifndef _ERR_H
+#define _ERR_H 1
+
#include <features.h>
#define __need___va_list
diff --git a/misc/error.h b/misc/error.h
index 25784c22ce..0d3bcb7ae3 100644
--- a/misc/error.h
+++ b/misc/error.h
@@ -19,8 +19,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _error_h_
-#define _error_h_
+#ifndef _ERROR_H
+#define _ERROR_H 1
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
@@ -74,4 +74,4 @@ extern int error_one_per_line;
}
#endif
-#endif /* _error_h_ */
+#endif /* error.h */
diff --git a/misc/fstab.h b/misc/fstab.h
index d45ce62d2b..d2e27d9711 100644
--- a/misc/fstab.h
+++ b/misc/fstab.h
@@ -33,9 +33,9 @@
* @(#)fstab.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _FSTAB_H_
+#ifndef _FSTAB_H
+#define _FSTAB_H 1
-#define _FSTAB_H_ 1
#include <features.h>
/*
@@ -79,4 +79,4 @@ extern void endfsent __P ((void));
__END_DECLS
-#endif /* !_FSTAB_H_ */
+#endif /* fstab.h */
diff --git a/misc/libgen.h b/misc/libgen.h
index 4eb4d15ff8..87c9d3f967 100644
--- a/misc/libgen.h
+++ b/misc/libgen.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _LIBGEN_H
-
#define _LIBGEN_H 1
+
#include <sys/cdefs.h>
__BEGIN_DECLS
diff --git a/misc/nlist.h b/misc/nlist.h
index 7e2ebc01e7..53cd468658 100644
--- a/misc/nlist.h
+++ b/misc/nlist.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _NLIST_H
-
#define _NLIST_H 1
+
#include <features.h>
__BEGIN_DECLS
diff --git a/misc/sgtty.h b/misc/sgtty.h
index c232dfc823..86e15b0afc 100644
--- a/misc/sgtty.h
+++ b/misc/sgtty.h
@@ -18,11 +18,12 @@
#ifndef _SGTTY_H
#define _SGTYY_H 1
+
#include <features.h>
#include <sys/ioctl.h>
-/* On some systems this type is not defined by <ioctl-types.h>;
+/* On some systems this type is not defined by <bits/ioctl-types.h>;
in that case, the functions are just stubs that return ENOSYS. */
struct sgttyb;
diff --git a/misc/stab.h b/misc/stab.h
index 80bd594a36..9dc3c32ecb 100644
--- a/misc/stab.h
+++ b/misc/stab.h
@@ -8,7 +8,7 @@
enum __stab_debug_code
{
-#include "stab.def"
+#include <bits/stab.def>
LAST_UNUSED_STAB_CODE
};
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index f9dcce4c8d..602779ebb7 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_CDEFS_H
-
#define _SYS_CDEFS_H 1
+
#include <features.h>
/* Some user header file might have defined this before. */
diff --git a/misc/sys/dir.h b/misc/sys/dir.h
index a6384e6cc6..96b36c78df 100644
--- a/misc/sys/dir.h
+++ b/misc/sys/dir.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_DIR_H
-
#define _SYS_DIR_H 1
+
#include <features.h>
#include <dirent.h>
diff --git a/misc/sys/file.h b/misc/sys/file.h
index 4120882476..9f946fb327 100644
--- a/misc/sys/file.h
+++ b/misc/sys/file.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_FILE_H
-
#define _SYS_FILE_H 1
+
#include <features.h>
#ifndef _FCNTL_H
diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h
index 4e940bd29f..644ac5b02f 100644
--- a/misc/sys/ioctl.h
+++ b/misc/sys/ioctl.h
@@ -17,23 +17,23 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_IOCTL_H
-
#define _SYS_IOCTL_H 1
+
#include <features.h>
__BEGIN_DECLS
/* Get the list of `ioctl' requests and related constants. */
-#include <ioctls.h>
+#include <bits/ioctls.h>
/* Define some types used by `ioctl' requests. */
-#include <ioctl-types.h>
+#include <bits/ioctl-types.h>
-/* On a Unix system, the system <sys/ioctl.h> probably defines some of the
- symbols we define in <sys/ttydefaults.h> (usually with the same values).
- The code to generate <ioctls.h> has omitted these symbols to avoid the
- conflict, but a Unix program expects <sys/ioctl.h> to define them, so we
- must include <sys/ttydefaults.h> here. */
+/* On a Unix system, the system <sys/ioctl.h> probably defines some of
+ the symbols we define in <sys/ttydefaults.h> (usually with the same
+ values). The code to generate <bits/ioctls.h> has omitted these
+ symbols to avoid the conflict, but a Unix program expects <sys/ioctl.h>
+ to define them, so we must include <sys/ttydefaults.h> here. */
#include <sys/ttydefaults.h>
/* Perform the I/O control operation specified by REQUEST on FD.
diff --git a/misc/sys/queue.h b/misc/sys/queue.h
index 65612ce6f3..e675521273 100644
--- a/misc/sys/queue.h
+++ b/misc/sys/queue.h
@@ -33,8 +33,8 @@
* @(#)queue.h 8.3 (Berkeley) 12/13/93
*/
-#ifndef _QUEUE_H_
-#define _QUEUE_H_
+#ifndef _SYS_QUEUE_H
+#define _SYS_QUEUE_H 1
/*
* This file defines three types of data structures: lists, tail queues,
@@ -242,4 +242,4 @@ struct { \
(elm)->field.cqe_prev->field.cqe_next = \
(elm)->field.cqe_next; \
}
-#endif /* !_QUEUE_H_ */
+#endif /* sys/queue.h */
diff --git a/misc/sys/select.h b/misc/sys/select.h
index 2e102dd9fe..a151570bc6 100644
--- a/misc/sys/select.h
+++ b/misc/sys/select.h
@@ -20,15 +20,15 @@
/* POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h> */
#ifndef _SYS_SELECT_H
-
#define _SYS_SELECT_H 1
+
#include <features.h>
/* Get definition of needed basic types. */
-#include <gnu/types.h>
+#include <bits/types.h>
/* Get __FD_* definitions. */
-#include <selectbits.h>
+#include <bits/select.h>
/* Get definition of timer specification structures. */
#define __need_timespec
diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h
index 6da3a3b4c3..48f01e2d74 100644
--- a/misc/sys/syslog.h
+++ b/misc/sys/syslog.h
@@ -33,6 +33,9 @@
* @(#)syslog.h 8.1 (Berkeley) 6/2/93
*/
+#ifndef _SYS_SYSLOG_H
+#define _SYS_SYSLOG_H 1
+
#define _PATH_LOG "/dev/log"
/*
@@ -208,3 +211,5 @@ extern void vsyslog __P ((int __pri, __const char *__fmt, _BSD_VA_LIST_ __ap));
__END_DECLS
#endif /* !KERNEL */
+
+#endif /* sys/syslog.h */
diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index 901f9bbc25..3b11276362 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_UIO_H
-
#define _SYS_UIO_H 1
+
#include <features.h>
#include <sys/types.h>
@@ -26,7 +26,7 @@
__BEGIN_DECLS
/* This file defines `struct iovec'. */
-#include <iovec.h>
+#include <bits/uio.h>
/* Read data from file descriptor FD, and put the result in the
diff --git a/misc/sys/ustat.h b/misc/sys/ustat.h
index 24e0746688..239d70b25d 100644
--- a/misc/sys/ustat.h
+++ b/misc/sys/ustat.h
@@ -17,15 +17,17 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* This interface is obsolete. Use <sys/statfs.h> instead. */
+/*
+ * This interface is obsolete. Use <sys/statfs.h> instead.
+ */
#ifndef _SYS_USTAT_H
-
#define _SYS_USTAT_H 1
+
#include <features.h>
#include <sys/types.h>
-#include <ustatbits.h>
+#include <bits/ustat.h>
__BEGIN_DECLS
@@ -34,4 +36,4 @@ extern int ustat __P ((__dev_t __dev, struct ustat *__ubuf));
__END_DECLS
-#endif /* _SYS_USTAT_H */
+#endif /* sys/ustat.h */
diff --git a/misc/sysexits.h b/misc/sysexits.h
index 464cb11bab..e77efedd56 100644
--- a/misc/sysexits.h
+++ b/misc/sysexits.h
@@ -33,8 +33,8 @@
* @(#)sysexits.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _SYSEXITS_H_
-#define _SYSEXITS_H_
+#ifndef _SYSEXITS_H
+#define _SYSEXITS_H 1
/*
* SYSEXITS.H -- Exit status codes for system programs.
@@ -115,4 +115,4 @@
#define EX__MAX 78 /* maximum listed value */
-#endif /* !_SYSEXITS_H_ */
+#endif /* sysexits.h */
diff --git a/misc/syslog.c b/misc/syslog.c
index 5521ceb9d0..acb1b69e00 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <time.h>
#include <unistd.h>
#include <stdlib.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <signal.h>
#if __STDC__
diff --git a/misc/ttyent.h b/misc/ttyent.h
index a3b4550776..58a1d7a179 100644
--- a/misc/ttyent.h
+++ b/misc/ttyent.h
@@ -33,9 +33,9 @@
* @(#)ttyent.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _TTYENT_H_
+#ifndef _TTYENT_H
+#define _TTYENT_H 1
-#define _TTYENT_H_ 1
#include <features.h>
#define _PATH_TTYS "/etc/ttys"
@@ -66,4 +66,4 @@ extern int endttyent __P ((void));
__END_DECLS
-#endif /* !_TTYENT_H_ */
+#endif /* ttyent.h */
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 68f852d19a..40a190eea7 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -21,7 +21,7 @@
#include <nss.h>
#include <grp.h>
#include <ctype.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <string.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index b47a8b13c1..d0d230bb1e 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -23,7 +23,7 @@
#include <ctype.h>
#include <netdb.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
#include <rpcsvc/nis.h>
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 30c4e407d2..066f707ebb 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -23,7 +23,7 @@
#include <netdb.h>
#include <shadow.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
#include <rpcsvc/nis.h>
diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index 733e1508c5..80c49ff5dd 100644
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <string.h>
#include <aliases.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 32c683415d..149910bfab 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -21,7 +21,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
#include <netinet/if_ether.h>
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index cbe4d35555..9577499670 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 5823c71a80..d26b4f5ccc 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -24,7 +24,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <resolv.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-netgrp.c b/nis/nss_nis/nis-netgrp.c
index aa51c2f0df..ce8762a1e5 100644
--- a/nis/nss_nis/nis-netgrp.c
+++ b/nis/nss_nis/nis-netgrp.c
@@ -20,7 +20,7 @@
#include <nss.h>
#include <ctype.h>
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index 0253ac8453..284e479401 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index 3df99190a2..ceed40e036 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-publickey.c b/nis/nss_nis/nis-publickey.c
index f50f7095fc..52d1783d63 100644
--- a/nis/nss_nis/nis-publickey.c
+++ b/nis/nss_nis/nis-publickey.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <string.h>
#include <syslog.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
@@ -40,7 +40,7 @@ _nss_nis_getpublickey (const char *netname, char *pkey)
enum nss_status retval;
char *domain, *result;
int len;
-
+
pkey[0] = 0;
if (netname == NULL)
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index b273332d03..39c2948b65 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index c20988312a..073284865e 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index ae7667f231..054bc33169 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index cc4cf3a0ba..21221fd7e5 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <string.h>
#include <shadow.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
index b27f1a87ab..1784778ca0 100644
--- a/nis/nss_nisplus/nisplus-alias.c
+++ b/nis/nss_nisplus/nisplus-alias.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <string.h>
#include <aliases.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c
index 2cdc2dfd7a..d83c7b2e11 100644
--- a/nis/nss_nisplus/nisplus-ethers.c
+++ b/nis/nss_nisplus/nisplus-ethers.c
@@ -21,7 +21,7 @@
#include <errno.h>
#include <ctype.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <netdb.h>
#include <netinet/ether.h>
#include <rpcsvc/nis.h>
diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c
index 1c73ca555b..bf851e0cea 100644
--- a/nis/nss_nisplus/nisplus-grp.c
+++ b/nis/nss_nisplus/nisplus-grp.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
@@ -47,10 +47,10 @@ _nss_nisplus_parse_grent (nis_result * result, struct group *gr,
size_t room_left = buflen;
char *line;
int count;
-
+
if (result == NULL)
return 0;
-
+
if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) ||
result->objects.objects_len != 1 ||
result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
@@ -66,7 +66,7 @@ _nss_nisplus_parse_grent (nis_result * result, struct group *gr,
__set_errno (ERANGE);
return 0;
}
-
+
strncpy (first_unused, NISENTRYVAL (0, 0, result),
NISENTRYLEN (0, 0, result));
first_unused[NISENTRYLEN (0, 0, result)] = '\0';
diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c
index 0fdeb8f3f1..ee87a78225 100644
--- a/nis/nss_nisplus/nisplus-hosts.c
+++ b/nis/nss_nisplus/nisplus-hosts.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-netgrp.c b/nis/nss_nisplus/nisplus-netgrp.c
index f2a1b301b9..5907882725 100644
--- a/nis/nss_nisplus/nisplus-netgrp.c
+++ b/nis/nss_nisplus/nisplus-netgrp.c
@@ -23,7 +23,7 @@
#include <netdb.h>
#include <string.h>
#include <netgroup.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
@@ -42,7 +42,7 @@ static unsigned long position = 0;
((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
static enum nss_status
-_nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
+_nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
size_t buflen)
{
enum nss_status status;
@@ -51,14 +51,14 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
if (data == NULL || data_size == 0)
/* User bug. setnetgrent() wasn't called before. */
abort ();
-
+
if (position == data_size)
return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
-
+
if (NISENTRYLEN (position, 1, data) > 0)
{
/* We have a list of other netgroups. */
-
+
result->type = group_val;
if (NISENTRYLEN (position, 1, data) >= buflen)
{
@@ -71,13 +71,13 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
result->val.group = buffer;
++position;
result->first = 0;
-
+
return NSS_STATUS_SUCCESS;
}
- /* Before we can copy the entry to the private buffer we have to make
+ /* Before we can copy the entry to the private buffer we have to make
sure it is big enough. */
- if (NISENTRYLEN (position, 2, data) + NISENTRYLEN (position, 3, data) +
+ if (NISENTRYLEN (position, 2, data) + NISENTRYLEN (position, 3, data) +
NISENTRYLEN (position, 4, data) + 6 > buflen)
{
__set_errno (ERANGE);
@@ -86,9 +86,9 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
else
{
char *cp = buffer;
-
+
result->type = triple_val;
-
+
if (NISENTRYLEN (position, 2, data) == 0)
result->val.triple.host = NULL;
else
@@ -166,9 +166,9 @@ _nss_nisplus_setnetgrent (char *group)
}
else
data_size = data->objects.objects_len;
-
+
__libc_lock_unlock (lock);
-
+
return status;
}
diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c
index 7f849e21e9..8d6e08b2c6 100644
--- a/nis/nss_nisplus/nisplus-network.c
+++ b/nis/nss_nisplus/nisplus-network.c
@@ -23,7 +23,7 @@
#include <ctype.h>
#include <string.h>
#include <arpa/inet.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c
index 1399748846..ee0341d0b9 100644
--- a/nis/nss_nisplus/nisplus-proto.c
+++ b/nis/nss_nisplus/nisplus-proto.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <netdb.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index b65a9fe395..89b0eff7a7 100644
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -21,7 +21,7 @@
#include <errno.h>
#include <pwd.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c
index 435da5792c..180e9169f2 100644
--- a/nis/nss_nisplus/nisplus-rpc.c
+++ b/nis/nss_nisplus/nisplus-rpc.c
@@ -21,7 +21,7 @@
#include <errno.h>
#include <ctype.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpc/netdb.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c
index c95507a468..6cad42d4f6 100644
--- a/nis/nss_nisplus/nisplus-service.c
+++ b/nis/nss_nisplus/nisplus-service.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <netdb.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c
index 568a1c4006..e6ff674f30 100644
--- a/nis/nss_nisplus/nisplus-spwd.c
+++ b/nis/nss_nisplus/nisplus-spwd.c
@@ -21,7 +21,7 @@
#include <errno.h>
#include <shadow.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nislib.h>
@@ -84,7 +84,7 @@ _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp,
sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact =
sp->sp_expire = sp->sp_flag = -1;
- if (NISENTRYVAL (0, 7, result) > 0)
+ if (NISENTRYVAL (0, 7, result) != NULL)
{
char *line, *cp;
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 01bf8bc6b0..cc510b9541 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
diff --git a/nss/Makefile b/nss/Makefile
index 02af5009bc..90e5521d5b 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -24,7 +24,8 @@ subdir := nss
headers := nss.h
distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
getXXent.c getXXent_r.c databases.def \
- nsswitch.conf db-Makefile digits_dots.c
+ nsswitch.conf db-Makefile digits_dots.c \
+ function.def
# This is the trivial part which goes into libc itself.
routines = nsswitch $(addsuffix -lookup,$(databases))
@@ -59,8 +60,11 @@ generated += $(filter-out db-alias.c db-netgrp.c, \
$(addsuffix .c,$(libnss_db-routines)))
distribute += db-XXX.c
+
+ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .so,$(object-suffixes))
libnss_db-inhibit-o = $(filter-out .so,$(object-suffixes))
+endif
include ../Rules
diff --git a/nss/function.def b/nss/function.def
new file mode 100644
index 0000000000..430f4fa5d0
--- /dev/null
+++ b/nss/function.def
@@ -0,0 +1,95 @@
+/* List of all functions defined for the NSS in GNU C Library.
+ Copyright (C) 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* aliases */
+DEFINE_ENT (files, alias)
+DEFINE_GETBY (files, alias, name)
+DEFINE_ENT (db, alias)
+DEFINE_GETBY (db, alias, name)
+
+/* ethers */
+DEFINE_ENT (files, ether)
+DEFINE_ENT (db, ether)
+
+/* group */
+DEFINE_ENT (files, gr)
+DEFINE_GET (files, grgid)
+DEFINE_GET (files, grnam)
+DEFINE_ENT (db, gr)
+DEFINE_GET (db, grgid)
+DEFINE_GET (db, grnam)
+
+/* hosts */
+DEFINE_ENT (files, host)
+DEFINE_GETBY (files, host, addr)
+DEFINE_GETBY (files, host, name)
+DEFINE_GET (files, hostton)
+DEFINE_GET (files, ntohost)
+DEFINE_GETBY (dns, host, addr)
+DEFINE_GETBY (dns, host, name)
+DEFINE_GETBY (dns, host, name2)
+
+/* netgroup */
+DEFINE_ENT (files, netgr)
+DEFINE_ENT (db, netgr)
+
+/* networks */
+DEFINE_ENT (files, net)
+DEFINE_GETBY (files, net, name)
+DEFINE_GETBY (files, net, addr)
+DEFINE_GETBY (dns, net, name)
+DEFINE_GETBY (dns, net, addr)
+
+/* protocols */
+DEFINE_ENT (files, proto)
+DEFINE_GETBY (files, proto, name)
+DEFINE_GETBY (files, proto, number)
+DEFINE_ENT (db, proto)
+DEFINE_GETBY (db, proto, name)
+DEFINE_GETBY (db, proto, number)
+
+/* passwd */
+DEFINE_ENT (files, pw)
+DEFINE_GET (files, pwnam)
+DEFINE_GET (files, pwuid)
+DEFINE_ENT (db, pw)
+DEFINE_GET (db, pwnam)
+DEFINE_GET (db, pwuid)
+
+/* rpc */
+DEFINE_ENT (files, rpc)
+DEFINE_GETBY (files, rpc, name)
+DEFINE_GETBY (files, rpc, number)
+DEFINE_ENT (db, rpc)
+DEFINE_GETBY (db, rpc, name)
+DEFINE_GETBY (db, rpc, number)
+
+/* services */
+DEFINE_ENT (files, serv)
+DEFINE_GETBY (files, serv, name)
+DEFINE_GETBY (files, serv, port)
+DEFINE_ENT (db, serv)
+DEFINE_GETBY (db, serv, name)
+DEFINE_GETBY (db, serv, port)
+
+/* shadow */
+DEFINE_ENT (files, sp)
+DEFINE_GET (files, spnam)
+DEFINE_ENT (db, sp)
+DEFINE_GET (db, spnam)
diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c
index f81df05381..47df15b034 100644
--- a/nss/getXXbyYY.c
+++ b/nss/getXXbyYY.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include "nsswitch.h"
diff --git a/nss/getXXent.c b/nss/getXXent.c
index eeb03dfa37..491ab4d275 100644
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include "nsswitch.h"
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 1df51ab768..f2cca259f0 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include "nsswitch.h"
diff --git a/nss/nss.h b/nss/nss.h
index b36c53d05c..dc50cf7320 100644
--- a/nss/nss.h
+++ b/nss/nss.h
@@ -20,8 +20,8 @@
and for implementors of new services. */
#ifndef _NSS_H
-
#define _NSS_H 1
+
#include <features.h>
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index f4ecb981ab..0c1b1ada37 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -19,7 +19,7 @@
#include <db.h>
#include <fcntl.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include "nsswitch.h"
/* These symbols are defined by the including source file:
diff --git a/nss/nss_db/db-alias.c b/nss/nss_db/db-alias.c
index 51a63a8103..8b8cb41238 100644
--- a/nss/nss_db/db-alias.c
+++ b/nss/nss_db/db-alias.c
@@ -24,7 +24,7 @@
#include <db.h>
#include <errno.h>
#include <fcntl.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <paths.h>
#include <string.h>
diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c
index c27c8de9ca..e716dd00b2 100644
--- a/nss/nss_db/db-netgrp.c
+++ b/nss/nss_db/db-netgrp.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <paths.h>
#include "nsswitch.h"
#include "netgroup.h"
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 7472496a10..3281580b8f 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -21,7 +21,7 @@
#include <ctype.h>
#include <assert.h>
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include "nsswitch.h"
/* These symbols are defined by the including source file:
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 341e9d4d68..99217fa7c5 100644
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -21,7 +21,7 @@
#include <aliases.h>
#include <ctype.h>
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index f36fe9607d..16cf0e8040 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -21,13 +21,16 @@
#include <dlfcn.h>
#include <errno.h>
#include <netdb.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <link.h> /* We need some help from ld.so. */
#include <search.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <gnu/lib-names.h>
+
+#if !defined DO_STATIC_NSS || defined PIC
+# include <gnu/lib-names.h>
+#endif
#include "nsswitch.h"
@@ -64,8 +67,10 @@ static struct
__libc_lock_define_initialized (static, lock)
+#if !defined DO_STATIC_NSS || defined PIC
/* String with revision number of the shared object files. */
static const char *const __nss_shlib_revision = LIBNSS_FILES_SO + 15;
+#endif
/* The root of the whole data base. */
static name_database *service_table;
@@ -240,6 +245,7 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
}
+#if !defined DO_STATIC_NSS || defined PIC
static int
nss_dlerror_run (void (*operate) (void *), void *args)
{
@@ -292,6 +298,7 @@ get_sym (void *a)
args->loadbase = _dl_lookup_symbol (args->name, &args->ref,
scope, args->map->l_name, 0);
}
+#endif
/* Comparison function for searching NI->known tree. */
static int
@@ -363,6 +370,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
}
}
+#if !defined DO_STATIC_NSS || defined PIC
if (ni->library->lib_handle == NULL)
{
/* Load the shared library. */
@@ -407,6 +415,52 @@ nss_lookup_function (service_user *ni, const char *fct_name)
result = (nss_dlerror_run (get_sym, &args) ? NULL
: (void *) (args.loadbase + args.ref->st_value));
}
+#else
+ /* We can't get function address dynamically in static linking. */
+ {
+# define DEFINE_ENT(h,nm) \
+ extern void _nss_##h##_get##nm##ent_r (void); \
+ extern void _nss_##h##_end##nm##ent (void); \
+ extern void _nss_##h##_set##nm##ent (void);
+# define DEFINE_GET(h,nm) \
+ extern void _nss_##h##_get##nm##_r (void);
+# define DEFINE_GETBY(h,nm,ky) \
+ extern void _nss_##h##_get##nm##by##ky##_r (void);
+# include "functions.def"
+# undef DEFINE_ENT
+# undef DEFINE_GET
+# undef DEFINE_GETBY
+# define DEFINE_ENT(h,nm) \
+ { #h"_get"#nm"ent_r", _nss_##h##_get##nm##ent_r }, \
+ { #h"_end"#nm"ent", _nss_##h##_end##nm##ent }, \
+ { #h"_set"#nm"ent", _nss_##h##_set##nm##ent },
+# define DEFINE_GET(h,nm) \
+ { #h"_get"#nm"_r", _nss_##h##_get##nm##_r },
+# define DEFINE_GETBY(h,nm,ky) \
+ { #h"_get"#nm"by"#ky"_r", _nss_##h##_get##nm##by##ky##_r },
+ static struct fct_tbl { const char *fname; void *fp; } *tp, tbl[] =
+ {
+# include "functions.def"
+ { NULL, NULL }
+ };
+ size_t namlen = (5 + strlen (ni->library->name) + 1
+ + strlen (fct_name) + 1);
+ char name[namlen];
+
+ /* Construct the function name. */
+ __stpcpy (__stpcpy (__stpcpy (name, ni->library->name),
+ "_"),
+ fct_name);
+
+ result = NULL;
+ for (tp = &tbl[0]; tp->fname; tp++)
+ if (strcmp (tp->fname, name) == 0)
+ {
+ result = tp->fp;
+ break;
+ }
+ }
+#endif
/* Remember function pointer for later calls. Even if null, we
record it so a second try needn't search the library again. */
diff --git a/po/ko.po b/po/ko.po
index 6ff671cbb0..5e17d9ffd3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,13 +1,13 @@
# GNU libc의 한국어 메시지
-# Copyright (C) 1996 Free Software Foundation, Inc.
-# Bang Jun-Young <bangjy@nownuri.nowcom.co.kr>, 1996.
+# Copyright (C) 1996, 97 Free Software Foundation, Inc.
+# Bang Jun-Young <bangjy@nownuri.net>, 1996-97.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU libc 1.98\n"
-"POT-Creation-Date: 1996-12-03 13:50+0100\n"
-"PO-Revision-Date: 1996-12-15 14:17+0900\n"
-"Last-Translator: Bang Jun-Young <bangjy@nownuri.nowcom.co.kr>\n"
+"Project-Id-Version: GNU libc 2.0.3\n"
+"POT-Creation-Date: 1997-03-30 19:08+0200\n"
+"PO-Revision-Date: 1997-06-05 18:33+0900\n"
+"Last-Translator: Bang Jun-Young <bangjy@nownuri.net>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=EUC-KR\n"
@@ -33,31 +33,31 @@ msgstr " rpcinfo [ -n 포트번호 ] -t 호스트 프로그램번호 [ 버전번호 ]\n"
msgid " program vers proto port\n"
msgstr " 프로그램 버전 원형 포트\n"
-#: time/zic.c:424
+#: time/zic.c:419
#, c-format
msgid " (rule from \"%s\", line %d)"
-msgstr " (\"%s\"에 있는 규칙, %d 행)"
+msgstr " (\"%s\"에 있는 규칙, 행 %d)"
-#: locale/programs/ld-collate.c:360 locale/programs/ld-ctype.c:1234
+#: locale/programs/ld-collate.c:363 locale/programs/ld-ctype.c:1242
msgid " done\n"
msgstr " 완료\n"
-#: time/zic.c:421
+#: time/zic.c:416
#, c-format
msgid "\"%s\", line %d: %s"
msgstr "\"%s\", 행 %d: %s"
-#: time/zic.c:945
+#: time/zic.c:943
#, c-format
msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr "\"지역 %s\" 행과 -l 옵션은 서로 배타적입니다"
+msgstr "\"지역 %s\" 행과 -l 옵션은 상호 배타적입니다"
-#: time/zic.c:953
+#: time/zic.c:951
#, c-format
msgid "\"Zone %s\" line and -p option are mutually exclusive"
-msgstr "\"지역 %s\" 행과 -p 옵션은 서로 배타적입니다"
+msgstr "\"지역 %s\" 행과 -p 옵션은 상호 배타적입니다"
-#: time/zic.c:758
+#: time/zic.c:754
#, c-format
msgid "%s in ruleless zone"
msgstr "규칙없는 지역에 %s가 있음"
@@ -77,7 +77,7 @@ msgstr "%s%s%s:%u: %s%s예기치 못한 오류: %s.\n"
msgid "%s%sUnknown signal %d\n"
msgstr "%s%s알 수 없는 신호 %d\n"
-#: time/zic.c:2139
+#: time/zic.c:2172
#, c-format
msgid "%s: %d did not sign extend correctly\n"
msgstr "%s: %d는 부호 확장이 제대로 되지 않았습니다\n"
@@ -87,137 +87,142 @@ msgstr "%s: %d는 부호 확장이 제대로 되지 않았습니다\n"
msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
msgstr "%s: <mb_cur_max>는 <mb_cur_min>보다 커야 합니다\n"
-#: time/zic.c:1430
+#: time/zic.c:1443
#, c-format
msgid "%s: Can't create %s: %s\n"
msgstr "%s: %s를 만들 수 없습니다: %s\n"
-#: time/zic.c:2118
+#: time/zic.c:2150
#, c-format
msgid "%s: Can't create directory %s: %s\n"
msgstr "%s: %s 디렉토리를 만들 수 없습니다: %s\n"
-#: time/zic.c:612
+#: time/zic.c:608
#, c-format
msgid "%s: Can't link from %s to %s: %s\n"
-msgstr "%s: %s를 %s로 연결할 수 없습니다: %s\n"
+msgstr "%s: %s를 %s로 링크할 수 없습니다: %s\n"
-#: time/zic.c:783
+#: time/zic.c:780
#, c-format
msgid "%s: Can't open %s: %s\n"
msgstr "%s: %s를 열 수 없습니다: %s\n"
-#: time/zic.c:851
+#: time/zic.c:1433
+#, c-format
+msgid "%s: Can't remove %s: %s\n"
+msgstr "%s: %s를 지울 수 없습니다: %s\n"
+
+#: time/zic.c:849
#, c-format
msgid "%s: Error closing %s: %s\n"
msgstr "%s: %s를 닫는 도중 오류 발생: %s\n"
-#: time/zic.c:845
+#: time/zic.c:842
#, c-format
msgid "%s: Error reading %s\n"
msgstr "%s: %s를 읽는 도중 오류 발생\n"
-#: time/zic.c:1494
+#: time/zic.c:1507
#, c-format
msgid "%s: Error writing %s\n"
msgstr "%s: %s를 쓰는 도중 오류 발생\n"
-#: time/zdump.c:258
+#: time/zdump.c:266
#, c-format
msgid "%s: Error writing standard output "
msgstr "%s: 표준 출력에 쓰는 도중 오류 발생 "
-#: time/zic.c:830
+#: time/zic.c:827
#, c-format
msgid "%s: Leap line in non leap seconds file %s\n"
msgstr ""
-#: time/zic.c:362
+#: time/zic.c:357
#, c-format
msgid "%s: Memory exhausted: %s\n"
msgstr "%s: 메모리가 바닥남: %s\n"
-#: time/zic.c:527
+#: time/zic.c:522
#, c-format
msgid "%s: More than one -L option specified\n"
msgstr "%s: 하나 이상의 -L 옵션이 지정되었음\n"
-#: time/zic.c:487
+#: time/zic.c:482
#, c-format
msgid "%s: More than one -d option specified\n"
msgstr "%s: 하나 이상의 -d 옵션이 지정되었음\n"
-#: time/zic.c:497
+#: time/zic.c:492
#, c-format
msgid "%s: More than one -l option specified\n"
msgstr "%s: 하나 이상의 -l 옵션이 지정되었음\n"
-#: time/zic.c:507
+#: time/zic.c:502
#, c-format
msgid "%s: More than one -p option specified\n"
msgstr "%s: 하나 이상의 -p 옵션이 지정되었음\n"
-#: time/zic.c:517
+#: time/zic.c:512
#, c-format
msgid "%s: More than one -y option specified\n"
msgstr "%s: 하나 이상의 -y 옵션이 지정되었음\n"
-#: time/zic.c:1845
+#: time/zic.c:1872
#, c-format
msgid "%s: command was '%s', result was %d\n"
msgstr "%s: 명령은 '%s'였고, 결과는 %d였습니다\n"
-#: locale/programs/charmap.c:593 locale/programs/locfile.c:878
+#: locale/programs/charmap.c:593 locale/programs/locfile.c:900
#, c-format
msgid "%s: error in state machine"
-msgstr "%s: 스테이트 기계에 오류 발생"
+msgstr "%s: 상태 기계에 오류 발생"
-#: posix/getopt.c:687
+#: posix/getopt.c:783
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: 잘못된 옵션 -- %c\n"
-#: posix/getopt.c:690
+#: posix/getopt.c:786
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: 부적절한 옵션 -- %c\n"
-#: posix/getopt.c:611
+#: posix/getopt.c:707
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n"
-#: posix/getopt.c:582
+#: posix/getopt.c:678
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: `%s'는 모호한 옵션입니다\n"
-#: posix/getopt.c:628 posix/getopt.c:801
+#: posix/getopt.c:724 posix/getopt.c:897
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
-#: posix/getopt.c:606
+#: posix/getopt.c:702
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n"
-#: posix/getopt.c:786
+#: posix/getopt.c:881
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
-#: posix/getopt.c:767
+#: posix/getopt.c:863
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: `-W %s'는 모호한 옵션입니다\n"
-#: posix/getopt.c:721 posix/getopt.c:850
+#: posix/getopt.c:816 posix/getopt.c:946
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n"
-#: time/zic.c:837 time/zic.c:1248 time/zic.c:1268
+#: time/zic.c:834 time/zic.c:1246 time/zic.c:1266
#, c-format
msgid "%s: panic: Invalid l_value %d\n"
msgstr "%s: panic: 부적절한 좌항값 %d\n"
@@ -227,17 +232,17 @@ msgstr "%s: panic: 부적절한 좌항값 %d\n"
msgid "%s: premature end of file"
msgstr "%s: 파일이 완결되지 않은 채 끝남"
-#: posix/getopt.c:661
+#: posix/getopt.c:757
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
-#: posix/getopt.c:657
+#: posix/getopt.c:753
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
-#: time/zic.c:446
+#: time/zic.c:441
#, c-format
msgid ""
"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
@@ -246,12 +251,12 @@ msgid ""
msgstr ""
"%s: 사용법은 %s [ -s ] [ -v ] [ -l 지역시각 ] [ -p 포식스규칙 ] [ -d "
"디렉토리 ]\n"
-"\t[ -L 윤초 ] [ -y yearistype ] [ 파일이름 ... ]\n"
+"\t[ -L 윤초 ] [ -y 연도의형태 ] [ 파일이름 ... ] 입니다\n"
-#: time/zdump.c:165
+#: time/zdump.c:174
#, c-format
msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: 사용법은 %s [ -v ] [ -c cutoff ] 지역명 ... 입니다\n"
+msgstr "%s: 사용법은 %s [ -v ] [ -c 절단 ] 지역명 ... 입니다\n"
#: sunrpc/clnt_perr.c:125
#, c-format
@@ -262,7 +267,7 @@ msgstr "(알 수 없는 인증 오류 - %d)"
msgid "(unknown)"
msgstr "(알 수 없음)"
-#: catgets/gencat.c:253
+#: catgets/gencat.c:254
msgid "*standard input*"
msgstr "*표준 입력*"
@@ -270,19 +275,19 @@ msgstr "*표준 입력*"
msgid ".lib section in a.out corrupted"
msgstr "a.out의 .lib 절이 손상되었음"
-#: inet/rcmd.c:358
+#: inet/rcmd.c:363
msgid ".rhosts fstat failed"
msgstr ".rhosts fstat 실패"
-#: inet/rcmd.c:354
+#: inet/rcmd.c:359
msgid ".rhosts lstat failed"
msgstr ".rhosts lstat 실패"
-#: inet/rcmd.c:356
+#: inet/rcmd.c:361
msgid ".rhosts not regular file"
msgstr ".rhosts는 일반 파일이 아님"
-#: inet/rcmd.c:362
+#: inet/rcmd.c:367
msgid ".rhosts writeable by other than owner"
msgstr ".rhosts는 소유자가 아닌 사람이 변경할 수 있음"
@@ -295,12 +300,12 @@ msgstr "; 낮은 버전 = %lu, 높은 버전 = %lu"
msgid "; why = "
msgstr "; 이유 = "
-#: locale/programs/ld-ctype.c:326
+#: locale/programs/ld-ctype.c:331
#, c-format
msgid "<SP> character must not be in class `%s'"
msgstr "<SP> 문자는 `%s' 클래스에 있으면 안됩니다"
-#: locale/programs/ld-ctype.c:317
+#: locale/programs/ld-ctype.c:321
#, c-format
msgid "<SP> character not in class `%s'"
msgstr "<SP> 문자는 `%s' 클래스에 없음"
@@ -312,6 +317,10 @@ msgstr "<SP> 문자는 `%s' 클래스에 없음"
msgid "?"
msgstr "?"
+#: sysdeps/unix/sysv/linux/siglist.h:27
+msgid "Aborted"
+msgstr "중지됨"
+
#: stdio-common/../sysdeps/gnu/errlist.c:762
msgid "Accessing a corrupted shared library"
msgstr "손상된 공유 라이브러리에 접근함"
@@ -331,6 +340,8 @@ msgstr "주소군이 규약에서 지원되지 않음"
msgid "Advertise error"
msgstr ""
+#: stdio-common/../sysdeps/unix/siglist.c:43
+#: sysdeps/unix/sysv/linux/siglist.h:33
msgid "Alarm clock"
msgstr "자명종 시계"
@@ -348,7 +359,7 @@ msgstr ""
#: sunrpc/clnt_perr.c:276
msgid "Authentication OK"
-msgstr "인증 승인됨"
+msgstr "인증 성공"
#. TRANS ???
#: stdio-common/../sysdeps/gnu/errlist.c:549
@@ -376,14 +387,19 @@ msgstr "잘못된 폰트 파일 형식"
msgid "Bad message"
msgstr "잘못된 메시지"
+#: stdio-common/../sysdeps/unix/siglist.c:41
+#: sysdeps/unix/sysv/linux/siglist.h:56
+msgid "Bad system call"
+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:109
msgid "Block device required"
-msgstr "블록 장치가 필요함"
+msgstr "블럭 장치가 필요함"
-#: sunrpc/pmap_rmt.c:337
+#: sunrpc/pmap_rmt.c:338
msgid "Broadcast select problem"
msgstr "브로드캐스트 선택 문제"
@@ -393,12 +409,17 @@ msgstr "브로드캐스트 선택 문제"
#. TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
#. TRANS unless it has handled or blocked @code{SIGPIPE}.
#: stdio-common/../sysdeps/gnu/errlist.c:222
+#: stdio-common/../sysdeps/unix/siglist.c:42
+#: sysdeps/unix/sysv/linux/siglist.h:32
msgid "Broken pipe"
-msgstr "깨어진 파이프"
+msgstr "파이프가 깨어짐"
+#: stdio-common/../sysdeps/unix/siglist.c:39
+#: sysdeps/unix/sysv/linux/siglist.h:30
msgid "Bus error"
msgstr "버스 오류"
+#: sysdeps/unix/sysv/linux/siglist.h:43
msgid "CPU time limit exceeded"
msgstr "CPU 시간 제한 초과함"
@@ -406,19 +427,19 @@ msgstr "CPU 시간 제한 초과함"
msgid "Can not access a needed shared library"
msgstr "필요한 공유 라이브러리에 접근할 수 없습니다"
-#: nis/ypclnt.c:637
+#: nis/ypclnt.c:695
msgid "Can't bind to server which serves this domain"
msgstr "이 도메인을 제공하는 서버에 연결할 수 없습니다"
-#: nis/ypclnt.c:649
+#: nis/ypclnt.c:707
msgid "Can't communicate with portmapper"
msgstr "rpcinfo: 포트매퍼와 통신할 수 없습니다"
-#: nis/ypclnt.c:651
+#: nis/ypclnt.c:709
msgid "Can't communicate with ypbind"
msgstr "ypbind와 통신할 수 없습니다"
-#: nis/ypclnt.c:653
+#: nis/ypclnt.c:711
msgid "Can't communicate with ypserv"
msgstr "ypserv와 통신할 수 없습니다"
@@ -443,7 +464,7 @@ msgstr "브로드캐스트 rpc를 위한 소켓을 만들 수 없습니다"
msgid "Cannot exec a shared library directly"
msgstr "공유 라이브러리를 직접 실행할 수 없습니다"
-#: sunrpc/pmap_rmt.c:349
+#: sunrpc/pmap_rmt.c:350
msgid "Cannot receive reply to broadcast"
msgstr "브로드캐스트에 대한 응답을 받을 수 없습니다"
@@ -468,6 +489,8 @@ msgstr "소켓 옵션 SO_BROADCAST를 설정할 수 없습니다"
msgid "Channel number out of range"
msgstr "범위를 벗어난 채널 번호"
+#: stdio-common/../sysdeps/unix/siglist.c:49
+#: sysdeps/unix/sysv/linux/siglist.h:39
msgid "Child exited"
msgstr "자식이 종료됨"
@@ -484,11 +507,11 @@ msgstr "전송 중 통신 오류"
msgid "Computer bought the farm"
msgstr "컴퓨터가 농장을 샀습니다"
-#: locale/programs/ld-ctype.c:1197
+#: locale/programs/ld-ctype.c:1204
msgid "Computing table size for character classes might take a while..."
msgstr "문자 클래스의 표 크기 계산은 시간이 약간 걸릴 수 있습니다..."
-#: locale/programs/ld-collate.c:327
+#: locale/programs/ld-collate.c:329
msgid "Computing table size for collation information might take a while..."
msgstr "조사 정보의 표 크기 계산은 시간이 약간 걸릴 수 있습니다... "
@@ -511,11 +534,13 @@ msgstr ""
msgid "Connection timed out"
msgstr "연결 시간 초과"
+#: stdio-common/../sysdeps/unix/siglist.c:48
+#: sysdeps/unix/sysv/linux/siglist.h:38
msgid "Continued"
msgstr "계속됨"
#: catgets/gencat.c:169 db/makedb.c:120 locale/programs/locale.c:187
-#: locale/programs/localedef.c:177
+#: locale/programs/localedef.c:180
#, c-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -523,7 +548,12 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: nis/ypclnt.c:663
+#: stdio-common/../sysdeps/unix/siglist.c:53
+#, fuzzy
+msgid "Cputime limit exceeded"
+msgstr "CPU 시간 제한 초과함"
+
+#: nis/ypclnt.c:721
msgid "Database is busy"
msgstr "데이터베이스가 작업 중입니다"
@@ -565,10 +595,15 @@ msgstr "디렉토리가 비어있지 않음"
msgid "Disc quota exceeded"
msgstr "디스크 할당량이 초과됨"
-#: nis/ypclnt.c:709
+#: nis/ypclnt.c:767
msgid "Domain not bound"
msgstr "도메인이 바운드되지 않음"
+#: stdio-common/../sysdeps/unix/siglist.c:36
+#: sysdeps/unix/sysv/linux/siglist.h:53
+msgid "EMT trap"
+msgstr "EMT 트랩"
+
#: sunrpc/clnt_perr.c:254
#, c-format
msgid "Error %d"
@@ -592,7 +627,7 @@ msgstr "교환이 가득참"
msgid "Exec format error"
msgstr "Exec 형식 오류"
-#: locale/programs/localedef.c:213
+#: locale/programs/localedef.c:216
msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
msgstr "중요: 시스템에 `_POSIX2_LOCALEDEF'가 정의되어 있지 않습니다"
@@ -612,7 +647,7 @@ msgstr "파일이 존재합니다"
#: stdio-common/../sysdeps/gnu/errlist.c:714
msgid "File locking deadlock error"
-msgstr ""
+msgstr "파일 잠금 교착상태 오류"
#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
#. TRANS Files}) or host name too long (in @code{gethostname} or
@@ -621,6 +656,7 @@ msgstr ""
msgid "File name too long"
msgstr "파일 이름이 너무 깁니다"
+#: sysdeps/unix/sysv/linux/siglist.h:44
msgid "File size limit exceeded"
msgstr "파일 크기 제한을 초과함"
@@ -629,6 +665,12 @@ msgstr "파일 크기 제한을 초과함"
msgid "File too large"
msgstr "파일이 너무 큽니다"
+#: stdio-common/../sysdeps/unix/siglist.c:54
+msgid "Filesize limit exceeded"
+msgstr "파일크기 제한을 초과함"
+
+#: stdio-common/../sysdeps/unix/siglist.c:37
+#: sysdeps/unix/sysv/linux/siglist.h:28
msgid "Floating point exception"
msgstr "부동 소수점 예외"
@@ -644,6 +686,8 @@ msgstr "함수가 구현되지 않았음"
msgid "Gratuitous error"
msgstr "이유없는 오류"
+#: stdio-common/../sysdeps/unix/siglist.c:30
+#: sysdeps/unix/sysv/linux/siglist.h:22
msgid "Hangup"
msgstr "끊어짐"
@@ -656,9 +700,12 @@ msgstr "호스트가 죽었습니다"
msgid "Host name lookup failure"
msgstr "호스트 이름 탐색 실패"
+#: stdio-common/../sysdeps/unix/siglist.c:52
+#: sysdeps/unix/sysv/linux/siglist.h:42
msgid "I/O possible"
msgstr "입출력 가능"
+#: stdio-common/../sysdeps/unix/siglist.c:35
msgid "IOT trap"
msgstr "IOT 트랩"
@@ -666,9 +713,15 @@ msgstr "IOT 트랩"
msgid "Identifier removed"
msgstr "식별자 제거됨"
+#: sysdeps/unix/sysv/linux/siglist.h:25
msgid "Illegal Instruction"
msgstr "잘못된 명령어"
+#: stdio-common/../sysdeps/unix/siglist.c:33
+#, fuzzy
+msgid "Illegal instruction"
+msgstr "잘못된 명령어"
+
#. TRANS Invalid seek operation (such as on a pipe).
#: stdio-common/../sysdeps/gnu/errlist.c:201
msgid "Illegal seek"
@@ -699,23 +752,29 @@ msgstr "장치에 대해 부적절한 ioctl"
msgid "Inappropriate operation for background process"
msgstr "배경 프로세스로 부적합한 동작"
+#: sysdeps/unix/sysv/linux/siglist.h:62
+msgid "Information request"
+msgstr "정보 요청"
+
#. TRANS Input/output error; usually used for physical read or write errors.
#: stdio-common/../sysdeps/gnu/errlist.c:40
msgid "Input/output error"
msgstr "입력/출력 오류"
-#: nis/ypclnt.c:643
+#: nis/ypclnt.c:701
msgid "Internal NIS error"
msgstr "내부 NIS 오류"
-#: nis/ypclnt.c:707
+#: nis/ypclnt.c:765
msgid "Internal ypbind error"
msgstr "내부 ypbind 오류"
+#: stdio-common/../sysdeps/unix/siglist.c:31
+#: sysdeps/unix/sysv/linux/siglist.h:23
msgid "Interrupt"
msgstr "인터럽트"
-#. TRANS Interrupted function call; an asynchronous signal occured and prevented
+#. 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
@@ -736,11 +795,11 @@ msgstr "중단된 시스템 호출은 재시작되어야 합니다"
msgid "Invalid argument"
msgstr "부적절한 인수"
-#: posix/regex.c:946
+#: posix/regex.c:960
msgid "Invalid back reference"
msgstr "부적절한 후방 참조"
-#: posix/regex.c:944
+#: posix/regex.c:958
msgid "Invalid character class name"
msgstr "부적절한 문자 클래스 이름"
@@ -752,11 +811,11 @@ msgstr "부적절한 클라이언트 자격 부여"
msgid "Invalid client verifier"
msgstr "부적절한 클라이언트 검증기"
-#: posix/regex.c:943
+#: posix/regex.c:957
msgid "Invalid collation character"
msgstr "부적절한 대조 문자"
-#: posix/regex.c:950
+#: posix/regex.c:964
msgid "Invalid content of \\{\\}"
msgstr "\\{\\}에 부적절한 내용물이 있음"
@@ -765,7 +824,7 @@ msgstr "\\{\\}에 부적절한 내용물이 있음"
#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
#: stdio-common/../sysdeps/gnu/errlist.c:129
msgid "Invalid cross-device link"
-msgstr "장치간 연결이 부적절함"
+msgstr "부적절한 장치간 연결"
#: stdio-common/../sysdeps/gnu/errlist.c:690
msgid "Invalid exchange"
@@ -777,15 +836,15 @@ msgstr "부적절한 교환"
msgid "Invalid or incomplete multibyte or wide character"
msgstr "부적절하거나 불완전한 다중바이트 또는 광역 문자"
-#: posix/regex.c:953
+#: posix/regex.c:967
msgid "Invalid preceding regular expression"
msgstr "앞선 정규식이 부적절함"
-#: posix/regex.c:951
+#: posix/regex.c:965
msgid "Invalid range end"
msgstr "부적절한 범위 끝"
-#: posix/regex.c:942
+#: posix/regex.c:956
msgid "Invalid regular expression"
msgstr "부적절한 정규식"
@@ -815,6 +874,8 @@ msgstr "디렉토리입니다"
msgid "Is a named type file"
msgstr ""
+#: stdio-common/../sysdeps/unix/siglist.c:38
+#: sysdeps/unix/sysv/linux/siglist.h:29
msgid "Killed"
msgstr "죽었음"
@@ -836,25 +897,25 @@ msgstr "등급 3 리셋"
#: stdio-common/../sysdeps/gnu/errlist.c:626
msgid "Link has been severed"
-msgstr ""
+msgstr "링크가 손상되었습니다"
#: stdio-common/../sysdeps/gnu/errlist.c:674
msgid "Link number out of range"
msgstr "범위를 벗어난 링크 번호"
-#: nis/ypclnt.c:655
+#: nis/ypclnt.c:713
msgid "Local domain name not set"
msgstr "지역 도메인명이 설정되지 않았음"
-#: nis/ypclnt.c:645
+#: nis/ypclnt.c:703
msgid "Local resource allocation failure"
msgstr "지역 자원 할당 실패"
#: stdio-common/../sysdeps/gnu/errlist.c:722
msgid "Machine is not on the network"
-msgstr "기기가 네트워크 상에 있지 않습니다"
+msgstr "기계가 네트워크 상에 있지 않습니다"
-#: posix/regex.c:952
+#: posix/regex.c:966
msgid "Memory exhausted"
msgstr "메모리가 바닥남"
@@ -868,11 +929,11 @@ msgstr "메시지가 너무 깁니다"
msgid "Multihop attempted"
msgstr ""
-#: nis/ypclnt.c:659
+#: nis/ypclnt.c:717
msgid "NIS client/server version mismatch - can't supply service"
msgstr "NIS 클라이언트/서버 버전 불일치 - 서비스를 제공할 수 없습니다"
-#: nis/ypclnt.c:657
+#: nis/ypclnt.c:715
msgid "NIS map data base is bad"
msgstr "NIS 지도 데이터베이스가 잘못되었습니다"
@@ -943,7 +1004,7 @@ msgstr "사용 가능한 자료가 없음"
msgid "No locks available"
msgstr "사용가능한 잠금장치가 없음"
-#: posix/regex.c:941
+#: posix/regex.c:955
msgid "No match"
msgstr "맞는 짝 없음"
@@ -951,13 +1012,13 @@ msgstr "맞는 짝 없음"
msgid "No message of desired type"
msgstr "적당한 형을 가진 메시지가 없음"
-#: nis/ypclnt.c:647
+#: nis/ypclnt.c:705
msgid "No more records in map database"
msgstr "지도 데이터베이스에 더 이상의 기록이 없음"
-#: posix/regex.c:5204
+#: posix/regex.c:5324
msgid "No previous regular expression"
-msgstr "전의 정규식이 없음"
+msgstr "이전의 정규식이 없음"
#: sunrpc/rpcinfo.c:515
msgid "No remote programs registered.\n"
@@ -981,11 +1042,11 @@ msgstr "장치에 남은 공간이 없음"
msgid "No such file or directory"
msgstr "그런 파일이나 디렉토리가 없음"
-#: nis/ypclnt.c:641
+#: nis/ypclnt.c:699
msgid "No such key in map"
msgstr "지도에 그런 키가 없음"
-#: nis/ypclnt.c:639
+#: nis/ypclnt.c:697
msgid "No such map in server's domain"
msgstr "서버의 도메인에 그런 지도가 없음"
@@ -1023,7 +1084,7 @@ msgstr "범위를 벗어난 수치 결과"
msgid "Object is remote"
msgstr "원격 개체입니다"
-#: time/zic.c:1939
+#: time/zic.c:1966
msgid "Odd number of quotation marks"
msgstr "따옴표가 홀수 개입니다"
@@ -1085,17 +1146,20 @@ msgid "Package not installed"
msgstr "패키지가 설치되지 않음"
#. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/ypclnt.c:661 stdio-common/../sysdeps/gnu/errlist.c:96
+#: nis/ypclnt.c:719 stdio-common/../sysdeps/gnu/errlist.c:96
msgid "Permission denied"
msgstr "허가 거부됨"
+#: sysdeps/unix/sysv/linux/siglist.h:64
msgid "Power failure"
msgstr "전력이 끊어짐"
-#: posix/regex.c:954
+#: posix/regex.c:968
msgid "Premature end of regular expression"
msgstr "정규식이 완결되지 않은 채 끝남"
+#: stdio-common/../sysdeps/unix/siglist.c:56
+#: sysdeps/unix/sysv/linux/siglist.h:46
msgid "Profiling timer expired"
msgstr "프로파일링 타이머의 시간이 초과됨"
@@ -1130,6 +1194,8 @@ msgstr "규약이 지원되지 않음"
msgid "Protocol wrong type for socket"
msgstr "소켓에 대한 규약이 잘못됨"
+#: stdio-common/../sysdeps/unix/siglist.c:32
+#: sysdeps/unix/sysv/linux/siglist.h:24
msgid "Quit"
msgstr "종료"
@@ -1142,9 +1208,9 @@ msgstr "RFS에 국한된 오류"
msgid "RPC bad procedure for program"
msgstr "RPC 프로그램의 프로시져가 잘못됨"
-#: nis/ypclnt.c:635
+#: nis/ypclnt.c:693
msgid "RPC failure on NIS operation"
-msgstr ""
+msgstr "NIS 연산 중 RPC 실패함"
#. TRANS ???
#: stdio-common/../sysdeps/gnu/errlist.c:517
@@ -1176,7 +1242,7 @@ msgstr "RPC: 인증 오류"
#: sunrpc/clnt_perr.c:169
msgid "RPC: Can't decode result"
-msgstr "RPC: 결과를 복호화할 수 없습니다"
+msgstr "RPC: 결과를 해독할 수 없습니다"
#: sunrpc/clnt_perr.c:167
msgid "RPC: Can't encode arguments"
@@ -1216,7 +1282,7 @@ msgstr "RPC: 원격 시스템 오류"
#: sunrpc/clnt_perr.c:187
msgid "RPC: Server can't decode arguments"
-msgstr "RPC: 서버가 인수를 복호화할 수 없습니다"
+msgstr "RPC: 서버가 인수를 해독할 수 없습니다"
#: sunrpc/clnt_perr.c:165
msgid "RPC: Success"
@@ -1251,7 +1317,7 @@ msgstr "동적으로 적재되지 않은 코드에 RTLD_NEXT가 사용됨"
msgid "Read-only file system"
msgstr "읽기전용 파일 시스템"
-#: posix/regex.c:955
+#: posix/regex.c:969
msgid "Regular expression too big"
msgstr "정규식이 너무 큽니다"
@@ -1268,13 +1334,14 @@ msgid "Remove password or make file unreadable by others."
msgstr "암호를 지우거나 다른 사람이 읽을 수 없는 파일을 만듭니다."
#: catgets/gencat.c:224 db/makedb.c:227 locale/programs/locale.c:257
-#: locale/programs/localedef.c:408
-msgid "Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
+#: locale/programs/localedef.c:412
+#, fuzzy
+msgid "Report bugs using the `glibcbug' script to <bugs@gnu.ai.mit.edu>.\n"
msgstr "버그는 <bug-glibc@prep.ai.mit.edu>에 보고하십시오.\n"
-#: nis/ypclnt.c:633
+#: nis/ypclnt.c:691
msgid "Request arguments bad"
-msgstr ""
+msgstr "요청된 인수가 잘못됨"
#: resolv/herror.c:73
msgid "Resolver Error 0 (no error)"
@@ -1290,7 +1357,11 @@ msgstr "해결기 내부 오류"
#. TRANS noticed; it might just hang. @xref{File Locks}, for an example.
#: stdio-common/../sysdeps/gnu/errlist.c:85
msgid "Resource deadlock avoided"
-msgstr ""
+msgstr "자원 교착상태를 피했습니다"
+
+#: stdio-common/../sysdeps/unix/siglist.c:58
+msgid "Resource lost"
+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};
@@ -1325,6 +1396,8 @@ msgstr ""
msgid "Resource temporarily unavailable"
msgstr "자원이 일시적으로 사용 불가능함"
+#: stdio-common/../sysdeps/unix/siglist.c:40
+#: sysdeps/unix/sysv/linux/siglist.h:31
msgid "Segmentation fault"
msgstr ""
@@ -1336,6 +1409,10 @@ msgstr "서버가 자격 부여를 거부했습니다"
msgid "Server rejected verifier"
msgstr "서버가 검증기를 거부했습니다"
+#: stdio-common/../sysdeps/unix/siglist.c:29
+msgid "Signal 0"
+msgstr "신호 0"
+
#. TRANS A file that isn't a socket was specified when a socket is required.
#: stdio-common/../sysdeps/gnu/errlist.c:299
msgid "Socket operation on non-socket"
@@ -1355,6 +1432,10 @@ msgstr "소프트웨어가 연결 중단을 초래했습니다"
msgid "Srmount error"
msgstr ""
+#: sysdeps/unix/sysv/linux/siglist.h:59
+msgid "Stack fault"
+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
@@ -1363,15 +1444,23 @@ msgstr ""
msgid "Stale NFS file handle"
msgstr "끊어진 NFS 파일 핸들"
+#: stdio-common/../sysdeps/unix/siglist.c:47
+#: sysdeps/unix/sysv/linux/siglist.h:37
msgid "Stopped"
msgstr "정지됨"
+#: stdio-common/../sysdeps/unix/siglist.c:46
+#: sysdeps/unix/sysv/linux/siglist.h:36
msgid "Stopped (signal)"
msgstr "정지됨 (신호)"
+#: stdio-common/../sysdeps/unix/siglist.c:50
+#: sysdeps/unix/sysv/linux/siglist.h:40
msgid "Stopped (tty input)"
msgstr "정지됨 (tty 입력)"
+#: stdio-common/../sysdeps/unix/siglist.c:51
+#: sysdeps/unix/sysv/linux/siglist.h:41
msgid "Stopped (tty output)"
msgstr "정지됨 (tty 출력)"
@@ -1383,15 +1472,17 @@ msgstr "스트림 파이프 오류"
msgid "Structure needs cleaning"
msgstr "구조에 청소가 필요합니다"
-#: nis/ypclnt.c:631 nis/ypclnt.c:705 posix/regex.c:940
+#: nis/ypclnt.c:689 nis/ypclnt.c:763 posix/regex.c:954
#: stdio-common/../sysdeps/gnu/errlist.c:7
msgid "Success"
msgstr "성공"
-#: nis/ypclnt.c:711
+#: nis/ypclnt.c:769
msgid "System resource allocation failure"
msgstr "시스템 자원 할당 실패"
+#: stdio-common/../sysdeps/unix/siglist.c:44
+#: sysdeps/unix/sysv/linux/siglist.h:34
msgid "Terminated"
msgstr "종료됨"
@@ -1457,10 +1548,15 @@ msgstr "참조가 너무 많음: 연결할 수 없습니다"
msgid "Too many users"
msgstr "사용자가 너무 많음"
+#: stdio-common/../sysdeps/unix/siglist.c:34
+msgid "Trace/BPT trap"
+msgstr ""
+
+#: sysdeps/unix/sysv/linux/siglist.h:26
msgid "Trace/breakpoint trap"
msgstr "추적/중단점 함정"
-#: posix/regex.c:945
+#: posix/regex.c:959
msgid "Trailing backslash"
msgstr "따라붙는 역슬래쉬"
@@ -1469,7 +1565,7 @@ msgstr "따라붙는 역슬래쉬"
#. TRANS up, before it has connected to the file.
#: stdio-common/../sysdeps/gnu/errlist.c:584
msgid "Translator died"
-msgstr "번역기가 죽었음"
+msgstr "변환기가 죽었음"
#. TRANS You tried to connect a socket that is already connected.
#. TRANS @xref{Connecting}.
@@ -1486,12 +1582,12 @@ msgid "Transport endpoint is not connected"
msgstr "전송 종료지점이 연결되어 있지 않습니다"
#: catgets/gencat.c:208 db/makedb.c:209 locale/programs/locale.c:241
-#: locale/programs/localedef.c:389
+#: locale/programs/localedef.c:393
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
-#: inet/rcmd.c:136
+#: inet/rcmd.c:137
#, c-format
msgid "Trying %s...\n"
msgstr "%s 시도중...\n"
@@ -1501,7 +1597,7 @@ msgstr "%s 시도중...\n"
msgid "Unknown .netrc keyword %s"
msgstr "알 수 없는 .netrc 키워드 %s"
-#: nis/ypclnt.c:665
+#: nis/ypclnt.c:723
msgid "Unknown NIS error code"
msgstr "알 수 없는 NIS 오류 코드"
@@ -1516,7 +1612,7 @@ msgstr "알 수 없는 호스트"
#: resolv/herror.c:120
msgid "Unknown resolver error"
-msgstr "알 수 없는 리솔버 오류"
+msgstr "알 수 없는 해결기 오류"
#: resolv/herror.c:76
msgid "Unknown server error"
@@ -1527,27 +1623,27 @@ msgstr "알 수 없는 서버 오류"
msgid "Unknown signal %d"
msgstr "알 수 없는 신호 %d"
-#: misc/error.c:95
+#: misc/error.c:100
msgid "Unknown system error"
msgstr "알 수 없는 시스템 오류"
-#: nis/ypclnt.c:713
+#: nis/ypclnt.c:771
msgid "Unknown ypbind error"
msgstr "알 수 없는 ypbind 오류"
-#: posix/regex.c:948
+#: posix/regex.c:962
msgid "Unmatched ( or \\("
msgstr "짝이 맞지 않는 ( 또는 \\("
-#: posix/regex.c:956
+#: posix/regex.c:970
msgid "Unmatched ) or \\)"
msgstr "짝이 맞지 않는 ) 또는 \\)"
-#: posix/regex.c:947
+#: posix/regex.c:961
msgid "Unmatched [ or [^"
msgstr "짝이 맞지 않는 [ 또는 [^"
-#: posix/regex.c:949
+#: posix/regex.c:963
msgid "Unmatched \\{"
msgstr "짝이 맞지 않는 \\{"
@@ -1556,6 +1652,8 @@ msgstr "짝이 맞지 않는 \\{"
msgid "Unrecognized variable `%s'"
msgstr "인식할 수 없는 변수 `%s'"
+#: stdio-common/../sysdeps/unix/siglist.c:45
+#: sysdeps/unix/sysv/linux/siglist.h:35
msgid "Urgent I/O condition"
msgstr "시급한 입출력 상황"
@@ -1612,7 +1710,7 @@ msgstr ""
" -V, --version 버전 정보를 출력하고 마칩니다\n"
"입력-파일이 - 이면 표준 입력으로부터 입력을 읽게 됩니다.\n"
-#: locale/programs/localedef.c:393
+#: locale/programs/localedef.c:397
#, c-format
msgid ""
"Usage: %s [OPTION]... name\n"
@@ -1636,12 +1734,13 @@ msgstr ""
" -h, --help 이 도움말을 표시하고 마칩니다\n"
" -f, --charmaps=FILE FILE에 정의된 기호 문자 이름\n"
" -i, --inputfile=FILE 소스 정의가 FILE 안에 있음을 나타냅니다\n"
-" -u, --code-set-name=NAME ISO 10646 원소에 대응하는 코드 집합을 지정합니다\n"
+" -u, --code-set-name=NAME ISO 10646 원소에 대응하는 코드 집합을 "
+"지정합니다\n"
" -v, --verbose 더 많은 메시지를 출력합니다\n"
" -V, --version 버전 정보를 출력하고 마칩니다\n"
" --posix POSIX 안을 엄격히 준수합니다\n"
"\n"
-"문자 지도의 시스템 디렉토리: %s\n"
+" 문자 지도의 시스템 디렉토리: %s\n"
"로케일 파일의 시스템 디렉토리: %s\n"
#: locale/programs/locale.c:245
@@ -1678,9 +1777,13 @@ msgstr "사용법: %s 변수명 [경로명]\n"
msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
msgstr "사용법: rpcinfo [ -n 포트번호 ] -u 호스트 프로그램번호 [ 버전번호 ]\n"
+#: stdio-common/../sysdeps/unix/siglist.c:59
+#: sysdeps/unix/sysv/linux/siglist.h:48
msgid "User defined signal 1"
msgstr "사용자 정의 신호 1"
+#: stdio-common/../sysdeps/unix/siglist.c:60
+#: sysdeps/unix/sysv/linux/siglist.h:49
msgid "User defined signal 2"
msgstr "사용자 신호 신호 2"
@@ -1688,36 +1791,40 @@ msgstr "사용자 신호 신호 2"
msgid "Value too large for defined data type"
msgstr "정의된 자료형으로 쓰기엔 너무 큰 값"
+#: stdio-common/../sysdeps/unix/siglist.c:55
+#: sysdeps/unix/sysv/linux/siglist.h:45
msgid "Virtual timer expired"
msgstr "가상 타이머 시간 초과"
-#: time/zic.c:1844
+#: time/zic.c:1871
msgid "Wild result from command execution"
msgstr ""
+#: stdio-common/../sysdeps/unix/siglist.c:57
+#: sysdeps/unix/sysv/linux/siglist.h:47
msgid "Window changed"
msgstr "윈도우 변경됨"
#: catgets/gencat.c:174 db/makedb.c:125 locale/programs/locale.c:192
-#: locale/programs/localedef.c:182
+#: locale/programs/localedef.c:185
#, c-format
msgid "Written by %s.\n"
-msgstr "저자: %s.\n"
+msgstr "%s이 만들었습니다.\n"
-#: nis/ypclnt.c:146
+#: nis/ypclnt.c:142
msgid "YPBINDPROC_DOMAIN: Internal error\n"
msgstr "YPBINDPROC_DOMAIN: 내부 오류\n"
-#: nis/ypclnt.c:150
+#: nis/ypclnt.c:146
#, c-format
msgid "YPBINDPROC_DOMAIN: No server for domain %s\n"
msgstr "YPBINDPROC_DOMAIN: 도메인 %s에 대한 서버가 없음\n"
-#: nis/ypclnt.c:154
+#: nis/ypclnt.c:150
msgid "YPBINDPROC_DOMAIN: Resource allocation failure\n"
msgstr "YPBINDPROC_DOMAIN: 자원 할당 실패\n"
-#: nis/ypclnt.c:158
+#: nis/ypclnt.c:154
msgid "YPBINDPROC_DOMAIN: Unknown error\n"
msgstr "YPBINDPROC_DOMAIN: 알 수 없는 오류\n"
@@ -1726,29 +1833,29 @@ msgstr "YPBINDPROC_DOMAIN: 알 수 없는 오류\n"
msgid "You really blew it this time"
msgstr "이번엔 정말로 날려버렸습니다"
-#: time/zic.c:1050
+#: time/zic.c:1048
msgid "Zone continuation line end time is not after end time of previous line"
msgstr ""
-#: locale/programs/charmap.c:397 locale/programs/locfile.c:341
+#: locale/programs/charmap.c:397 locale/programs/locfile.c:363
#, c-format
msgid "`%1$s' definition does not end with `END %1$s'"
msgstr "`%1%s' 정의가 `END %1$s'로 끝나지 않습니다"
-#: locale/programs/ld-monetary.c:358 locale/programs/ld-numeric.c:190
+#: locale/programs/ld-monetary.c:359 locale/programs/ld-numeric.c:190
#, c-format
msgid "`-1' must be last entry in `%s' field in `%s' category"
msgstr ""
-#: locale/programs/ld-collate.c:1652
+#: locale/programs/ld-collate.c:1655
msgid "`...' must only be used in `...' and `UNDEFINED' entries"
msgstr "`...'는 `...'와 `UNDEFINED' 항목에만 쓰여야 합니다"
-#: locale/programs/locfile.c:538
+#: locale/programs/locfile.c:560
msgid "`from' expected after first argument to `collating-element'"
-msgstr ""
+msgstr "`collating-element'에 대한 첫번째 인수 뒤에 `from'이 와야 합니다"
-#: locale/programs/ld-collate.c:1109
+#: locale/programs/ld-collate.c:1112
msgid ""
"`from' string in collation element declaration contains unknown character"
msgstr ""
@@ -1758,36 +1865,36 @@ msgstr ""
msgid "argument to <%s> must be a single character"
msgstr "<%s>에 대한 인수는 단일 문자여야 합니다"
-#: locale/programs/locfile.c:215
+#: locale/programs/locfile.c:237
#, c-format
msgid "argument to `%s' must be a single character"
msgstr "`%s'에 대한 인수는 단일 문자여야 합니다"
-#: sunrpc/auth_unix.c:322
+#: sunrpc/auth_unix.c:323
msgid "auth_none.c - Fatal marshalling problem"
msgstr ""
-#: inet/rcmd.c:360
+#: inet/rcmd.c:365
msgid "bad .rhosts owner"
msgstr "잘못된 .rhosts 소유자"
-#: locale/programs/charmap.c:212 locale/programs/locfile.c:209
+#: locale/programs/charmap.c:212 locale/programs/locfile.c:231
msgid "bad argument"
msgstr "잘못된 인수"
-#: time/zic.c:1172
+#: time/zic.c:1170
msgid "blank FROM field on Link line"
msgstr ""
-#: time/zic.c:1176
+#: time/zic.c:1174
msgid "blank TO field on Link line"
msgstr ""
-#: malloc/mcheck.c:189
+#: malloc/mcheck.c:191
msgid "block freed twice"
msgstr "블럭이 두번 비워졌음"
-#: malloc/mcheck.c:192
+#: malloc/mcheck.c:194
msgid "bogus mcheck_status, library is buggy"
msgstr "엉터리 mcheck_status, 라이브러리는 버그가 버글버글합니다"
@@ -1803,8 +1910,8 @@ msgstr ""
msgid "cache_set: victim not found"
msgstr "cache_set: 버릴것을 찾지 못했음"
-#: time/zic.c:1685
-msgid "can't determine time zone abbrevation to use just after until time"
+#: time/zic.c:1698
+msgid "can't determine time zone abbreviation to use just after until time"
msgstr ""
#: sunrpc/svc_simple.c:64
@@ -1812,21 +1919,21 @@ msgstr ""
msgid "can't reassign procedure number %d\n"
msgstr "프로시져 번호 %d를 재지정할 수 없습니다\n"
-#: locale/programs/localedef.c:287
+#: locale/programs/localedef.c:291
#, c-format
msgid "cannot `stat' locale file `%s'"
msgstr "로케일 파일 `%s'를 `stat'할 수 없습니다"
-#: locale/programs/ld-collate.c:1314
+#: locale/programs/ld-collate.c:1317
#, c-format
msgid "cannot insert collation element `%.*s'"
msgstr ""
-#: locale/programs/ld-collate.c:1493 locale/programs/ld-collate.c:1498
+#: locale/programs/ld-collate.c:1496 locale/programs/ld-collate.c:1501
msgid "cannot insert into result table"
msgstr "결과표에 삽입할 수 없습니다"
-#: locale/programs/ld-collate.c:1166 locale/programs/ld-collate.c:1208
+#: locale/programs/ld-collate.c:1169 locale/programs/ld-collate.c:1211
#, c-format
msgid "cannot insert new collating symbol definition: %s"
msgstr ""
@@ -1836,84 +1943,84 @@ msgstr ""
msgid "cannot open database file `%s': %s"
msgstr "데이터베이스 파일 `%s'를 열 수 없습니다: %s"
-#: catgets/gencat.c:259 db/makedb.c:180
+#: catgets/gencat.c:260 db/makedb.c:180
#, c-format
msgid "cannot open input file `%s'"
msgstr "입력 파일 `%s'를 열 수 없습니다"
-#: locale/programs/localedef.c:221
+#: locale/programs/localedef.c:224
#, c-format
msgid "cannot open locale definition file `%s'"
msgstr "로케일 정의 파일 `%s'를 열 수 없습니다"
-#: catgets/gencat.c:764 catgets/gencat.c:805 db/makedb.c:189
+#: catgets/gencat.c:765 catgets/gencat.c:806 db/makedb.c:189
#, c-format
msgid "cannot open output file `%s'"
msgstr "출력 파일 `%s'를 열 수 없습니다"
-#: locale/programs/locfile.c:986
+#: locale/programs/locfile.c:1008
#, c-format
msgid "cannot open output file `%s' for category `%s'"
msgstr "출력 파일 `%s'를 범주 `%s'에 대해 열 수 없습니다"
-#: locale/programs/ld-collate.c:1360
+#: locale/programs/ld-collate.c:1363
msgid "cannot process order specification"
msgstr ""
-#: locale/programs/locale.c:303
+#: locale/programs/locale.c:304
#, c-format
msgid "cannot read character map directory `%s'"
msgstr "문자 지도 디렉토리 `%s'를 읽을 수 없습니다"
-#: locale/programs/locale.c:278
+#: locale/programs/locale.c:279
#, c-format
msgid "cannot read locale directory `%s'"
msgstr "로케일 디렉토리 `%s'를 읽을 수 없습니다"
-#: locale/programs/localedef.c:309
+#: locale/programs/localedef.c:313
#, c-format
msgid "cannot read locale file `%s'"
msgstr "로케일 파일 `%s'를 열 수 없습니다"
-#: locale/programs/localedef.c:334
+#: locale/programs/localedef.c:338
#, c-format
msgid "cannot write output files to `%s'"
msgstr "출력 파일을 `%s'에 기록할 수 없습니다"
-#: locale/programs/localedef.c:377
+#: locale/programs/localedef.c:381
msgid "category data requested more than once: should not happen"
msgstr ""
-#: locale/programs/ld-ctype.c:265
+#: locale/programs/ld-ctype.c:266
#, c-format
msgid "character %s'%s' in class `%s' must be in class `%s'"
msgstr ""
-#: locale/programs/ld-ctype.c:289
+#: locale/programs/ld-ctype.c:291
#, c-format
msgid "character %s'%s' in class `%s' must not be in class `%s'"
msgstr ""
-#: locale/programs/ld-ctype.c:310
+#: locale/programs/ld-ctype.c:313
msgid "character <SP> not defined in character map"
-msgstr "문자 <SP>가 문자 지도에서 정의되지 않음"
+msgstr "문자 <SP>가 문자 지도에서 정의되지 않았음"
-#: locale/programs/ld-ctype.c:939 locale/programs/ld-ctype.c:1002
-#: locale/programs/ld-ctype.c:1010 locale/programs/ld-ctype.c:1018
-#: locale/programs/ld-ctype.c:1026 locale/programs/ld-ctype.c:1034
-#: locale/programs/ld-ctype.c:1042 locale/programs/ld-ctype.c:1068
-#: locale/programs/ld-ctype.c:1076 locale/programs/ld-ctype.c:1114
-#: locale/programs/ld-ctype.c:1141 locale/programs/ld-ctype.c:1152
+#: locale/programs/ld-ctype.c:944 locale/programs/ld-ctype.c:1007
+#: locale/programs/ld-ctype.c:1015 locale/programs/ld-ctype.c:1023
+#: locale/programs/ld-ctype.c:1031 locale/programs/ld-ctype.c:1039
+#: locale/programs/ld-ctype.c:1047 locale/programs/ld-ctype.c:1073
+#: locale/programs/ld-ctype.c:1081 locale/programs/ld-ctype.c:1119
+#: locale/programs/ld-ctype.c:1146 locale/programs/ld-ctype.c:1157
#, c-format
msgid "character `%s' not defined while needed as default value"
msgstr "문자 `%s'는 내정치로 필요하지만 정의되지 않았음"
-#: locale/programs/ld-ctype.c:801
+#: locale/programs/ld-ctype.c:806
#, c-format
msgid "character class `%s' already defined"
msgstr "문자 클래스 `%s'는 이미 정의되었음"
-#: locale/programs/ld-ctype.c:833
+#: locale/programs/ld-ctype.c:838
#, c-format
msgid "character map `%s' already defined"
msgstr "문자 지도 `%s'는 이미 정의되었음"
@@ -1927,22 +2034,22 @@ msgstr "문자 지도 파일 `%s'를 찾지 못했음"
msgid "clnt_raw.c - Fatal header serialization error."
msgstr ""
-#: locale/programs/ld-collate.c:1329
+#: locale/programs/ld-collate.c:1332
#, c-format
msgid "collation element `%.*s' appears more than once: ignore line"
msgstr ""
-#: locale/programs/ld-collate.c:1347
+#: locale/programs/ld-collate.c:1350
#, c-format
msgid "collation symbol `%.*s' appears more than once: ignore line"
msgstr ""
-#: locale/programs/locfile.c:522
+#: locale/programs/locfile.c:544
#, c-format
msgid "collation symbol expected after `%s'"
msgstr ""
-#: inet/rcmd.c:129
+#: inet/rcmd.c:130
#, c-format
msgid "connect to address %s: "
msgstr "주소 %s에 연결: "
@@ -1980,37 +2087,37 @@ msgstr ""
msgid "duplicate character name `%s'"
msgstr "문자 이름 `%s'이 중복됨"
-#: locale/programs/ld-collate.c:1141
+#: locale/programs/ld-collate.c:1144
msgid "duplicate collating element definition"
msgstr ""
-#: locale/programs/ld-collate.c:1287
+#: locale/programs/ld-collate.c:1290
#, c-format
msgid "duplicate definition for character `%.*s'"
msgstr "문자 `%.*s'를 중복 정의함"
-#: db/makedb.c:310
+#: db/makedb.c:311
msgid "duplicate key"
msgstr "중복된 키"
-#: catgets/gencat.c:378
+#: catgets/gencat.c:379
msgid "duplicate set definition"
msgstr "중복된 집합 정의"
-#: time/zic.c:965
+#: time/zic.c:963
#, c-format
msgid "duplicate zone name %s (file \"%s\", line %d)"
msgstr "중복된 지역명 %s (파일 \"%s\", 행 %d)"
-#: catgets/gencat.c:541
+#: catgets/gencat.c:542
msgid "duplicated message identifier"
msgstr "중복된 메시지 식별자"
-#: catgets/gencat.c:514
+#: catgets/gencat.c:515
msgid "duplicated message number"
msgstr "중복된 메시지 번호"
-#: locale/programs/ld-collate.c:1696
+#: locale/programs/ld-collate.c:1699
msgid "empty weight name: line ignored"
msgstr ""
@@ -2030,32 +2137,36 @@ msgstr "enablecache: 캐쉬 자료를 할당할 수 없습니다"
msgid "enablecache: could not allocate cache fifo"
msgstr "enablecache: 캐쉬 fifo를 할당할 수 없습니다"
-#: locale/programs/ld-collate.c:1419
+#: locale/programs/ld-collate.c:1422
msgid "end point of ellipsis range is bigger then start"
msgstr ""
-#: locale/programs/ld-collate.c:1149
+#: locale/programs/ld-collate.c:1152
msgid "error while inserting collation element into hash table"
msgstr ""
-#: locale/programs/ld-collate.c:1161
+#: locale/programs/ld-collate.c:1164
msgid "error while inserting to hash table"
msgstr "해쉬 테이블에 삽입하는 도중 오류 발생"
-#: locale/programs/locfile.c:465
+#: locale/programs/locfile.c:487
msgid "expect string argument for `copy'"
-msgstr ""
+msgstr "`copy'에 대한 문자열 인수가 필요함"
-#: time/zic.c:856
+#: time/zic.c:854
msgid "expected continuation line not found"
msgstr "예상했던 연속 행을 찾지 못했음"
-#: locale/programs/locfile.c:1010
+#: locale/programs/locfile.c:1032
#, c-format
msgid "failure while writing data for category `%s'"
msgstr "범주 `%s'의 자료를 쓰는 데 실패했습니다"
-#: locale/programs/ld-monetary.c:154 locale/programs/ld-numeric.c:95
+#: nis/ypclnt.c:187
+msgid "fcntl: F_SETFD"
+msgstr ""
+
+#: locale/programs/ld-monetary.c:155 locale/programs/ld-numeric.c:95
#, c-format
msgid "field `%s' in category `%s' not defined"
msgstr ""
@@ -2065,7 +2176,7 @@ msgstr ""
msgid "field `%s' in category `%s' undefined"
msgstr ""
-#: locale/programs/locfile.c:547
+#: locale/programs/locfile.c:569
msgid "from-value of `collating-element' must be a string"
msgstr ""
@@ -2074,7 +2185,8 @@ msgid "garbage at end of character code specification"
msgstr "문자 코드 명세의 끝에 쓸모없는 것이 있음"
#: locale/programs/linereader.c:214
-msgid "garbage at end of digit"
+#, fuzzy
+msgid "garbage at end of number"
msgstr "숫자의 끝에 쓸모없는 것이 있음"
#: locale/programs/ld-time.c:183
@@ -2089,7 +2201,7 @@ msgid ""
"garbage at end of starting date in string %d in `era' field in category `%s'"
msgstr ""
-#: locale/programs/ld-time.c:310
+#: locale/programs/ld-time.c:311
#, c-format
msgid ""
"garbage at end of stopping date in string %d in `era' field in category `%s'"
@@ -2099,19 +2211,19 @@ msgstr ""
msgid "get_myaddress: ioctl (get interface configuration)"
msgstr ""
-#: time/zic.c:1149
+#: time/zic.c:1147
msgid "illegal CORRECTION field on Leap line"
msgstr ""
-#: time/zic.c:1153
+#: time/zic.c:1151
msgid "illegal Rolling/Stationary field on Leap line"
msgstr ""
-#: locale/programs/ld-collate.c:1767
+#: locale/programs/ld-collate.c:1770
msgid "illegal character constant in string"
msgstr "문자열에 잘못된 문자 상수가 있음"
-#: locale/programs/ld-collate.c:1116
+#: locale/programs/ld-collate.c:1119
msgid "illegal collation element"
msgstr ""
@@ -2125,7 +2237,7 @@ msgstr "잘못된 부호화가 주어짐"
#: locale/programs/linereader.c:546
msgid "illegal escape sequence at end of string"
-msgstr "문자열 끝에 잘못된 이스케이프 열이 있음"
+msgstr "문자열 끝에 잘못된 이스케이프 순서열이 있음"
#: locale/programs/charset.c:101
msgid "illegal names for character range"
@@ -2136,7 +2248,7 @@ msgstr "문자의 범위로 잘못된 이름"
msgid "illegal number for offset in string %d in `era' field in category `%s'"
msgstr ""
-#: catgets/gencat.c:351 catgets/gencat.c:428
+#: catgets/gencat.c:352 catgets/gencat.c:429
msgid "illegal set number"
msgstr "집합 번호가 잘못되었음"
@@ -2145,79 +2257,79 @@ msgstr "집합 번호가 잘못되었음"
msgid "illegal starting date in string %d in `era' field in category `%s'"
msgstr ""
-#: locale/programs/ld-time.c:302
+#: locale/programs/ld-time.c:303
#, c-format
msgid "illegal stopping date in string %d in `era' field in category `%s'"
msgstr ""
-#: locale/programs/ld-ctype.c:807
+#: locale/programs/ld-ctype.c:812
#, c-format
msgid "implementation limit: no more than %d character classes allowed"
msgstr ""
-#: locale/programs/ld-ctype.c:839
+#: locale/programs/ld-ctype.c:844
#, c-format
msgid "implementation limit: no more than %d character maps allowed"
-msgstr ""
+msgstr "구현상의 제한: %d 개 이상의 문자 지도는 허용되지 않습니다"
#: db/makedb.c:163
msgid "incorrectly formatted file"
msgstr "잘못된 형식을 갖춘 파일"
-#: time/zic.c:814
+#: time/zic.c:811
msgid "input line of unknown type"
msgstr "알 수 없는 형태의 입력행"
-#: time/zic.c:1733
+#: time/zic.c:1760
msgid "internal error - addtype called with bad isdst"
msgstr ""
-#: time/zic.c:1741
+#: time/zic.c:1768
msgid "internal error - addtype called with bad ttisgmt"
msgstr ""
-#: time/zic.c:1737
+#: time/zic.c:1764
msgid "internal error - addtype called with bad ttisstd"
msgstr ""
-#: locale/programs/ld-ctype.c:301
+#: locale/programs/ld-ctype.c:304
#, c-format
msgid "internal error in %s, line %u"
msgstr "%s, 행 %u에 내부 오류 발생"
-#: time/zic.c:1021
+#: time/zic.c:1019
msgid "invalid GMT offset"
msgstr "GMT 옵셋이 부적절함"
-#: time/zic.c:1024
+#: time/zic.c:1022
msgid "invalid abbreviation format"
msgstr "약어 형식이 부적절함"
-#: time/zic.c:1114 time/zic.c:1313 time/zic.c:1327
+#: time/zic.c:1112 time/zic.c:1313 time/zic.c:1327
msgid "invalid day of month"
msgstr "달의 날짜 수가 부적절함"
-#: time/zic.c:1272
+#: time/zic.c:1270
msgid "invalid ending year"
msgstr "끝나는 해가 부적절함"
-#: time/zic.c:1086
+#: time/zic.c:1084
msgid "invalid leaping year"
msgstr "부적절한 윤년"
-#: time/zic.c:1101 time/zic.c:1204
+#: time/zic.c:1099 time/zic.c:1202
msgid "invalid month name"
msgstr "달 이름이 부적절함"
-#: time/zic.c:920
+#: time/zic.c:918
msgid "invalid saved time"
msgstr "절약 시간이 부적절함"
-#: time/zic.c:1252
+#: time/zic.c:1250
msgid "invalid starting year"
msgstr "시작하는 해가 부적절함"
-#: time/zic.c:1130 time/zic.c:1232
+#: time/zic.c:1128 time/zic.c:1230
msgid "invalid time of day"
msgstr ""
@@ -2225,61 +2337,61 @@ msgstr ""
msgid "invalid weekday name"
msgstr "부적절한 요일 이름"
-#: locale/programs/ld-collate.c:1412
+#: locale/programs/ld-collate.c:1415
msgid "line after ellipsis must contain character definition"
msgstr ""
-#: locale/programs/ld-collate.c:1391
+#: locale/programs/ld-collate.c:1394
msgid "line before ellipsis does not contain definition for character constant"
msgstr ""
-#: time/zic.c:794
+#: time/zic.c:791
msgid "line too long"
msgstr "행이 너무 깁니다"
-#: locale/programs/localedef.c:281
+#: locale/programs/localedef.c:285
#, c-format
msgid "locale file `%s', used in `copy' statement, not found"
msgstr "`copy' 문장에서 쓰이는 로케일 파일 `%s'을 찾지 못했습니다"
-#: catgets/gencat.c:609
+#: catgets/gencat.c:610
msgid "malformed line ignored"
msgstr "잘못된 형태를 가진 행은 무시됨"
-#: malloc/mcheck.c:183
+#: malloc/mcheck.c:185
msgid "memory clobbered before allocated block"
msgstr ""
-#: malloc/mcheck.c:186
+#: malloc/mcheck.c:188
msgid "memory clobbered past end of allocated block"
msgstr ""
#: locale/programs/ld-collate.c:167 locale/programs/ld-collate.c:173
-#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1439
-#: locale/programs/ld-collate.c:1468 locale/programs/locfile.c:940
+#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1442
+#: locale/programs/ld-collate.c:1471 locale/programs/locfile.c:962
#: locale/programs/xmalloc.c:68 posix/getconf.c:250
msgid "memory exhausted"
msgstr "메모리가 바닥남"
-#: malloc/obstack.c:425
+#: malloc/obstack.c:462
msgid "memory exhausted\n"
msgstr "메모리가 바닥남\n"
-#: malloc/mcheck.c:180
+#: malloc/mcheck.c:182
msgid "memory is consistent, library is buggy"
msgstr "메모리는 견고하지만, 라이브러리는 버그가 많습니다"
-#: locale/programs/ld-time.c:348
+#: locale/programs/ld-time.c:350
#, c-format
msgid "missing era format in string %d in `era' field in category `%s'"
msgstr ""
-#: locale/programs/ld-time.c:337
+#: locale/programs/ld-time.c:339
#, c-format
-msgid "missing era name in string %d in `era' fieldin category `%s'"
+msgid "missing era name in string %d in `era' field in category `%s'"
msgstr ""
-#: time/zic.c:915
+#: time/zic.c:913
msgid "nameless rule"
msgstr "이름없는 규칙"
@@ -2293,26 +2405,26 @@ msgstr "결코 등록되지 않은 프로그램 %d\n"
msgid "no correct regular expression for field `%s' in category `%s': %s"
msgstr ""
-#: time/zic.c:2059
+#: time/zic.c:2086
msgid "no day in month matches rule"
msgstr "규칙에 부합되는 날이 달 안에 없음"
-#: locale/programs/ld-collate.c:259
+#: locale/programs/ld-collate.c:260
msgid "no definition of `UNDEFINED'"
-msgstr ""
+msgstr "`UNDEFINED'의 정의가 없음"
-#: locale/programs/locfile.c:479
+#: locale/programs/locfile.c:501
msgid "no other keyword shall be specified when `copy' is used"
-msgstr ""
+msgstr "`copy'가 사용될 땐 다른 키워드를 지정하면 안 됩니다"
-#: locale/programs/localedef.c:340
+#: locale/programs/localedef.c:344
msgid "no output file produced because warning were issued"
-msgstr ""
+msgstr "경고가 제기되었기 때문에 출력 파일이 만들어지지 않았습니다"
#: locale/programs/charmap.c:315 locale/programs/charmap.c:466
#: locale/programs/charmap.c:545
msgid "no symbolic name given"
-msgstr ""
+msgstr "기호명이 주어지지 않음"
#: locale/programs/charmap.c:380 locale/programs/charmap.c:512
#: locale/programs/charmap.c:578
@@ -2328,7 +2440,7 @@ msgstr ""
msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
msgstr ""
-#: db/makedb.c:326
+#: db/makedb.c:327
#, c-format
msgid "problems while reading `%s'"
msgstr "`%s'를 읽는 동안 문제가 발생했음"
@@ -2349,16 +2461,16 @@ msgstr "프로그램 %lu 버전 %lu는 사용 불가능합니다\n"
msgid "program %lu version %lu ready and waiting\n"
msgstr "프로그램 %lu 버전 %lu는 준비되어 기다리고 있습니다\n"
-#: inet/rcmd.c:171
+#: inet/rcmd.c:172
#, c-format
msgid "rcmd: select (setting up stderr): %m\n"
msgstr "rcmd: 선택 (표준오류 설정): %m\n"
-#: inet/rcmd.c:103
+#: inet/rcmd.c:104
msgid "rcmd: socket: All ports in use\n"
msgstr "rcmd: socket: 모든 포트가 사용중\n"
-#: inet/rcmd.c:159
+#: inet/rcmd.c:160
#, c-format
msgid "rcmd: write (setting up stderr): %m\n"
msgstr "rcmd: 쓰기 (표준오류 설정): %m\n"
@@ -2367,7 +2479,7 @@ msgstr "rcmd: 쓰기 (표준오류 설정): %m\n"
msgid "registerrpc: out of memory\n"
msgstr "registerrpc: 메모리 부족\n"
-#: time/zic.c:1794
+#: time/zic.c:1821
msgid "repeated leap second moment"
msgstr ""
@@ -2399,45 +2511,45 @@ msgstr "rpcinfo: 포트매퍼에 연결할 수 없습니다"
msgid "rpcinfo: can't contact portmapper: "
msgstr "rpcinfo: 포트매퍼에 연결할 수 없습니다: "
-#: time/zic.c:708 time/zic.c:710
+#: time/zic.c:704 time/zic.c:706
msgid "same rule name in multiple files"
-msgstr ""
+msgstr "여러 파일에 같은 이름의 규칙이 있음"
-#: inet/rcmd.c:174
+#: inet/rcmd.c:175
msgid "select: protocol failure in circuit setup\n"
msgstr "select: 회로 설정중 규약이 불이행됨\n"
-#: inet/rcmd.c:192
+#: inet/rcmd.c:193
msgid "socket: protocol failure in circuit setup\n"
msgstr "socket: 회로 설정중 규약이 불이행됨\n"
-#: locale/programs/locfile.c:600
+#: locale/programs/locfile.c:622
msgid "sorting order `forward' and `backward' are mutually exclusive"
msgstr "정렬 순서 `forward'와 `backward'는 서로 배타적입니다"
-#: locale/programs/ld-collate.c:1568 locale/programs/ld-collate.c:1614
+#: locale/programs/ld-collate.c:1571 locale/programs/ld-collate.c:1617
msgid ""
"specification of sorting weight for collation symbol does not make sense"
msgstr ""
-#: time/zic.c:779
+#: time/zic.c:775
msgid "standard input"
msgstr "표준 입력"
-#: time/zdump.c:260
+#: time/zdump.c:268
msgid "standard output"
msgstr "표준 출력"
-#: locale/programs/ld-time.c:256
+#: locale/programs/ld-time.c:257
#, c-format
msgid "starting date is illegal in string %d in `era' field in category `%s'"
msgstr ""
-#: time/zic.c:1276
+#: time/zic.c:1274
msgid "starting year greater than ending year"
msgstr "시작하는 해가 끝나는 해보다 큽니다"
-#: locale/programs/ld-time.c:328
+#: locale/programs/ld-time.c:330
#, c-format
msgid "stopping date is illegal in string %d in `era' field in category `%s'"
msgstr ""
@@ -2466,35 +2578,35 @@ msgstr "svcudp_create - getsockname 불가능"
msgid "svcudp_create: socket creation problem"
msgstr "svcudp_create: 소켓 생성 문제"
-#: locale/programs/ld-collate.c:1191
+#: locale/programs/ld-collate.c:1194
#, c-format
msgid ""
"symbol for multicharacter collating element `%.*s' duplicates element "
"definition"
msgstr ""
-#: locale/programs/ld-collate.c:1064
+#: locale/programs/ld-collate.c:1067
#, c-format
msgid ""
"symbol for multicharacter collating element `%.*s' duplicates other element "
"definition"
msgstr ""
-#: locale/programs/ld-collate.c:1200
+#: locale/programs/ld-collate.c:1203
#, c-format
msgid ""
"symbol for multicharacter collating element `%.*s' duplicates other symbol "
"definition"
msgstr ""
-#: locale/programs/ld-collate.c:1073
+#: locale/programs/ld-collate.c:1076
#, c-format
msgid ""
"symbol for multicharacter collating element `%.*s' duplicates symbol "
"definition"
msgstr ""
-#: locale/programs/ld-collate.c:1055 locale/programs/ld-collate.c:1182
+#: locale/programs/ld-collate.c:1058 locale/programs/ld-collate.c:1185
#, c-format
msgid ""
"symbol for multicharacter collating element `%.*s' duplicates symbolic name "
@@ -2509,51 +2621,51 @@ msgstr ""
msgid "syntax error in %s definition: %s"
msgstr "%s 정의부에 문법 오류 있음: %s"
-#: locale/programs/locfile.c:620
+#: locale/programs/locfile.c:642
msgid "syntax error in `order_start' directive"
msgstr "`order_start' 지시자에 문법 오류 있음"
-#: locale/programs/locfile.c:362
+#: locale/programs/locfile.c:384
msgid "syntax error in character class definition"
msgstr "문자 클래스 정의에 문법 오류 있음"
-#: locale/programs/locfile.c:420
+#: locale/programs/locfile.c:442
msgid "syntax error in character conversion definition"
msgstr "문자 변환 정의에 문법 오류 있음"
-#: locale/programs/locfile.c:662
+#: locale/programs/locfile.c:684
msgid "syntax error in collating order definition"
msgstr ""
-#: locale/programs/locfile.c:512
+#: locale/programs/locfile.c:534
msgid "syntax error in collation definition"
msgstr ""
-#: locale/programs/locfile.c:335
+#: locale/programs/locfile.c:357
msgid "syntax error in definition of LC_CTYPE category"
msgstr "LC_CTYPE 범주의 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:278
+#: locale/programs/locfile.c:300
msgid "syntax error in definition of new character class"
msgstr ""
-#: locale/programs/locfile.c:288
+#: locale/programs/locfile.c:310
msgid "syntax error in definition of new character map"
msgstr "새로운 문자 지도 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:873
+#: locale/programs/locfile.c:895
msgid "syntax error in message locale definition"
msgstr "메시지 로케일 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:784
+#: locale/programs/locfile.c:806
msgid "syntax error in monetary locale definition"
msgstr "화폐 로케일 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:811
+#: locale/programs/locfile.c:833
msgid "syntax error in numeric locale definition"
msgstr "숫자 로케일 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:722
+#: locale/programs/locfile.c:744
msgid "syntax error in order specification"
msgstr ""
@@ -2562,57 +2674,57 @@ msgstr ""
msgid "syntax error in prolog: %s"
msgstr ""
-#: locale/programs/locfile.c:849
+#: locale/programs/locfile.c:871
msgid "syntax error in time locale definition"
msgstr "시간 로케일 정의부에 문법 오류 있음"
-#: locale/programs/locfile.c:255
+#: locale/programs/locfile.c:277
msgid "syntax error: not inside a locale definition section"
msgstr ""
-#: catgets/gencat.c:380 catgets/gencat.c:516 catgets/gencat.c:543
+#: catgets/gencat.c:381 catgets/gencat.c:517 catgets/gencat.c:544
msgid "this is the first definition"
msgstr "이것은 첫번째 정의입니다"
-#: time/zic.c:1119
+#: time/zic.c:1117
msgid "time before zero"
-msgstr ""
+msgstr "0 이전의 시간"
-#: time/zic.c:1127 time/zic.c:1959 time/zic.c:1978
+#: time/zic.c:1125 time/zic.c:1986 time/zic.c:2005
msgid "time overflow"
msgstr "시간 흘러넘침"
#: locale/programs/charset.c:44
msgid "too few bytes in character encoding"
-msgstr ""
+msgstr "문자 부호화에 필요한 바이트가 너무 적음"
#: locale/programs/charset.c:46
msgid "too many bytes in character encoding"
-msgstr ""
+msgstr "문자 부호화에 필요한 바이트가 너무 많음"
#: locale/programs/locales.h:72
msgid "too many character classes defined"
msgstr "문자 클래스가 너무 많이 정의되었음"
-#: time/zic.c:1788
+#: time/zic.c:1815
msgid "too many leap seconds"
msgstr "윤초가 너무 많음"
-#: time/zic.c:1760
+#: time/zic.c:1787
msgid "too many local time types"
msgstr "지역시의 종류가 너무 많음"
-#: time/zic.c:1714
+#: time/zic.c:1741
msgid "too many transitions?!"
-msgstr ""
+msgstr "너무 많은 전이?!"
-#: locale/programs/ld-collate.c:1623
+#: locale/programs/ld-collate.c:1626
msgid "too many weights"
msgstr ""
-#: time/zic.c:2082
+#: time/zic.c:2109
msgid "too many, or too long, time zone abbreviations"
-msgstr ""
+msgstr "너무 많거나 너무 긴 시간대 약어"
#: locale/programs/linereader.h:146
msgid "trailing garbage at end of line"
@@ -2623,11 +2735,11 @@ msgstr ""
msgid "trouble replying to prog %d\n"
msgstr "프로그램 %d에 응답하는 데 문제가 있음\n"
-#: locale/programs/ld-collate.c:1383
+#: locale/programs/ld-collate.c:1386
msgid "two lines in a row containing `...' are not allowed"
msgstr ""
-#: time/zic.c:1283
+#: time/zic.c:1281
msgid "typed single year"
msgstr ""
@@ -2642,39 +2754,36 @@ msgstr "알 수 없는 문자 `%s'"
#: locale/programs/ld-messages.c:193 locale/programs/ld-messages.c:204
#: locale/programs/ld-messages.c:215 locale/programs/ld-messages.c:226
-#: locale/programs/ld-time.c:696
+#: locale/programs/ld-time.c:698
#, c-format
msgid "unknown character in field `%s' of category `%s'"
msgstr ""
-#: locale/programs/locfile.c:585
+#: locale/programs/locfile.c:607
msgid "unknown collation directive"
msgstr ""
-#: catgets/gencat.c:477
+#: catgets/gencat.c:478
#, c-format
msgid "unknown directive `%s': line ignored"
msgstr "알 수 없는 지시자 `%s': 행 무시됨"
-#: catgets/gencat.c:456
+#: catgets/gencat.c:457
#, c-format
msgid "unknown set `%s'"
msgstr "알 수 없는 설정 `%s'"
-msgid "unknown signal"
-msgstr "알 수 없는 신호"
-
-#: locale/programs/ld-collate.c:1367 locale/programs/ld-collate.c:1558
-#: locale/programs/ld-collate.c:1732
+#: locale/programs/ld-collate.c:1370 locale/programs/ld-collate.c:1561
+#: locale/programs/ld-collate.c:1735
#, c-format
msgid "unknown symbol `%.*s': line ignored"
msgstr "알 수 없는 기호 `%.*s': 행 무시됨"
-#: time/zic.c:751
+#: time/zic.c:747
msgid "unruly zone"
msgstr ""
-#: catgets/gencat.c:961
+#: catgets/gencat.c:962
msgid "unterminated message"
msgstr "종료되지 않은 메시지"
@@ -2686,7 +2795,7 @@ msgstr "종료되지 않은 문자열"
msgid "unterminated symbolic name"
msgstr "종료되지 않은 기호 이름"
-#: locale/programs/ld-collate.c:1685
+#: locale/programs/ld-collate.c:1688
msgid "unterminated weight name"
msgstr ""
@@ -2694,7 +2803,7 @@ msgstr ""
msgid "upper limit in range is not smaller then lower limit"
msgstr "범위의 상한은 하한보다 작지 않아야 합니다"
-#: time/zic.c:2025
+#: time/zic.c:2052
msgid "use of 2/29 in non leap-year"
msgstr "평년에 2월 29일을 사용함"
@@ -2708,7 +2817,7 @@ msgstr "%s에 대한 값은 정수여야 합니다"
msgid "value for <%s> must lie between 1 and 4"
msgstr "<%s>에 대한 값은 1과 4 사이에 있어야 합니다"
-#: locale/programs/ld-monetary.c:148 locale/programs/ld-numeric.c:89
+#: locale/programs/ld-monetary.c:149 locale/programs/ld-numeric.c:89
#, c-format
msgid "value for field `%s' in category `%s' must not be the empty string"
msgstr ""
@@ -2717,7 +2826,7 @@ msgstr ""
msgid "value of <mb_cur_max> must be greater than the value of <mb_cur_min>"
msgstr "<mb_cur_max>의 값은 <mb_cur_min>의 값보다 커야 합니다"
-#: locale/programs/ld-monetary.c:138
+#: locale/programs/ld-monetary.c:139
msgid ""
"value of field `int_curr_symbol' in category `LC_MONETARY' does not "
"correspond to a valid name in ISO 4217"
@@ -2728,12 +2837,12 @@ msgid ""
"value of field `int_curr_symbol' in category `LC_MONETARY' has wrong length"
msgstr ""
-#: locale/programs/ld-monetary.c:370 locale/programs/ld-numeric.c:199
+#: locale/programs/ld-monetary.c:371 locale/programs/ld-numeric.c:199
#, c-format
msgid "values for field `%s' in category `%s' must be smaller than 127"
msgstr ""
-#: locale/programs/ld-monetary.c:366
+#: locale/programs/ld-monetary.c:367
#, c-format
msgid "values for field `%s' in category `%s' must not be zero"
msgstr ""
@@ -2742,15 +2851,15 @@ msgstr ""
msgid "while opening UTMP file"
msgstr "UTMP 파일을 여는 동안"
-#: catgets/gencat.c:988
+#: catgets/gencat.c:989
msgid "while opening old catalog file"
msgstr "오래된 목록 파일을 여는 동안"
-#: db/makedb.c:353
+#: db/makedb.c:354
msgid "while reading database"
msgstr "데이터베이스를 읽는 동안"
-#: db/makedb.c:315
+#: db/makedb.c:316
msgid "while writing data base file"
msgstr "데이터 베이스 파일을 쓰는 동안"
@@ -2758,34 +2867,30 @@ msgstr "데이터 베이스 파일을 쓰는 동안"
msgid "wrong number of arguments"
msgstr "인수의 개수가 잘못되었음"
-#: time/zic.c:1077
+#: time/zic.c:1075
msgid "wrong number of fields on Leap line"
msgstr ""
-#: time/zic.c:1168
+#: time/zic.c:1166
msgid "wrong number of fields on Link line"
msgstr ""
-#: time/zic.c:911
+#: time/zic.c:909
msgid "wrong number of fields on Rule line"
msgstr ""
-#: time/zic.c:981
+#: time/zic.c:979
msgid "wrong number of fields on Zone continuation line"
msgstr ""
-#: time/zic.c:939
+#: time/zic.c:937
msgid "wrong number of fields on Zone line"
msgstr ""
-#: nis/ypclnt.c:570
-msgid "yp_all: clnttcp_create failed"
-msgstr "yp_all: clnttcp_create 실패"
-
-#: nis/ypclnt.c:772
+#: nis/ypclnt.c:811
msgid "yp_update: cannot convert host to netname\n"
msgstr ""
-#: nis/ypclnt.c:784
+#: nis/ypclnt.c:823
msgid "yp_update: cannot get server address\n"
msgstr "yp_update: 서버 주소를 얻을 수 없습니다\n"
diff --git a/posix/Makefile b/posix/Makefile
index 53061c0828..0209274fff 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -22,10 +22,11 @@
subdir := posix
headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \
- glob.h regex.h wordexp.h fnmatch.h gnu/types.h getopt.h \
- posix1_lim.h posix2_lim.h posix_opt.h local_lim.h tar.h \
- utsnamelen.h confname.h waitflags.h waitstatus.h sys/unistd.h \
- sched.h schedbits.h re_comp.h wait.h
+ glob.h regex.h wordexp.h fnmatch.h bits/types.h getopt.h \
+ bits/posix1_lim.h bits/posix2_lim.h bits/posix_opt.h \
+ bits/local_lim.h tar.h bits/utsname.h bits/confname.h \
+ bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h \
+ bits/sched.h re_comp.h wait.h
distribute := confstr.h TESTS TESTS2C.sed testcases.h
@@ -59,7 +60,7 @@ before-compile := testcases.h
include ../Rules
-CFLAGS-regex.c = -Wno-unused -Wno-strict-prototypes
+CFLAGS-regex.c = -Wno-unused -Wno-strict-prototypes -DDEBUG
CFLAGS-getaddrinfo.c = -DRESOLVER
$(objpfx)libposix.a: $(dep-dummy-lib); $(make-dummy-lib)
diff --git a/posix/posix1_lim.h b/posix/bits/posix1_lim.h
index a23d224332..29d1acf947 100644
--- a/posix/posix1_lim.h
+++ b/posix/bits/posix1_lim.h
@@ -18,11 +18,12 @@
/*
* POSIX Standard: 2.9.2 Minimum Values Added to <limits.h>
+ *
+ * Never include this file directly; use <limits.h> instead.
*/
-#ifndef _POSIX1_LIMITS_H
-
-#define _POSIX1_LIMITS_H 1
+#ifndef _BITS_POSIX1_LIM_H
+#define _BITS_POSIX1_LIM_H 1
/* These are the standard-mandated minimum values. */
@@ -89,7 +90,7 @@
/* Get the implementation-specific values for the above. */
-#include <local_lim.h>
+#include <bits/local_lim.h>
#ifndef SSIZE_MAX
@@ -104,4 +105,4 @@
#define NGROUPS_MAX _POSIX_NGROUPS_MAX
#endif
-#endif /* posix1_limits.h */
+#endif /* bits/posix1_lim.h */
diff --git a/posix/posix2_lim.h b/posix/bits/posix2_lim.h
index 08b1e24b76..d2d89694ec 100644
--- a/posix/posix2_lim.h
+++ b/posix/bits/posix2_lim.h
@@ -16,9 +16,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _POSIX2_LIMITS_H
+/*
+ * Never include this file directly; include <limits.h> instead.
+ */
-#define _POSIX2_LIMITS_H 1
+#ifndef _BITS_POSIX2_LIM_H
+#define _BITS_POSIX2_LIM_H 1
/* The maximum `ibase' and `obase' values allowed by the `bc' utility. */
@@ -95,4 +98,4 @@
#endif
-#endif /* posix2_limits.h */
+#endif /* bits/posix2_lim.h */
diff --git a/posix/fnmatch.h b/posix/fnmatch.h
index e9a065a4c7..58880eceec 100644
--- a/posix/fnmatch.h
+++ b/posix/fnmatch.h
@@ -17,7 +17,6 @@
Boston, MA 02111-1307, USA. */
#ifndef _FNMATCH_H
-
#define _FNMATCH_H 1
#ifdef __cplusplus
diff --git a/posix/getopt.h b/posix/getopt.h
index d6ceb0eee1..68958c10bc 100644
--- a/posix/getopt.h
+++ b/posix/getopt.h
@@ -128,4 +128,4 @@ extern int _getopt_internal ();
}
#endif
-#endif /* _GETOPT_H */
+#endif /* getopt.h */
diff --git a/posix/glob.h b/posix/glob.h
index bfe1c9cd01..db44f7a69c 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -19,7 +19,6 @@
Boston, MA 02111-1307, USA. */
#ifndef _GLOB_H
-
#define _GLOB_H 1
#ifdef __cplusplus
diff --git a/posix/regex.h b/posix/regex.h
index 8e2bd8f394..e9a53d1a9c 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -20,8 +20,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __REGEXP_LIBRARY_H__
-#define __REGEXP_LIBRARY_H__
+#ifndef _REGEX_H
+#define _REGEX_H 1
/* Allow the use in C++ code. */
#ifdef __cplusplus
@@ -524,7 +524,7 @@ extern void regfree _RE_ARGS ((regex_t *preg));
}
#endif /* C++ */
-#endif /* not __REGEXP_LIBRARY_H__ */
+#endif /* regex.h */
/*
Local variables:
diff --git a/posix/sched.h b/posix/sched.h
index 277f93eb52..ae0f634fa4 100644
--- a/posix/sched.h
+++ b/posix/sched.h
@@ -23,11 +23,11 @@
#include <features.h>
/* Get type definitions. */
-#include <gnu/types.h>
+#include <bits/types.h>
#include <sys/time.h> /* for struct timespec */
/* Get system specific constant and data structure definitions. */
-#include <schedbits.h>
+#include <bits/sched.h>
__BEGIN_DECLS
diff --git a/posix/sys/times.h b/posix/sys/times.h
index eea9e3502c..6f2838d6f1 100644
--- a/posix/sys/times.h
+++ b/posix/sys/times.h
@@ -21,8 +21,8 @@
*/
#ifndef _SYS_TIMES_H
-
#define _SYS_TIMES_H 1
+
#include <features.h>
#define __need_clock_t
diff --git a/posix/sys/types.h b/posix/sys/types.h
index ffeeee1ff0..f49c996a04 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -21,13 +21,13 @@
*/
#ifndef _SYS_TYPES_H
-
#define _SYS_TYPES_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
#ifdef __USE_BSD
typedef __u_char u_char;
@@ -80,16 +80,25 @@ typedef unsigned int uint;
#if !defined (__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7
+/* These types are defined by the ISO C 9x header <inttypes.h>. */
+#ifndef __int8_t_defined
+#define __int8_t_defined
typedef char int8_t;
-typedef unsigned char u_int8_t;
typedef short int int16_t;
-typedef unsigned short int u_int16_t;
typedef int int32_t;
-typedef unsigned int u_int32_t;
#ifdef __GNUC__
typedef long long int int64_t;
+#endif
+#endif
+
+/* But these were defined by ISO C without the first `_'. */
+typedef unsigned char u_int8_t;
+typedef unsigned short int u_int16_t;
+typedef unsigned int u_int32_t;
+#ifdef __GNUC__
typedef unsigned long long int u_int64_t;
#endif
+
typedef int register_t;
#else
@@ -100,13 +109,17 @@ typedef int register_t;
#define __u_intN_t(N, MODE) \
typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE)))
+#ifndef __int8_t_defined
+#define __int8_t_defined
__intN_t (8, __QI__);
-__u_intN_t (8, __QI__);
__intN_t (16, __HI__);
-__u_intN_t (16, __HI__);
__intN_t (32, __SI__);
-__u_intN_t (32, __SI__);
__intN_t (64, __DI__);
+#endif
+
+__u_intN_t (8, __QI__);
+__u_intN_t (16, __HI__);
+__u_intN_t (32, __SI__);
__u_intN_t (64, __DI__);
typedef int register_t __attribute__ ((__mode__ (__word__)));
diff --git a/posix/sys/utsname.h b/posix/sys/utsname.h
index e9891609bc..bebef5d456 100644
--- a/posix/sys/utsname.h
+++ b/posix/sys/utsname.h
@@ -21,13 +21,14 @@
*/
#ifndef _SYS_UTSNAME_H
-
#define _SYS_UTSNAME_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <utsnamelen.h>
+#include <bits/utsname.h>
+
#ifndef _UTSNAME_NODENAME_LENGTH
#define _UTSNAME_NODENAME_LENGTH _UTSNAME_LENGTH
#endif
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index a13b825638..f573d778f7 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -21,17 +21,17 @@
*/
#ifndef _SYS_WAIT_H
-
#define _SYS_WAIT_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
/* This will define the `W*' macros for the flag
bits to `waitpid', `wait3', and `wait4'. */
-#include <waitflags.h>
+#include <bits/waitflags.h>
#ifdef __USE_BSD
@@ -79,7 +79,7 @@ typedef union
#endif /* Use BSD. */
/* This will define all the `__W*' macros. */
-#include <waitstatus.h>
+#include <bits/waitstatus.h>
#define WEXITSTATUS(status) __WEXITSTATUS(__WAIT_INT(status))
#define WTERMSIG(status) __WTERMSIG(__WAIT_INT(status))
diff --git a/posix/tar.h b/posix/tar.h
index fef6413ceb..f8264a0f7f 100644
--- a/posix/tar.h
+++ b/posix/tar.h
@@ -19,7 +19,6 @@
Boston, MA 02111-1307, USA. */
#ifndef _TAR_H
-
#define _TAR_H 1
/* A tar archive consists of 512-byte blocks.
diff --git a/posix/unistd.h b/posix/unistd.h
index 8f1dd35ce1..8593b03349 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -21,8 +21,8 @@
*/
#ifndef _UNISTD_H
-
#define _UNISTD_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -135,7 +135,7 @@ __BEGIN_DECLS
_POSIX_PRIO_IO Prioritized Asynchronous I/O may be performed.
*/
-#include <posix_opt.h>
+#include <bits/posix_opt.h>
/* Standard file descriptors. */
@@ -146,7 +146,7 @@ __BEGIN_DECLS
/* All functions that are not declared anywhere else. */
-#include <gnu/types.h>
+#include <bits/types.h>
#ifndef ssize_t
typedef __ssize_t ssize_t;
@@ -392,7 +392,7 @@ extern void _exit __P ((int __status)) __attribute__ ((__noreturn__));
/* Get the `_PC_*' symbols for the NAME argument to `pathconf' and `fpathconf';
the `_SC_*' symbols for the NAME argument to `sysconf';
and the `_CS_*' symbols for the NAME argument to `confstr'. */
-#include <confname.h>
+#include <bits/confname.h>
/* Get file-specific configuration information about PATH. */
extern long int __pathconf __P ((__const char *__path, int __name));
diff --git a/posix/wordexp.h b/posix/wordexp.h
index a90f022c16..6fa02b78c4 100644
--- a/posix/wordexp.h
+++ b/posix/wordexp.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _WORDEXP_H
-
#define _WORDEXP_H 1
+
#include <features.h>
__BEGIN_DECLS
diff --git a/posix1_lim.h b/posix1_lim.h
deleted file mode 100644
index 2999802ec3..0000000000
--- a/posix1_lim.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <posix/posix1_lim.h>
diff --git a/posix2_lim.h b/posix2_lim.h
deleted file mode 100644
index 34c4d90df5..0000000000
--- a/posix2_lim.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <posix/posix2_lim.h>
diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c
index 63f62fcf6d..0b5a16941f 100644
--- a/pwd/fgetpwent.c
+++ b/pwd/fgetpwent.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <pwd.h>
#include <stdlib.h>
diff --git a/pwd/pwd.h b/pwd/pwd.h
index e2825d8fc6..1910f07f77 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -21,13 +21,13 @@
*/
#ifndef _PWD_H
-
#define _PWD_H 1
+
#include <features.h>
__BEGIN_DECLS
-#include <gnu/types.h>
+#include <bits/types.h>
#define __need_size_t
#include <stddef.h>
diff --git a/resolv/Makefile b/resolv/Makefile
index 4d11b4d366..f48f841b9a 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -39,7 +39,9 @@ vpath %.c nss_dns
libnss_dns-routines := dns-host dns-network
libnss_dns-map := libnss_dns.map
+ifneq ($(build-static-nss),yes)
libnss_dns-inhibit-o = $(filter-out .so,$(object-suffixes))
+endif
include ../Rules
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index 4db67d0602..34597500ed 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -80,8 +80,8 @@
* $Id$
*/
-#ifndef _NAMESER_H_
-#define _NAMESER_H_
+#ifndef _ARPA_NAMESER_H
+#define _ARPA_NAMESER_H 1
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
@@ -389,4 +389,4 @@ extern u_int32_t _getlong __P((const u_char *));
(cp) += INT32SZ; \
}
-#endif /* !_NAMESER_H_ */
+#endif /* arpa/nameser.h */
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 8f96528504..c59553c7ed 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -21,8 +21,8 @@
system calls). */
#ifndef _NETDB_H
-
#define _NETDB_H 1
+
#include <features.h>
/* This is necessary to make this include file properly replace the
diff --git a/resolv/resolv.h b/resolv/resolv.h
index b14cda0634..4dae715659 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -58,8 +58,8 @@
* $Id$
*/
-#ifndef _RESOLV_H_
-#define _RESOLV_H_
+#ifndef _RESOLV_H
+#define _RESOLV_H 1
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
@@ -293,4 +293,4 @@ int res_queriesmatch __P((const u_char *, const u_char *,
void res_close __P((void));
__END_DECLS
-#endif /* !_RESOLV_H_ */
+#endif /* resolv.h */
diff --git a/resource/Makefile b/resource/Makefile
index f25ef2e971..38d5a2c379 100644
--- a/resource/Makefile
+++ b/resource/Makefile
@@ -18,7 +18,7 @@
subdir := resource
-headers := sys/resource.h resourcebits.h sys/vlimit.h sys/vtimes.h
+headers := sys/resource.h bits/resource.h sys/vlimit.h sys/vtimes.h
routines := getrlimit setrlimit getrusage ulimit vlimit vtimes \
getpriority setpriority nice
diff --git a/resource/sys/resource.h b/resource/sys/resource.h
index 9af9b6a438..e0158767f6 100644
--- a/resource/sys/resource.h
+++ b/resource/sys/resource.h
@@ -17,14 +17,14 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_RESOURCE_H
-
#define _SYS_RESOURCE_H 1
+
#include <features.h>
__BEGIN_DECLS
/* Get the system-dependent definitions of structures and bit values. */
-#include <resourcebits.h>
+#include <bits/resource.h>
/* Put the soft and hard limits for RESOURCE in *RLIMITS.
Returns 0 if successful, -1 if not (and sets errno). */
@@ -68,4 +68,4 @@ extern int setpriority __P ((enum __priority_which __which, int __who,
__END_DECLS
-#endif /* resource.h */
+#endif /* sys/resource.h */
diff --git a/resource/sys/vlimit.h b/resource/sys/vlimit.h
index 4d07fab713..d66368ab92 100644
--- a/resource/sys/vlimit.h
+++ b/resource/sys/vlimit.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_VLIMIT_H
-
#define _SYS_VLIMIT_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -65,4 +65,4 @@ extern int vlimit __P ((enum __vlimit_resource __resource, int __value));
__END_DECLS
-#endif /* vlimit.h */
+#endif /* sys/vlimit.h */
diff --git a/resource/sys/vtimes.h b/resource/sys/vtimes.h
index 8546327d7c..51117d4108 100644
--- a/resource/sys/vtimes.h
+++ b/resource/sys/vtimes.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_VTIMES_H
-
#define _SYS_VTIMES_H 1
+
#include <features.h>
__BEGIN_DECLS
diff --git a/setjmp/Makefile b/setjmp/Makefile
index 0825dcfaa3..d9eba8718d 100644
--- a/setjmp/Makefile
+++ b/setjmp/Makefile
@@ -21,7 +21,7 @@
#
subdir := setjmp
-headers := setjmp.h jmp_buf.h
+headers := setjmp.h bits/setjmp.h
routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \
longjmp __longjmp jmp-unwind
diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h
index eb4305f5bd..0bb6fd64ca 100644
--- a/setjmp/setjmp.h
+++ b/setjmp/setjmp.h
@@ -21,15 +21,14 @@
*/
#ifndef _SETJMP_H
-
#define _SETJMP_H 1
+
#include <features.h>
__BEGIN_DECLS
-/* Get the machine-dependent definition of `__jmp_buf'. */
-#include <jmp_buf.h>
-#include <sigset.h> /* Get `__sigset_t'. */
+#include <bits/setjmp.h> /* Get `__jmp_buf'. */
+#include <bits/sigset.h> /* Get `__sigset_t'. */
/* Calling environment, plus possibly a saved signal mask. */
typedef struct __jmp_buf_tag /* C++ doesn't like tagless structs. */
diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c
index bd54c7e595..902c95eb04 100644
--- a/shadow/fgetspent.c
+++ b/shadow/fgetspent.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <shadow.h>
#include <stdlib.h>
diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c
index ffe157e119..885ac54bf6 100644
--- a/shadow/lckpwdf.c
+++ b/shadow/lckpwdf.c
@@ -19,7 +19,7 @@
Boston, MA 02111-1307, USA. */
#include <fcntl.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <shadow.h>
#include <signal.h>
#include <string.h>
diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c
index ecfe01ed1d..f6818aa6c4 100644
--- a/shadow/sgetspent.c
+++ b/shadow/sgetspent.c
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <shadow.h>
#include <stdlib.h>
diff --git a/shadow/shadow.h b/shadow/shadow.h
index 2bd52d8fbf..d32d440c0a 100644
--- a/shadow/shadow.h
+++ b/shadow/shadow.h
@@ -19,8 +19,8 @@
/* Declaration of types and functions for shadow password suite. */
#ifndef _SHADOW_H
-
#define _SHADOW_H 1
+
#include <features.h>
#include <paths.h>
diff --git a/signal/Makefile b/signal/Makefile
index a8e26ed239..e35fb12345 100644
--- a/signal/Makefile
+++ b/signal/Makefile
@@ -21,7 +21,8 @@
#
subdir := signal
-headers := signal.h sys/signal.h signum.h sigcontext.h sigaction.h sigset.h
+headers := signal.h sys/signal.h bits/signum.h bits/sigcontext.h \
+ bits/sigaction.h bits/sigset.h
routines := signal raise killpg \
sigaction sigprocmask kill \
diff --git a/signal/signal.h b/signal/signal.h
index 995567eed8..4e5d857d10 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -29,8 +29,8 @@
__BEGIN_DECLS
-#include <gnu/types.h>
-#include <sigset.h> /* __sigset_t, __sig_atomic_t. */
+#include <bits/types.h>
+#include <bits/sigset.h> /* __sigset_t, __sig_atomic_t. */
#if !defined __sig_atomic_t_defined \
&& (defined _SIGNAL_H || defined __need_sig_atomic_t)
@@ -42,7 +42,7 @@ typedef __sig_atomic_t sig_atomic_t;
#ifdef _SIGNAL_H
-#include <signum.h>
+#include <bits/signum.h>
/* Type of a signal handler. */
typedef void (*__sighandler_t) __P ((int));
@@ -198,7 +198,7 @@ extern int sigorset __P ((sigset_t *__set, __const sigset_t *__left,
/* Get the system-specific definitions of `struct sigaction'
and the `SA_*' and `SIG_*'. constants. */
-#include <sigaction.h>
+#include <bits/sigaction.h>
/* Get and/or change the set of blocked signals. */
extern int __sigprocmask __P ((int __how,
@@ -264,7 +264,7 @@ extern int sigvec __P ((int __sig, __const struct sigvec *__vec,
/* Get machine-dependent `struct sigcontext' and signal subcodes. */
-#include <sigcontext.h>
+#include <bits/sigcontext.h>
/* Restore the state saved in SCP. */
extern int __sigreturn __P ((struct sigcontext *__scp));
diff --git a/signal/sigsetops.c b/signal/sigsetops.c
index 758ddd1e22..9a3a834d5b 100644
--- a/signal/sigsetops.c
+++ b/signal/sigsetops.c
@@ -1,5 +1,5 @@
/* Define the real-function versions of all inline functions
- defined in signal.h (or sigset.h). */
+ defined in signal.h (or bits/sigset.h). */
#define _EXTERN_INLINE
diff --git a/socket/Makefile b/socket/Makefile
index 3af3dc9d39..1651b75e1c 100644
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -21,7 +21,7 @@
#
subdir := socket
-headers := sys/socket.h sys/un.h sockaddrcom.h socketbits.h
+headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h
routines := accept bind connect getpeername getsockname getsockopt \
listen recv recvfrom recvmsg send sendmsg sendto \
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index bb4444d192..aa2309c013 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_SOCKET_H
-
#define _SYS_SOCKET_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -31,7 +31,7 @@ __BEGIN_DECLS
/* This operating system-specific header file defines the SOCK_*, PF_*,
AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
`struct msghdr', and `struct linger' types. */
-#include <socketbits.h>
+#include <bits/socket.h>
#ifdef __USE_BSD
/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
diff --git a/socket/sys/un.h b/socket/sys/un.h
index 331f49650f..03f36058bf 100644
--- a/socket/sys/un.h
+++ b/socket/sys/un.h
@@ -17,14 +17,14 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_UN_H
-
#define _SYS_UN_H 1
+
#include <sys/cdefs.h>
#include <string.h> /* For prototype of `strlen'. */
/* Get the definition of the macro to define the common sockaddr members. */
-#include <sockaddrcom.h>
+#include <bits/sockaddr.h>
__BEGIN_DECLS
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 86c64762f5..95a606230a 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -21,7 +21,7 @@
#
subdir := stdio-common
-headers := stdio_lim.h printf.h
+headers := bits/stdio_lim.h printf.h
routines := \
ctermid cuserid \
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 856c65dbb5..db6f3e4842 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <errno.h>
#include <wchar.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <sys/param.h>
#include "_itoa.h"
#include "../locale/localeinfo.h"
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 0b24b8bb52..bce319eeaf 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <wctype.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#ifdef __GNUC__
#define HAVE_LONGLONG
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 7171c094e4..c443ecd795 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -38,7 +38,7 @@ __BEGIN_DECLS
#define __gnuc_va_list __ptr_t
#endif
-#include <gnu/types.h>
+#include <bits/types.h>
#endif /* Don't need FILE. */
#undef __need_FILE
@@ -272,7 +272,7 @@ extern int __stdio_check_offset __P ((FILE *__stream));
L_cuserid How long an array to pass to `cuserid'.
FOPEN_MAX Minimum number of files that can be open at once.
FILENAME_MAX Maximum length of a filename. */
-#include <stdio_lim.h>
+#include <bits/stdio_lim.h>
/* All the known streams are in a linked list
diff --git a/stdlib/alloca.h b/stdlib/alloca.h
index 07e794c292..485994226e 100644
--- a/stdlib/alloca.h
+++ b/stdlib/alloca.h
@@ -18,6 +18,7 @@
#ifndef _ALLOCA_H
#define _ALLOCA_H 1
+
#include <features.h>
#define __need_size_t
diff --git a/stdlib/atexit.c b/stdlib/atexit.c
index a49f219158..7205f50dc0 100644
--- a/stdlib/atexit.c
+++ b/stdlib/atexit.c
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdlib.h>
#include "exit.h"
diff --git a/stdlib/exit.h b/stdlib/exit.h
index 27120aeaa1..dcaa85a442 100644
--- a/stdlib/exit.h
+++ b/stdlib/exit.h
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
#ifndef _EXIT_H
+#define _EXIT_H 1
struct exit_function
{
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index 9ce492bdc4..cbe4291246 100644
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -18,7 +18,7 @@
Boston, MA 02111-1307, USA. */
#include <fmtmsg.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/stdlib/fmtmsg.h b/stdlib/fmtmsg.h
index 5b477a2ecb..b87644f0ee 100644
--- a/stdlib/fmtmsg.h
+++ b/stdlib/fmtmsg.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef __FMTMSG_H
-
#define __FMTMSG_H 1
+
#include <features.h>
#define __need_NULL
diff --git a/stdlib/monetary.h b/stdlib/monetary.h
index 17edea57e6..aa9aa63986 100644
--- a/stdlib/monetary.h
+++ b/stdlib/monetary.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _MONETARY_H
-
#define _MONETARY_H 1
+
#include <features.h>
/* Get needed types. */
diff --git a/stdlib/random.c b/stdlib/random.c
index 370a6105d5..e2f40c112e 100644
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -22,7 +22,7 @@
* Rewritten to use reentrant functions by Ulrich Drepper, 1995.
*/
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 40c24eb8f0..7963cb6fec 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -21,8 +21,8 @@
*/
#ifndef _STDLIB_H
-
#define _STDLIB_H 1
+
#include <features.h>
/* Get size_t, wchar_t and NULL from <stddef.h>. */
diff --git a/string/argz.h b/string/argz.h
index 0126235b8f..71e94c9167 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __ARGZ_H__
+#ifndef _ARGZ_H
+#define _ARGZ_H 1
-#define __ARGZ_H__ 1
#include <features.h>
#define __need_error_t
diff --git a/string/endian.h b/string/endian.h
index 593b419637..338c42ec35 100644
--- a/string/endian.h
+++ b/string/endian.h
@@ -18,6 +18,7 @@
#ifndef _ENDIAN_H
#define _ENDIAN_H 1
+
#include <features.h>
/* Definitions for byte order, according to significance of bytes, from low
@@ -31,7 +32,7 @@
#define __PDP_ENDIAN 3412
/* This file defines `__BYTE_ORDER' for the particular machine. */
-#include <bytesex.h>
+#include <bits/endian.h>
#ifdef __USE_BSD
#define LITTLE_ENDIAN __LITTLE_ENDIAN
diff --git a/string/envz.h b/string/envz.h
index 23aaed6119..dc6f55725d 100644
--- a/string/envz.h
+++ b/string/envz.h
@@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __ENVZ_H__
+#ifndef _ENVZ_H
+#define _ENVZ_H 1
-#define __ENVZ_H__ 1
#include <features.h>
#include <errno.h>
@@ -60,4 +60,4 @@ extern void envz_strip __P ((char **__envz, size_t *__envz_len));
__END_DECLS
-#endif /* __ENVZ_H__ */
+#endif /* envz.h */
diff --git a/string/memory.h b/string/memory.h
index a7634fe90b..952060d431 100644
--- a/string/memory.h
+++ b/string/memory.h
@@ -21,8 +21,8 @@
*/
#ifndef _MEMORY_H
-
#define _MEMORY_H 1
+
#include <features.h>
diff --git a/string/string.h b/string/string.h
index 24beb6caa2..f790a246f9 100644
--- a/string/string.h
+++ b/string/string.h
@@ -21,8 +21,8 @@
*/
#ifndef _STRING_H
-
#define _STRING_H 1
+
#include <features.h>
__BEGIN_DECLS
diff --git a/string/strings.h b/string/strings.h
index f8ede2966c..701132992a 100644
--- a/string/strings.h
+++ b/string/strings.h
@@ -19,8 +19,8 @@
/* Compatibility with BSD string(3). */
#ifndef _STRINGS_H
-
#define _STRINGS_H 1
+
#include <features.h>
diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h
index d006f51f72..ed3b9322cb 100644
--- a/sunrpc/rpc/auth_unix.h
+++ b/sunrpc/rpc/auth_unix.h
@@ -43,8 +43,8 @@
*/
#ifndef _RPC_AUTH_UNIX_H
-
#define _RPC_AUTH_UNIX_H 1
+
#include <features.h>
#include <sys/types.h>
#include <rpc/types.h>
diff --git a/sunrpc/rpc/clnt.h b/sunrpc/rpc/clnt.h
index 43a599ad25..0991eea937 100644
--- a/sunrpc/rpc/clnt.h
+++ b/sunrpc/rpc/clnt.h
@@ -35,8 +35,8 @@
*/
#ifndef _RPC_CLNT_H
-
#define _RPC_CLNT_H 1
+
#include <features.h>
#include <sys/types.h>
#include <rpc/types.h>
diff --git a/sunrpc/rpc/netdb.h b/sunrpc/rpc/netdb.h
index 914f825ad4..6b820c84d0 100644
--- a/sunrpc/rpc/netdb.h
+++ b/sunrpc/rpc/netdb.h
@@ -34,8 +34,8 @@
In GNU this file is #include'd by <netdb.h>. */
#ifndef _RPC_NETDB_H
-
#define _RPC_NETDB_H 1
+
#include <features.h>
#define __need_size_t
diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
index 45639e7dc4..5d732a1b11 100644
--- a/sunrpc/rpc/pmap_clnt.h
+++ b/sunrpc/rpc/pmap_clnt.h
@@ -37,6 +37,7 @@
#ifndef _RPC_PMAP_CLNT_H
#define _RPC_PMAP_CLNT_H 1
+
#include <features.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
diff --git a/sunrpc/rpc/pmap_prot.h b/sunrpc/rpc/pmap_prot.h
index 227d1a0619..52185d319a 100644
--- a/sunrpc/rpc/pmap_prot.h
+++ b/sunrpc/rpc/pmap_prot.h
@@ -36,8 +36,8 @@
*/
#ifndef _RPC_PMAP_PROT_H
-
#define _RPC_PMAP_PROT_H 1
+
#include <features.h>
#include <rpc/xdr.h>
diff --git a/sunrpc/rpc/pmap_rmt.h b/sunrpc/rpc/pmap_rmt.h
index 6d32045c8e..bb35ad63e1 100644
--- a/sunrpc/rpc/pmap_rmt.h
+++ b/sunrpc/rpc/pmap_rmt.h
@@ -36,8 +36,8 @@
*/
#ifndef _RPC_PMAP_RMT_H
-
#define _RPC_PMAP_RMT_H 1
+
#include <features.h>
#include <sys/types.h>
#include <rpc/types.h>
diff --git a/sunrpc/rpc/rpc.h b/sunrpc/rpc/rpc.h
index f4328ef26f..a966d2e231 100644
--- a/sunrpc/rpc/rpc.h
+++ b/sunrpc/rpc/rpc.h
@@ -34,8 +34,9 @@
*
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
-#ifndef __RPC_HEADER__
-#define __RPC_HEADER__
+
+#ifndef _RPC_RPC_H
+#define _RPC_RPC_H 1
#include <rpc/types.h> /* some typedefs */
#include <netinet/in.h>
@@ -66,4 +67,4 @@
/* routines for parsing /etc/rpc */
#include <rpc/netdb.h> /* structures and routines to parse /etc/rpc */
-#endif /* ndef __RPC_HEADER__ */
+#endif /* rpc/rpc.h */
diff --git a/sunrpc/rpc/rpc_msg.h b/sunrpc/rpc/rpc_msg.h
index 73996169d6..e2908ac9c4 100644
--- a/sunrpc/rpc/rpc_msg.h
+++ b/sunrpc/rpc/rpc_msg.h
@@ -31,6 +31,7 @@
#ifndef _RPC_MSG_H
#define _RPC_MSG_H 1
+
#include <sys/cdefs.h>
#include <rpc/xdr.h>
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index f7b05452cc..81366aedb6 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -34,8 +34,8 @@
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
-#ifndef __SVC_HEADER__
-#define __SVC_HEADER__
+#ifndef _RPC_SVC_H
+#define _RPC_SVC_H 1
#include <features.h>
#include <rpc/rpc_msg.h>
@@ -307,4 +307,4 @@ extern SVCXPRT *svctcp_create __P ((int __sock, u_int __sendsize,
__END_DECLS
-#endif /* !__SVC_HEADER__ */
+#endif /* rpc/svc.h */
diff --git a/sunrpc/rpc/svc_auth.h b/sunrpc/rpc/svc_auth.h
index 320a03a3bd..ad08b71c7b 100644
--- a/sunrpc/rpc/svc_auth.h
+++ b/sunrpc/rpc/svc_auth.h
@@ -36,8 +36,8 @@
*/
#ifndef _RPC_SVC_AUTH_H
-
#define _RPC_SVC_AUTH_H 1
+
#include <features.h>
#include <rpc/svc.h>
diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
index fbfda1a3db..54673d598b 100644
--- a/sunrpc/rpc/types.h
+++ b/sunrpc/rpc/types.h
@@ -32,8 +32,8 @@
/*
* Rpc additions to <sys/types.h>
*/
-#ifndef __TYPES_RPC_HEADER__
-#define __TYPES_RPC_HEADER__
+#ifndef _RPC_TYPES_H
+#define _RPC_TYPES_H 1
typedef int bool_t;
typedef int enum_t;
@@ -71,4 +71,4 @@ typedef int enum_t;
#define MAXHOSTNAMELEN 64
#endif
-#endif /* ndef __TYPES_RPC_HEADER__ */
+#endif /* rpc/types.h */
diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h
index e988896196..d0ab0d0cf6 100644
--- a/sunrpc/rpc/xdr.h
+++ b/sunrpc/rpc/xdr.h
@@ -35,9 +35,9 @@
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
-#ifndef __XDR_HEADER__
+#ifndef _RPC_XDR_H
+#define _RPC_XDR_H 1
-#define __XDR_HEADER__
#include <features.h>
#include <sys/types.h>
#include <rpc/types.h>
@@ -335,4 +335,4 @@ extern void xdr_free __P ((xdrproc_t __proc, char *__objp));
__END_DECLS
-#endif /* !__XDR_HEADER__ */
+#endif /* rpc/xdr.h */
diff --git a/sysdeps/alpha/bytesex.h b/sysdeps/alpha/bits/endian.h
index e873d2123c..e873d2123c 100644
--- a/sysdeps/alpha/bytesex.h
+++ b/sysdeps/alpha/bits/endian.h
diff --git a/sysdeps/alpha/jmp_buf.h b/sysdeps/alpha/bits/setjmp.h
index 6e6f6b4727..6e6f6b4727 100644
--- a/sysdeps/alpha/jmp_buf.h
+++ b/sysdeps/alpha/bits/setjmp.h
diff --git a/sysdeps/alpha/fpu/fenvbits.h b/sysdeps/alpha/fpu/bits/fenv.h
index 02414e4c30..7cb0e3e543 100644
--- a/sysdeps/alpha/fpu/fenvbits.h
+++ b/sysdeps/alpha/fpu/bits/fenv.h
@@ -17,10 +17,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* This file should never be included directly. */
+#ifndef _FENV_H
+#error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
+#endif
-#ifndef _FENVBITS_H
-#define _FENVBITS_H 1
/* Define the bits representing the exception.
@@ -102,6 +102,3 @@ typedef unsigned long fenv_t;
/* The system calls to talk to the kernel's FP code. */
extern unsigned long __ieee_get_fp_control(void);
extern void __ieee_set_fp_control(unsigned long);
-
-
-#endif /* fenvbits.h */
diff --git a/sysdeps/alpha/fpu/bits/mathdef.h b/sysdeps/alpha/fpu/bits/mathdef.h
new file mode 100644
index 0000000000..0bc9c94ecc
--- /dev/null
+++ b/sysdeps/alpha/fpu/bits/mathdef.h
@@ -0,0 +1,64 @@
+/* Copyright (C) 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _MATH_H
+#error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
+/* FIXME! This file describes properties of the compiler, not the machine;
+ it should not be part of libc! */
+
+#ifdef __GNUC__
+#if __STDC__ == 1
+
+/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */
+typedef float float_t;
+typedef double double_t;
+
+/* Signal that types stay as they were declared. */
+#define FLT_EVAL_METHOD 0
+
+/* Define `INFINITY' as value of type `float_t'. */
+#define INFINITY HUGE_VALF
+
+#else
+
+/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
+typedef double float_t;
+typedef double double_t;
+
+/* Signal that both types are `double'. */
+#define FLT_EVAL_METHOD 1
+
+/* Define `INFINITY' as value of type `float_t'. */
+#define INFINITY HUGE_VAL
+
+#endif
+#else
+
+/* Wild guess at types for float_t and double_t. */
+typedef double float_t;
+typedef double double_t;
+
+/* Strange compiler, we don't know how it works. */
+#define FLT_EVAL_METHOD -1
+
+/* Define `INFINITY' as value of type `float_t'. */
+#define INFINITY HUGE_VAL
+
+#endif
diff --git a/sysdeps/alpha/__math.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 0f76027317..0f76027317 100644
--- a/sysdeps/alpha/__math.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
diff --git a/sysdeps/alpha/w_sqrt.S b/sysdeps/alpha/w_sqrt.S
index cf5ae097fd..32b06887d5 100644
--- a/sysdeps/alpha/w_sqrt.S
+++ b/sysdeps/alpha/w_sqrt.S
@@ -25,7 +25,7 @@
#ifndef _IEEE_FP
#define _ERRNO_H
-#include <errnos.h>
+#include <bits/errno.h>
#include <sysdep.h>
.set noreorder
diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S
index 5443761f0a..b027103d60 100644
--- a/sysdeps/arm/__longjmp.S
+++ b/sysdeps/arm/__longjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
/* __longjmp(jmpbuf, val) */
diff --git a/sysdeps/arm/bytesex.h b/sysdeps/arm/bits/endian.h
index 32f8489df2..32f8489df2 100644
--- a/sysdeps/arm/bytesex.h
+++ b/sysdeps/arm/bits/endian.h
diff --git a/sysdeps/arm/jmp_buf.h b/sysdeps/arm/bits/setjmp.h
index 93b0f5f916..93b0f5f916 100644
--- a/sysdeps/arm/jmp_buf.h
+++ b/sysdeps/arm/bits/setjmp.h
diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S
index 5891cb9dec..8f99e4fcb4 100644
--- a/sysdeps/arm/setjmp.S
+++ b/sysdeps/arm/setjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
/* Binary compatibility entry point. */
ENTRY (__setjmp)
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index 5513ca998c..110669ccb5 100644
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -41,7 +41,7 @@ $(objpfx)siglist.c: $(objpfx)make_siglist
mv $@-tmp $@
make_siglist-CFLAGS = -DSIGNUM_H=\"$(shell pwd)/$(firstword $(wildcard \
- $(+sysdep_dirs:%=%/signum.h)))\"
+ $(+sysdep_dirs:%=%/bits/signum.h)))\"
$(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c
$(native-compile)
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index c1969f4d1f..a38022a1a9 100644
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h
new file mode 100644
index 0000000000..5b5cf742b6
--- /dev/null
+++ b/sysdeps/generic/bits/confname.h
@@ -0,0 +1,325 @@
+/* `sysconf', `pathconf', and `confstr' NAME values. Generic version.
+ Copyright (C) 1993, 1995, 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* Values for the NAME argument to `pathconf' and `fpathconf'. */
+enum
+ {
+ _PC_LINK_MAX,
+#define _PC_LINK_MAX _PC_LINK_MAX
+ _PC_MAX_CANON,
+#define _PC_MAX_CANON _PC_MAX_CANON
+ _PC_MAX_INPUT,
+#define _PC_MAX_INPUT _PC_MAX_INPUT
+ _PC_NAME_MAX,
+#define _PC_NAME_MAX _PC_NAME_MAX
+ _PC_PATH_MAX,
+#define _PC_PATH_MAX _PC_PATH_MAX
+ _PC_PIPE_BUF,
+#define _PC_PIPE_BUF _PC_PIPE_BUF
+ _PC_CHOWN_RESTRICTED,
+#define _PC_CHOWN_RESTRICTED _PC_CHOWN_RESTRICTED
+ _PC_NO_TRUNC,
+#define _PC_NO_TRUNC _PC_NO_TRUNC
+ _PC_VDISABLE,
+ _PC_SYNC_IO,
+#define _PC_SYNC_IO _PC_SYNC_IO
+ _PC_ASYNC_IO,
+#define _PC_ASYNC_IO _PC_ASYNC_IO
+ _PC_PRIO_IO,
+#define _PC_PRIO_IO _PC_PRIO_IO
+ _PC_SOCK_MAXBUF
+#define _PC_SOCK_MAXBUF _PC_SOCK_MAXBUF
+ };
+
+/* Values for the argument to `sysconf'. */
+enum
+ {
+ _SC_ARG_MAX,
+#define _SC_ARG_MAX _SC_ARG_MAX
+ _SC_CHILD_MAX,
+#define _SC_CHILD_MAX _SC_CHILD_MAX
+ _SC_CLK_TCK,
+#define _SC_CLK_TCK _SC_CLK_TCK
+ _SC_NGROUPS_MAX,
+#define _SC_NGROUPS_MAX _SC_NGROUPS_MAX
+ _SC_OPEN_MAX,
+#define _SC_OPEN_MAX _SC_OPEN_MAX
+ _SC_STREAM_MAX,
+#define _SC_STREAM_MAX _SC_STREAM_MAX
+ _SC_TZNAME_MAX,
+#define _SC_TZNAME_MAX _SC_TZNAME_MAX
+ _SC_JOB_CONTROL,
+#define _SC_JOB_CONTROL _SC_JOB_CONTROL
+ _SC_SAVED_IDS,
+#define _SC_SAVED_IDS _SC_SAVED_IDS
+ _SC_REALTIME_SIGNALS,
+#define _SC_REALTIME_SIGNALS _SC_REALTIME_SIGNALS
+ _SC_PRIORITY_SCHEDULING,
+#define _SC_PRIORITY_SCHEDULING _SC_PRIORITY_SCHEDULING
+ _SC_TIMERS,
+#define _SC_TIMERS _SC_TIMERS
+ _SC_ASYNCHRONOUS_IO,
+#define _SC_ASYNCHRONOUS_IO _SC_ASYNCHRONOUS_IO
+ _SC_PRIORITIZED_IO,
+#define _SC_PRIORITIZED_IO _SC_PRIORITIZED_IO
+ _SC_SYNCHRONIZED_IO,
+#define _SC_SYNCHRONIZED_IO _SC_SYNCHRONIZED_IO
+ _SC_FSYNC,
+#define _SC_FSYNC _SC_FSYNC
+ _SC_MAPPED_FILES,
+#define _SC_MAPPED_FILES _SC_MAPPED_FILES
+ _SC_MEMLOCK,
+#define _SC_MEMLOCK _SC_MEMLOCK
+ _SC_MEMLOCK_RANGE,
+#define _SC_MEMLOCK_RANGE _SC_MEMLOCK_RANGE
+ _SC_MEMORY_PROTECTION,
+#define _SC_MEMORY_PROTECTION _SC_MEMORY_PROTECTION
+ _SC_MESSAGE_PASSING,
+#define _SC_MESSAGE_PASSING _SC_MESSAGE_PASSING
+ _SC_SEMAPHORES,
+#define _SC_SEMAPHORES _SC_SEMAPHORES
+ _SC_SHARED_MEMORY_OBJECTS,
+#define _SC_SHARED_MEMORY_OBJECTS _SC_SHARED_MEMORY_OBJECTS
+ _SC_AIO_LISTIO_MAX,
+#define _SC_AIO_LIST_MAX _SC_AIO_LIST_MAX
+ _SC_AIO_MAX,
+#define _SC_AIO_MAX _SC_AIO_MAX
+ _SC_AIO_PRIO_DELTA_MAX,
+#define _SC_AIO_PRIO_DELTA_MAX _SC_AIO_PRIO_DELTA_MAX
+ _SC_DELAYTIMER_MAX,
+#define _SC_DELAYTIMER_MAX _SC_DELAYTIMER_MAX
+ _SC_MQ_OPEN_MAX,
+#define _SC_MQ_OPEN_MAX _SC_MQ_OPEN_MAX
+ _SC_MQ_PRIO_MAX,
+#define _SC_MQ_PRIO_MAX _SC_MQ_PRIO_MAX
+ _SC_VERSION,
+#define _SC_VERSION _SC_VERSION
+ _SC_PAGESIZE,
+#define _SC_PAGESIZE _SC_PAGESIZE
+#define _SC_PAGE_SIZE _SC_PAGESIZE
+ _SC_RTSIG_MAX,
+#define _SC_RTSIG_MAX _SC_RTSIG_MAX
+ _SC_SEM_NSEMS_MAX,
+#define _SC_SEM_NSEMS_MAX _SC_SEM_NSEMS_MAX
+ _SC_SEM_VALUE_MAX,
+#define _SC_SEM_VALUE_MAX _SC_SEM_VALUE_MAX
+ _SC_SIGQUEUE_MAX,
+#define _SC_SIGQUEUE_MAX _SC_SIGQUEUE_MAX
+ _SC_TIMER_MAX,
+#define _SC_TIMER_MAX _SC_TIMER_MAX
+
+ /* Values for the argument to `sysconf'
+ corresponding to _POSIX2_* symbols. */
+ _SC_BC_BASE_MAX,
+#define _SC_BC_BASE_MAX _SC_BC_BASE_MAX
+ _SC_BC_DIM_MAX,
+#define _SC_BC_DIM_MAX _SC_BC_DIM_MAX
+ _SC_BC_SCALE_MAX,
+#define _SC_BC_SCALE_MAX _SC_BC_SCALE_MAX
+ _SC_BC_STRING_MAX,
+#define _SC_BC_STRING_MAX _SC_BC_STRING_MAX
+ _SC_COLL_WEIGHTS_MAX,
+#define _SC_COLL_WEIGHTS_MAX _SC_COLL_WEIGHTS_MAX
+ _SC_EQUIV_CLASS_MAX,
+#define _SC_EQUIV_CLASS_MAX _SC_EQUIV_CLASS_MAX
+ _SC_EXPR_NEST_MAX,
+#define _SC_EXPR_NEST_MAX _SC_EXPR_NEST_MAX
+ _SC_LINE_MAX,
+#define _SC_LINE_MAX _SC_LINE_MAX
+ _SC_RE_DUP_MAX,
+#define _SC_RE_DUP_MAX _SC_RE_DUP_MAX
+ _SC_CHARCLASS_NAME_MAX,
+#define _SC_CHARCLASS_NAME_MAX _SC_CHARCLASS_NAME_MAX
+
+ _SC_2_VERSION,
+#define _SC_2_VERSION _SC_2_VERSION
+ _SC_2_C_BIND,
+#define _SC_2_C_BIND _SC_2_C_BIND
+ _SC_2_C_DEV,
+#define _SC_2_C_DEV _SC_2_C_DEV
+ _SC_2_FORT_DEV,
+#define _SC_2_FORT_DEV _SC_2_FORT_DEV
+ _SC_2_FORT_RUN,
+#define _SC_2_FORT_RUN _SC_2_FORT_RUN
+ _SC_2_SW_DEV,
+#define _SC_2_SW_DEV _SC_2_SW_DEV
+ _SC_2_LOCALEDEF,
+#define _SC_2_LOCALEDEF _SC_2_LOCALEDEF
+
+ _SC_PII,
+#define _SC_PII _SC_PII
+ _SC_PII_XTI,
+#define _SC_PII_XTI _SC_PII_XTI
+ _SC_PII_SOCKET,
+#define _SC_PII_SOCKET _SC_PII_SOCKET
+ _SC_PII_INTERNET,
+#define _SC_PII_INTERNET _SC_PII_INTERNET
+ _SC_PII_OSI,
+#define _SC_PII_OSI _SC_PII_OSI
+ _SC_POLL,
+#define _SC_POLL _SC_POLL
+ _SC_SELECT,
+#define _SC_SELECT _SC_SELECT
+ _SC_UIO_MAXIOV,
+#define _SC_UIO_MAXIOV _SC_UIO_MAXIOV
+ _SC_PII_INTERNET_STREAM,
+#define _SC_PII_INTERNET_STREAM _SC_PII_INTERNET_STREAM
+ _SC_PII_INTERNET_DGRAM,
+#define _SC_PII_INTERNET_DGRAM _SC_PII_INTERNET_DGRAM
+ _SC_PII_OSI_COTS,
+#define _SC_PII_OSI_COTS _SC_PII_OSI_COTS
+ _SC_PII_OSI_CLTS,
+#define _SC_PII_OSI_CLTS _SC_PII_OSI_CLTS
+ _SC_PII_OSI_M,
+#define _SC_PII_OSI_M _SC_PII_OSI_M
+ _SC_T_IOV_MAX,
+#define _SC_T_IOV_MAX _SC_T_IOV_MAX
+
+ /* Values according to POSIX 1003.1c (POSIX threads). */
+ _SC_THREADS,
+#define _SC_THREADS _SC_THREADS
+ _SC_THREAD_SAFE_FUNCTIONS,
+#define _SC_THREAD_SAFE_FUNCTIONS _SC_THREAD_SAFE_FUNCTIONS
+ _SC_GETGR_R_SIZE_MAX,
+#define _SC_GETGR_R_SIZE_MAX _SC_GETGR_R_SIZE_MAX
+ _SC_GETPW_R_SIZE_MAX,
+#define _SC_GETPW_R_SIZE_MAX _SC_GETPW_R_SIZE_MAX
+ _SC_LOGIN_NAME_MAX,
+#define _SC_LOGIN_NAME_MAX _SC_LOGIN_NAME_MAX
+ _SC_TTY_NAME_MAX,
+#define _SC_TTY_NAME_MAX _SC_TTY_NAME_MAX
+ _SC_THREAD_DESTRUCTOR_ITERATIONS,
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
+ _SC_THREAD_KEYS_MAX,
+#define _SC_THREAD_KEYS_MAX _SC_THREAD_KEYS_MAX
+ _SC_THREAD_STACK_MIN,
+#define _SC_THREAD_STACK_MIN _SC_THREAD_STACK_MIN
+ _SC_THREAD_THREADS_MAX,
+#define _SC_THREAD_THREADS_MAX _SC_THREAD_THREADS_MAX
+ _SC_THREAD_ATTR_STACKADDR,
+#define _SC_THREAD_ATTR_STACKADDR _SC_THREAD_ATTR_STACKADDR
+ _SC_THREAD_ATTR_STACKSIZE,
+#define _SC_THREAD_ATTR_STACKSIZE _SC_THREAD_ATTR_STACKSIZE
+ _SC_THREAD_PRIORITY_SCHEDULING,
+#define _SC_THREAD_PRIORITY_SCHEDULING _SC_THREAD_PRIORITY_SCHEDULING
+ _SC_THREAD_PRIO_INHERIT,
+#define _SC_THREAD_PRIO_INHERIT _SC_THREAD_PRIO_INHERIT
+ _SC_THREAD_PRIO_PROTECT,
+#define _SC_THREAD_PRIO_PROTECT _SC_THREAD_PRIO_PROTECT
+ _SC_THREAD_PROCESS_SHARED,
+#define _SC_THREAD_PROCESS_SHARED _SC_THREAD_PROCESS_SHARED
+
+ _SC_NPROCESSORS_CONF,
+#define _SC_NPROCESSORS_CONF _SC_NPROCESSORS_CONF
+ _SC_NPROCESSORS_ONLN,
+#define _SC_NPROCESSORS_ONLN _SC_NPROCESSORS_ONLN
+ _SC_PHYS_PAGES,
+#define _SC_PHYS_PAGES _SC_PHYS_PAGES
+ _SC_AVPHYS_PAGES,
+#define _SC_AVPHYS_PAGES _SC_AVPHYS_PAGES
+ _SC_ATEXIT_MAX,
+#define _SC_ATEXIT_MAX _SC_ATEXIT_MAX
+ _SC_PASS_MAX,
+#define _SC_PASS_MAX _SC_PASS_MAX
+
+ _SC_XOPEN_VERSION,
+#define _SC_XOPEN_VERSION _SC_XOPEN_VERSION
+ _SC_XOPEN_XCU_VERSION,
+#define _SC_XOPEN_XCU_VERSION _SC_XOPEN_XCU_VERSION
+ _SC_XOPEN_UNIX,
+#define _SC_XOPEN_UNIX _SC_XOPEN_UNIX
+ _SC_XOPEN_CRYPT,
+#define _SC_XOPEN_CRYPT _SC_XOPEN_CRYPT
+ _SC_XOPEN_ENH_I18N,
+#define _SC_XOPEN_ENH_I18N _SC_XOPEN_ENH_I18N
+ _SC_XOPEN_SHM,
+#define _SC_XOPEN_SHM _SC_XOPEN_SHM
+
+ _SC_2_CHAR_TERM,
+#define _SC_2_CHAR_TERM _SC_2_CHAR_TERM
+ _SC_2_C_VERSION,
+#define _SC_2_C_VERSION _SC_2_C_VERSION
+ _SC_2_UPE,
+#define _SC_2_UPE _SC_2_UPE
+
+ _SC_XOPEN_XPG2,
+#define _SC_XOPEN_XPG2 _SC_XOPEN_XPG2
+ _SC_XOPEN_XPG3,
+#define _SC_XOPEN_XPG3 _SC_XOPEN_XPG3
+ _SC_XOPEN_XPG4,
+#define _SC_XOPEN_XPG4 _SC_XOPEN_XPG4
+
+ _SC_CHAR_BIT,
+#define _SC_CHAR_BIT _SC_CHAR_BIT
+ _SC_CHAR_MAX,
+#define _SC_CHAR_MAX _SC_CHAR_MAX
+ _SC_CHAR_MIN,
+#define _SC_CHAR_MIN _SC_CHAR_MIN
+ _SC_INT_MAX,
+#define _SC_INT_MAX _SC_INT_MAX
+ _SC_INT_MIN,
+#define _SC_INT_MIN _SC_INT_MIN
+ _SC_LONG_BIT,
+#define _SC_LONG_BIT _SC_LONG_BIT
+ _SC_WORD_BIT,
+#define _SC_WORD_BIT _SC_WORD_BIT
+ _SC_MB_LEN_MAX,
+#define _SC_MB_LEN_MAX _SC_MB_LEN_MAX
+ _SC_NZERO,
+#define _SC_NZERO _SC_NZERO
+ _SC_SSIZE_MAX,
+#define _SC_SSIZE_MAX _SC_SSIZE_MAX
+ _SC_SCHAR_MAX,
+#define _SC_SCHAR_MAX _SC_SCHAR_MAX
+ _SC_SCHAR_MIN,
+#define _SC_SCHAR_MIN _SC_SCHAR_MIN
+ _SC_SHRT_MAX,
+#define _SC_SHRT_MAX _SC_SHRT_MAX
+ _SC_SHRT_MIN,
+#define _SC_SHRT_MIN _SC_SHRT_MIN
+ _SC_UCHAR_MAX,
+#define _SC_UCHAR_MAX _SC_UCHAR_MAX
+ _SC_UINT_MAX,
+#define _SC_UINT_MAX _SC_UINT_MAX
+ _SC_ULONG_MAX,
+#define _SC_ULONG_MAX _SC_ULONG_MAX
+ _SC_USHRT_MAX,
+#define _SC_USHRT_MAX _SC_USHRT_MAX
+
+ _SC_NL_ARGMAX,
+#define _SC_NL_ARGMAX _SC_NL_ARGMAX
+ _SC_NL_LANGMAX,
+#define _SC_NL_LANGMAX _SC_NL_LANGMAX
+ _SC_NL_MSGMAX,
+#define _SC_NL_MSGMAX _SC_NL_MSGMAX
+ _SC_NL_NMAX,
+#define _SC_NL_NMAX _SC_NL_NMAX
+ _SC_NL_SETMAX,
+#define _SC_NL_SETMAX _SC_NL_SETMAX
+ _SC_NL_TEXTMAX
+#define _SC_NL_TEXTMAX _SC_NL_TEXTMAX
+ };
+
+#ifdef __USE_POSIX2
+/* Values for the NAME argument to `confstr'. */
+enum
+ {
+ _CS_PATH /* The default search path. */
+ };
+#endif
diff --git a/sysdeps/generic/bits/ioctl-types.h b/sysdeps/generic/bits/ioctl-types.h
new file mode 100644
index 0000000000..1d5c8a002f
--- /dev/null
+++ b/sysdeps/generic/bits/ioctl-types.h
@@ -0,0 +1,121 @@
+/* Structure types for pre-termios terminal ioctls. Generic Unix version.
+ Copyright (C) 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/ioctl.h> instead.
+ */
+
+#ifndef _BITS_IOCTL_TYPES_H
+#define _BITS_IOCTL_TYPES_H 1
+
+
+#if defined(TIOCGETC) || defined(TIOCSETC)
+/* Type of ARG for TIOCGETC and TIOCSETC requests. */
+struct tchars
+{
+ char t_intrc; /* Interrupt character. */
+ char t_quitc; /* Quit character. */
+ char t_startc; /* Start-output character. */
+ char t_stopc; /* Stop-output character. */
+ char t_eofc; /* End-of-file character. */
+ char t_brkc; /* Input delimiter character. */
+};
+
+#define _IOT_tchars /* Hurd ioctl type field. */ \
+ _IOT (_IOTS (char), 6, 0, 0, 0, 0)
+#endif
+
+#if defined(TIOCGLTC) || defined(TIOCSLTC)
+/* Type of ARG for TIOCGLTC and TIOCSLTC requests. */
+struct ltchars
+{
+ char t_suspc; /* Suspend character. */
+ char t_dsuspc; /* Delayed suspend character. */
+ char t_rprntc; /* Reprint-line character. */
+ char t_flushc; /* Flush-output character. */
+ char t_werasc; /* Word-erase character. */
+ char t_lnextc; /* Literal-next character. */
+};
+
+#define _IOT_ltchars /* Hurd ioctl type field. */ \
+ _IOT (_IOTS (char), 6, 0, 0, 0, 0)
+#endif
+
+/* Type of ARG for TIOCGETP and TIOCSETP requests (and gtty and stty). */
+struct sgttyb
+{
+ char sg_ispeed; /* Input speed. */
+ char sg_ospeed; /* Output speed. */
+ char sg_erase; /* Erase character. */
+ char sg_kill; /* Kill character. */
+ short int sg_flags; /* Mode flags. */
+};
+
+#define _IOT_sgttyb /* Hurd ioctl type field. */ \
+ _IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0)
+
+#if defined(TIOCGWINSZ) || defined(TIOCSWINSZ)
+/* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests. */
+struct winsize
+{
+ unsigned short int ws_row; /* Rows, in characters. */
+ unsigned short int ws_col; /* Columns, in characters. */
+
+ /* These are not actually used. */
+ unsigned short int ws_xpixel; /* Horizontal pixels. */
+ unsigned short int ws_ypixel; /* Vertical pixels. */
+};
+
+#define _IOT_winsize /* Hurd ioctl type field. */ \
+ _IOT (_IOTS (unsigned short int), 4, 0, 0, 0, 0)
+#endif
+
+#if defined (TIOCGSIZE) || defined (TIOCSSIZE)
+/* The BSD-style ioctl constructor macros use `sizeof', which can't be used
+ in a preprocessor conditional. Since the commands are always unique
+ regardless of the size bits, we can safely define away `sizeof' for the
+ purpose of the conditional. */
+# define sizeof(type) 0
+# if defined (TIOCGWINSZ) && TIOCGSIZE == TIOCGWINSZ
+/* Many systems that have TIOCGWINSZ define TIOCGSIZE for source
+ compatibility with Sun; they define `struct ttysize' to have identical
+ layout as `struct winsize' and #define TIOCGSIZE to be TIOCGWINSZ
+ (likewise TIOCSSIZE and TIOCSWINSZ). */
+struct ttysize
+{
+ unsigned short int ts_lines;
+ unsigned short int ts_cols;
+ unsigned short int ts_xxx;
+ unsigned short int ts_yyy;
+};
+#define _IOT_ttysize _IOT_winsize
+# else
+/* Suns use a different layout for `struct ttysize', and TIOCGSIZE and
+ TIOCGWINSZ are separate commands that do the same thing with different
+ structures (likewise TIOCSSIZE and TIOCSWINSZ). */
+struct ttysize
+{
+ int ts_lines, ts_cols; /* Lines and columns, in characters. */
+};
+# endif
+# undef sizeof /* See above. */
+#endif
+
+
+#endif /* bits/ioctl-types.h */
diff --git a/sysdeps/generic/bits/mathdef.h b/sysdeps/generic/bits/mathdef.h
new file mode 100644
index 0000000000..93b60bd25f
--- /dev/null
+++ b/sysdeps/generic/bits/mathdef.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
+
+/* Normally, there is no long double type and the `float' and `double'
+ expressions are evaluated as `double'. */
+typedef double float_t; /* `float' expressions are evaluated as
+ `double'. */
+typedef double double_t; /* `double' expressions are evaluated as
+ `double'. */
+
+/* Signal that both types are `double'. */
+#define FLT_EVAL_METHOD 1
+
+/* Define `INFINITY' as value of type `float_t'. */
+#define INFINITY HUGE_VAL
+
+
+/* The values returned by `ilogb' for 0 and NaN respectively. */
+#define FP_ILOGB0 0x80000001
+#define FP_ILOGBNAN 0x7fffffff
diff --git a/sysdeps/generic/bits/resource.h b/sysdeps/generic/bits/resource.h
new file mode 100644
index 0000000000..2c35c12a47
--- /dev/null
+++ b/sysdeps/generic/bits/resource.h
@@ -0,0 +1,146 @@
+/* Bit values & structures for resource limits. 4.4 BSD/generic GNU version.
+ Copyright (C) 1994, 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* These are the values for 4.4 BSD and GNU. Earlier BSD systems have a
+ subset of these kinds of resource limit. In systems where `getrlimit'
+ and `setrlimit' are not system calls, these are the values used by the C
+ library to emulate them. */
+
+/* Kinds of resource limit. */
+enum __rlimit_resource
+ {
+ /* Per-process CPU limit, in seconds. */
+ RLIMIT_CPU,
+#define RLIMIT_CPU RLIMIT_CPU
+ /* Largest file that can be created, in bytes. */
+ RLIMIT_FSIZE,
+#define RLIMIT_FSIZE RLIMIT_FSIZE
+ /* Maximum size of data segment, in bytes. */
+ RLIMIT_DATA,
+#define RLIMIT_DATA RLIMIT_DATA
+ /* Maximum size of stack segment, in bytes. */
+ RLIMIT_STACK,
+#define RLIMIT_STACK RLIMIT_STACK
+ /* Largest core file that can be created, in bytes. */
+ RLIMIT_CORE,
+#define RLIMIT_CORE RLIMIT_CORE
+ /* Largest resident set size, in bytes.
+ This affects swapping; processes that are exceeding their
+ resident set size will be more likely to have physical memory
+ taken from them. */
+ RLIMIT_RSS,
+#define RLIMIT_RSS RLIMIT_RSS
+ /* Locked-in-memory address space. */
+ RLIMIT_MEMLOCK,
+#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK
+ /* Number of processes. */
+ RLIMIT_NPROC,
+#define RLIMIT_NPROC RLIMIT_NPROC
+ /* Number of open files. */
+ RLIMIT_OFILE,
+ RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing. */
+#define RLIMIT_OFILE RLIMIT_OFILE
+#define RLIMIT_NOFILE RLIMIT_NOFILE
+
+ RLIMIT_NLIMITS, /* Number of limit flavors. */
+ RLIM_NLIMITS = RLIMIT_NLIMITS, /* Traditional name for same. */
+
+ RLIM_INFINITY = 0x7fffffff /* Value to indicate that there is no limit. */
+#define RLIM_INFINITY RLIM_INFINITY
+ };
+
+struct rlimit
+ {
+ /* The current (soft) limit. */
+ int rlim_cur;
+ /* The hard limit. */
+ int rlim_max;
+ };
+
+/* Whose usage statistics do you want? */
+enum __rusage_who
+/* The macro definitions are necessary because some programs want
+ to test for operating system features with #ifdef RUSAGE_SELF.
+ In ISO C the reflexive definition is a no-op. */
+ {
+ /* The calling process. */
+ RUSAGE_SELF = 0,
+#define RUSAGE_SELF RUSAGE_SELF
+ /* All of its terminated child processes. */
+ RUSAGE_CHILDREN = -1
+#define RUSAGE_CHILDREN RUSAGE_CHILDREN
+ };
+
+#include <sys/time.h> /* For `struct timeval'. */
+
+/* Structure which says how much of each resource has been used. */
+struct rusage
+ {
+ /* Total amount of user time used. */
+ struct timeval ru_utime;
+ /* Total amount of system time used. */
+ struct timeval ru_stime;
+ /* Maximum resident set size (in kilobytes). */
+ long int ru_maxrss;
+ /* Amount of sharing of text segment memory
+ with other processes (kilobyte-seconds). */
+ long int ru_ixrss;
+ /* Amount of data segment memory used (kilobyte-seconds). */
+ long int ru_idrss;
+ /* Amount of stack memory used (kilobyte-seconds). */
+ long int ru_isrss;
+ /* Number of soft page faults (i.e. those serviced by reclaiming
+ a page from the list of pages awaiting reallocation. */
+ long int ru_minflt;
+ /* Number of hard page faults (i.e. those that required I/O). */
+ long int ru_majflt;
+ /* Number of times a process was swapped out of physical memory. */
+ long int ru_nswap;
+ /* Number of input operations via the file system. Note: This
+ and `ru_oublock' do not include operations with the cache. */
+ long int ru_inblock;
+ /* Number of output operations via the file system. */
+ long int ru_oublock;
+ /* Number of IPC messages sent. */
+ long int ru_msgsnd;
+ /* Number of IPC messages received. */
+ long int ru_msgrcv;
+ /* Number of signals delivered. */
+ long int ru_nsignals;
+ /* Number of voluntary context switches, i.e. because the process
+ gave up the process before it had to (usually to wait for some
+ resource to be available). */
+ long int ru_nvcsw;
+ /* Number of involuntary context switches, i.e. a higher priority process
+ became runnable or the current process used up its time slice. */
+ long int ru_nivcsw;
+ };
+
+/* Priority limits. */
+#define PRIO_MIN -20 /* Minimum priority a process can have. */
+#define PRIO_MAX 20 /* Maximum priority a process can have. */
+
+/* The type of the WHICH argument to `getpriority' and `setpriority',
+ indicating what flavor of entity the WHO argument specifies. */
+enum __priority_which
+ {
+ PRIO_PROCESS = 0, /* WHO is a process ID. */
+ PRIO_PGRP = 1, /* WHO is a process group ID. */
+ PRIO_USER = 2 /* WHO is a user ID. */
+ };
diff --git a/sysdeps/generic/bits/sched.h b/sysdeps/generic/bits/sched.h
new file mode 100644
index 0000000000..bb5da5676f
--- /dev/null
+++ b/sysdeps/generic/bits/sched.h
@@ -0,0 +1,35 @@
+/* Definitions of constants and data structure for POSIX 1003.1b-1993
+ scheduling interface.
+ Copyright (C) 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, write to the Free Software Foundation, Inc., 59 Temple Place
+ Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef _SCHED_H
+#error "Never use <bits/sched.h> directly; include <sched.h> instead."
+#endif
+
+
+/* Scheduling algorithms. */
+#define SCHED_OTHER 0
+#define SCHED_FIFO 1
+#define SCHED_RR 2
+
+/* Data structure to describe a process' schedulability. */
+struct sched_param
+{
+ int sched_priority;
+};
diff --git a/sysdeps/generic/bits/select.h b/sysdeps/generic/bits/select.h
new file mode 100644
index 0000000000..613919577c
--- /dev/null
+++ b/sysdeps/generic/bits/select.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_SELECT_H
+#error "Never use <bits/select.h> directly; include <sys/select.h> instead."
+#endif
+
+
+/* This line MUST be split! Otherwise m4 will not change it. */
+#define __FD_ZERO(set) \
+ ((void) memset ((__ptr_t) (set), 0, sizeof (fd_set)))
+#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
+#define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
+#define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
diff --git a/sysdeps/generic/bits/sigaction.h b/sysdeps/generic/bits/sigaction.h
new file mode 100644
index 0000000000..1676b1ce8e
--- /dev/null
+++ b/sysdeps/generic/bits/sigaction.h
@@ -0,0 +1,50 @@
+/* Copyright (C) 1991, 1992, 1996 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 Library General Public License as
+published by the Free Software Foundation; either version 2 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+/* These definitions match those used by the 4.4 BSD kernel.
+ If the operating system has a `sigaction' system call that correctly
+ implements the POSIX.1 behavior, there should be a system-dependent
+ version of this file that defines `struct sigaction' and the `SA_*'
+ constants appropriately. */
+
+/* Structure describing the action to be taken when a signal arrives. */
+struct sigaction
+ {
+ /* Signal handler. */
+ __sighandler_t sa_handler;
+
+ /* Additional set of signals to be blocked. */
+ __sigset_t sa_mask;
+
+ /* Special flags. */
+ int sa_flags;
+ };
+
+/* Bits in `sa_flags'. */
+#ifdef __USE_BSD
+#define SA_ONSTACK 0x1 /* Take signal on signal stack. */
+#define SA_RESTART 0x2 /* Don't restart syscall on signal return. */
+#define SA_DISABLE 0x4 /* Disable alternate signal stack. */
+#endif
+#define SA_NOCLDSTOP 0x8 /* Don't send SIGCHLD when children stop. */
+
+
+/* Values for the HOW argument to `sigprocmask'. */
+#define SIG_BLOCK 1 /* Block signals. */
+#define SIG_UNBLOCK 2 /* Unblock signals. */
+#define SIG_SETMASK 3 /* Set the set of blocked signals. */
diff --git a/sysdeps/generic/bits/sigset.h b/sysdeps/generic/bits/sigset.h
new file mode 100644
index 0000000000..9fad4538d7
--- /dev/null
+++ b/sysdeps/generic/bits/sigset.h
@@ -0,0 +1,81 @@
+/* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version.
+ Copyright (C) 1991, 1992, 1994, 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SIGSET_H_types
+#define _SIGSET_H_types 1
+
+typedef int __sig_atomic_t;
+
+/* A `sigset_t' has a bit for each signal. */
+typedef unsigned long int __sigset_t;
+
+#endif
+
+
+/* We only want to define these functions if <signal.h> was actually
+ included; otherwise we were included just to define the types. Since we
+ are namespace-clean, it wouldn't hurt to define extra macros. But
+ trouble can be caused by functions being defined (e.g., any global
+ register vars declared later will cause compilation errors). */
+
+#if !defined (_SIGSET_H_fns) && defined (_SIGNAL_H)
+#define _SIGSET_H_fns 1
+
+#ifndef _EXTERN_INLINE
+#define _EXTERN_INLINE extern __inline
+#endif
+
+/* Return a mask that includes SIG only. The cast to `sigset_t' avoids
+ overflow if `sigset_t' is wider than `int'. */
+#define __sigmask(sig) (((__sigset_t) 1) << ((sig) - 1))
+
+#define __sigemptyset(set) ((*(set) = (__sigset_t) 0), 0)
+#define __sigfillset(set) ((*(set) = ~(__sigset_t) 0), 0)
+
+#ifdef _GNU_SOURCE
+# define __sigisemptyset(set) (*(set) == (__sigset_t) 0)
+# define __sigandset(dest, left, right) \
+ ((*(dest) = (*(left) & *(right))), 0)
+# define __sigorset(dest, left, right) \
+ ((*(dest) = (*(left) | *(right))), 0)
+#endif
+
+/* These functions needn't check for a bogus signal number -- error
+ checking is done in the non __ versions. */
+
+extern int __sigismember (__const __sigset_t *, int);
+extern int __sigaddset (__sigset_t *, int);
+extern int __sigdelset (__sigset_t *, int);
+
+#define __SIGSETFN(NAME, BODY, CONST) \
+ _EXTERN_INLINE int \
+ NAME (CONST __sigset_t *__set, int __sig) \
+ { \
+ __sigset_t __mask = __sigmask (__sig); \
+ return BODY; \
+ }
+
+__SIGSETFN (__sigismember, (*__set & __mask) ? 1 : 0, __const)
+__SIGSETFN (__sigaddset, ((*__set |= __mask), 0), )
+__SIGSETFN (__sigdelset, ((*__set &= ~__mask), 0), )
+
+#undef __SIGSETFN
+
+
+#endif /* ! _SIGSET_H_fns. */
diff --git a/sysdeps/generic/bits/sockaddr.h b/sysdeps/generic/bits/sockaddr.h
new file mode 100644
index 0000000000..73a0e26ec4
--- /dev/null
+++ b/sysdeps/generic/bits/sockaddr.h
@@ -0,0 +1,41 @@
+/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version.
+ Copyright (C) 1995, 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/socket.h> instead.
+ */
+
+#ifndef _BITS_SOCKADDR_H
+#define _BITS_SOCKADDR_H 1
+
+
+/* POSIX.1g specifies this type name for the `sa_family' member. */
+typedef unsigned short int sa_family_t;
+
+/* This macro is used to declare the initial common members
+ of the data types used for socket addresses, `struct sockaddr',
+ `struct sockaddr_in', `struct sockaddr_un', etc. */
+
+#define __SOCKADDR_COMMON(sa_prefix) \
+ sa_family_t sa_prefix##family
+
+#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
+
+
+#endif /* bits/sockaddr.h */
diff --git a/sysdeps/generic/bits/socket.h b/sysdeps/generic/bits/socket.h
new file mode 100644
index 0000000000..d12d96cc14
--- /dev/null
+++ b/sysdeps/generic/bits/socket.h
@@ -0,0 +1,200 @@
+/* System-specific socket constants and types. Generic/4.3 BSD version.
+ Copyright (C) 1991, 92, 94, 95, 96, 97 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_SOCKET_H
+#error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+#endif
+
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+#define __need_size_t
+#include <stddef.h>
+
+
+/* Types of sockets. */
+enum __socket_type
+{
+ SOCK_STREAM = 1, /* Sequenced, reliable, connection-based
+ byte streams. */
+#define SOCK_STREAM SOCK_STREAM
+ SOCK_DGRAM = 2, /* Connectionless, unreliable datagrams
+ of fixed maximum length. */
+#define SOCK_DGRAM SOCK_DGRAM
+ SOCK_RAW = 3, /* Raw protocol interface. */
+#define SOCK_RAW SOCK_RAW
+ SOCK_RDM = 4, /* Reliably-delivered messages. */
+#define SOCK_RDM SOCK_RDM
+ SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based,
+ datagrams of fixed maximum length. */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
+};
+
+/* Protocol families. */
+#define PF_UNSPEC 0 /* Unspecified. */
+#define PF_LOCAL 1 /* Local to host (pipes and file-domain). */
+#define PF_UNIX PF_LOCAL /* Old BSD name for PF_LOCAL. */
+#define PF_FILE PF_LOCAL /* POSIX name for PF_LOCAL. */
+#define PF_INET 2 /* IP protocol family. */
+#define PF_IMPLINK 3 /* ARPAnet IMP protocol. */
+#define PF_PUP 4 /* PUP protocols. */
+#define PF_CHAOS 5 /* MIT Chaos protocols. */
+#define PF_NS 6 /* Xerox NS protocols. */
+#define PF_ISO 7 /* ISO protocols. */
+#define PF_OSI PF_ISO
+#define PF_ECMA 8 /* ECMA protocols. */
+#define PF_DATAKIT 9 /* AT&T Datakit protocols. */
+#define PF_CCITT 10 /* CCITT protocols (X.25 et al). */
+#define PF_SNA 11 /* IBM SNA protocol. */
+#define PF_DECnet 12 /* DECnet protocols. */
+#define PF_DLI 13 /* Direct data link interface. */
+#define PF_LAT 14 /* DEC Local Area Transport protocol. */
+#define PF_HYLINK 15 /* NSC Hyperchannel protocol. */
+#define PF_APPLETALK 16 /* Don't use this. */
+#define PF_ROUTE 17 /* Internal Routing Protocol. */
+#define PF_LINK 18 /* Link layer interface. */
+#define PF_XTP 19 /* eXpress Transfer Protocol (no AF). */
+#define PF_COIP 20 /* Connection-oriented IP, aka ST II. */
+#define PF_CNT 21 /* Computer Network Technology. */
+#define PF_RTIP 22 /* Help Identify RTIP packets. **/
+#define PF_IPX 23 /* Novell Internet Protocol. */
+#define PF_SIP 24 /* Simple Internet Protocol. */
+#define PF_PIP 25 /* Help Identify PIP packets. */
+#define PF_INET6 26 /* IP version 6. */
+#define PF_MAX 27
+
+/* Address families. */
+#define AF_UNSPEC PF_UNSPEC
+#define AF_LOCAL PF_LOCAL
+#define AF_UNIX PF_UNIX
+#define AF_FILE PF_FILE
+#define AF_INET PF_INET
+#define AF_IMPLINK PF_IMPLINK
+#define AF_PUP PF_PUP
+#define AF_CHAOS PF_CHAOS
+#define AF_NS PF_NS
+#define AF_ISO PF_ISO
+#define AF_OSI PF_OSI
+#define AF_ECMA PF_ECMA
+#define AF_DATAKIT PF_DATAKIT
+#define AF_CCITT PF_CCITT
+#define AF_SNA PF_SNA
+#define AF_DECnet PF_DECnet
+#define AF_DLI PF_DLI
+#define AF_LAT PF_LAT
+#define AF_HYLINK PF_HYLINK
+#define AF_APPLETALK PF_APPLETALK
+#define AF_ROUTE PF_ROUTE
+#define AF_LINK PF_LINK
+#define pseudo_AF_XTP PF_XTP
+#define AF_COIP PF_COIP
+#define AF_CNT PF_CNT
+#define pseudo_AF_RTIP PF_RTIP
+#define AF_IPX PF_IPX
+#define AF_SIP PF_SIP
+#define pseudo_AF_PIP PF_PIP
+#define AF_INET6 PF_INET6
+#define AF_MAX PF_MAX
+
+
+/* Get the definition of the macro to define the common sockaddr members. */
+#include <bits/sockaddr.h>
+
+/* Structure describing a generic socket address. */
+struct sockaddr
+ {
+ __SOCKADDR_COMMON (sa_); /* Common data: address family and length. */
+ char sa_data[14]; /* Address data. */
+ };
+
+
+/* Bits in the FLAGS argument to `send', `recv', et al. */
+enum
+ {
+ MSG_OOB = 0x01, /* Process out-of-band data. */
+ MSG_PEEK = 0x02, /* Peek at incoming messages. */
+ MSG_DONTROUTE = 0x04, /* Don't use local routing. */
+ MSG_EOR = 0x08, /* Data completes record. */
+ MSG_TRUNC = 0x10, /* Data discarded before delivery. */
+ MSG_CTRUNC = 0x20, /* Control data lost before delivery. */
+ MSG_WAITALL = 0x40, /* Wait for full request or error. */
+ MSG_DONTWAIT = 0x80, /* This message should be nonblocking. */
+ };
+
+
+/* Structure describing messages sent by
+ `sendmsg' and received by `recvmsg'. */
+struct msghdr
+ {
+ __ptr_t msg_name; /* Address to send to/receive from. */
+ size_t msg_namelen; /* Length of address data. */
+
+ struct iovec *msg_iov; /* Vector of data to send/receive into. */
+ size_t msg_iovlen; /* Number of elements in the vector. */
+
+ __ptr_t msg_accrights; /* Access rights information. */
+ size_t msg_accrightslen; /* Length of access rights information. */
+ };
+
+
+/* Protocol number used to manipulate socket-level options
+ with `getsockopt' and `setsockopt'. */
+#define SOL_SOCKET 0xffff
+
+/* Socket-level options for `getsockopt' and `setsockopt'. */
+enum
+ {
+ SO_DEBUG = 0x0001, /* Record debugging information. */
+ SO_ACCEPTCONN = 0x0002, /* Accept connections on socket. */
+ SO_REUSEADDR = 0x0004, /* Allow reuse of local addresses. */
+ SO_KEEPALIVE = 0x0008, /* Keep connections alive and send
+ SIGPIPE when they die. */
+ SO_DONTROUTE = 0x0010, /* Don't do local routing. */
+ SO_BROADCAST = 0x0020, /* Allow transmission of
+ broadcast messages. */
+ SO_USELOOPBACK = 0x0040, /* Use the software loopback to avoid
+ hardware use when possible. */
+ SO_LINGER = 0x0080, /* Block on close of a reliable
+ socket to transmit pending data. */
+ SO_OOBINLINE = 0x0100, /* Receive out-of-band data in-band. */
+
+ SO_REUSEPORT = 0x0200, /* Allow local address and port reuse. */
+
+ SO_SNDBUF = 0x1001, /* Send buffer size. */
+ SO_RCVBUF = 0x1002, /* Receive buffer. */
+ SO_SNDLOWAT = 0x1003, /* Send low-water mark. */
+ SO_RCVLOWAT = 0x1004, /* Receive low-water mark. */
+ SO_SNDTIMEO = 0x1005, /* Send timeout. */
+ SO_RCVTIMEO = 0x1006, /* Receive timeout. */
+
+ SO_ERROR = 0x1007, /* Get and clear error status. */
+ SO_STYLE = 0x1008, /* Get socket connection style. */
+ SO_TYPE = SO_STYLE, /* Compatible name for SO_STYLE. */
+ };
+
+/* Structure used to manipulate the SO_LINGER option. */
+struct linger
+ {
+ int l_onoff; /* Nonzero to linger on close. */
+ int l_linger; /* Time to linger. */
+ };
+
+__END_DECLS
diff --git a/sysdeps/generic/bits/statfs.h b/sysdeps/generic/bits/statfs.h
new file mode 100644
index 0000000000..10bc0728b2
--- /dev/null
+++ b/sysdeps/generic/bits/statfs.h
@@ -0,0 +1,52 @@
+/* Definition of `struct statfs', information about a filesystem.
+ Copyright (C) 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/statfs.h> instead.
+ */
+
+#ifndef _BITS_STATFS_H
+#define _BITS_STATFS_H 1
+
+#include <bits/types.h>
+
+/* GNU Hurd NOTE: The size of this structure (16 ints) is known in
+ <hurd/hurd_types.defs>, since it is used in the `file_statfs' RPC. MiG
+ does not cope at all well with the passed C structure not being of the
+ expected size. There are some filler words at the end to allow for
+ future expansion. To increase the size of the structure used in the RPC
+ and retain binary compatibility, we would need to assign a new message
+ number. */
+
+struct statfs
+ {
+ unsigned int f_type;
+ unsigned int f_bsize;
+ unsigned int f_blocks;
+ unsigned int f_bfree;
+ unsigned int f_bavail;
+ unsigned int f_files;
+ unsigned int f_ffree;
+ __fsid_t f_fsid;
+ unsigned int f_namelen;
+ unsigned int f_spare[6];
+ };
+
+
+#endif /* bits/statfs.h */
diff --git a/sysdeps/generic/bits/termios.h b/sysdeps/generic/bits/termios.h
new file mode 100644
index 0000000000..9a6aed2bba
--- /dev/null
+++ b/sysdeps/generic/bits/termios.h
@@ -0,0 +1,230 @@
+/* termios type and macro definitions. 4.4 BSD/generic GNU version.
+ Copyright (C) 1993, 1994, 1996 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* These macros are also defined in some <bits/ioctls.h> files (with
+ numerically identical values), but this serves to shut up cpp's
+ complaining. */
+#ifdef __USE_BSD
+
+#ifdef MDMBUF
+#undef MDMBUF
+#endif
+#ifdef FLUSHO
+#undef FLUSHO
+#endif
+#ifdef PENDIN
+#undef PENDIN
+#endif
+
+#endif /* __USE_BSD */
+
+#ifdef ECHO
+#undef ECHO
+#endif
+#ifdef TOSTOP
+#undef TOSTOP
+#endif
+#ifdef NOFLSH
+#undef NOFLSH
+#endif
+
+
+/* These definitions match those used by the 4.4 BSD kernel.
+ If the operating system has termios system calls or ioctls that
+ correctly implement the POSIX.1 behavior, there should be a
+ system-dependent version of this file that defines `struct termios',
+ `tcflag_t', `cc_t', `speed_t' and the `TC*' constants appropriately. */
+
+/* Type of terminal control flag masks. */
+typedef unsigned long int tcflag_t;
+
+/* Type of control characters. */
+typedef unsigned char cc_t;
+
+/* Type of baud rate specifiers. */
+typedef long int speed_t;
+
+/* Terminal control structure. */
+struct termios
+{
+ /* Input modes. */
+ tcflag_t c_iflag;
+#define IGNBRK (1 << 0) /* Ignore break condition. */
+#define BRKINT (1 << 1) /* Signal interrupt on break. */
+#define IGNPAR (1 << 2) /* Ignore characters with parity errors. */
+#define PARMRK (1 << 3) /* Mark parity and framing errors. */
+#define INPCK (1 << 4) /* Enable input parity check. */
+#define ISTRIP (1 << 5) /* Strip 8th bit off characters. */
+#define INLCR (1 << 6) /* Map NL to CR on input. */
+#define IGNCR (1 << 7) /* Ignore CR. */
+#define ICRNL (1 << 8) /* Map CR to NL on input. */
+#define IXON (1 << 9) /* Enable start/stop output control. */
+#define IXOFF (1 << 10) /* Enable start/stop input control. */
+#ifdef __USE_BSD
+#define IXANY (1 << 11) /* Any character will restart after stop. */
+#define IMAXBEL (1 << 13) /* Ring bell when input queue is full. */
+#endif
+
+ /* Output modes. */
+ tcflag_t c_oflag;
+#define OPOST (1 << 0) /* Perform output processing. */
+#ifdef __USE_BSD
+#define ONLCR (1 << 1) /* Map NL to CR-NL on output. */
+#define OXTABS (1 << 2) /* Expand tabs to spaces. */
+#define ONOEOT (1 << 8) /* Discard EOT (^D) on output. */
+#endif
+
+ /* Control modes. */
+ tcflag_t c_cflag;
+#ifdef __USE_BSD
+#define CIGNORE (1 << 0) /* Ignore these control flags. */
+#endif
+#define CSIZE (CS5|CS6|CS7|CS8) /* Number of bits per byte (mask). */
+#define CS5 0 /* 5 bits per byte. */
+#define CS6 (1 << 8) /* 6 bits per byte. */
+#define CS7 (1 << 9) /* 7 bits per byte. */
+#define CS8 (CS6|CS7) /* 8 bits per byte. */
+#define CSTOPB (1 << 10) /* Two stop bits instead of one. */
+#define CREAD (1 << 11) /* Enable receiver. */
+#define PARENB (1 << 12) /* Parity enable. */
+#define PARODD (1 << 13) /* Odd parity instead of even. */
+#define HUPCL (1 << 14) /* Hang up on last close. */
+#define CLOCAL (1 << 15) /* Ignore modem status lines. */
+#ifdef __USE_BSD
+#define CCTS_OFLOW (1 << 16) /* CTS flow control of output. */
+#define CRTS_IFLOW (1 << 17) /* RTS flow control of input. */
+#define MDMBUF (1 << 20) /* Carrier flow control of output. */
+#endif
+
+ /* Local modes. */
+ tcflag_t c_lflag;
+#ifdef __USE_BSD
+#define ECHOKE (1 << 0) /* Visual erase for KILL. */
+#endif
+#define _ECHOE (1 << 1) /* Visual erase for ERASE. */
+#define ECHOE _ECHOE
+#define _ECHOK (1 << 2) /* Echo NL after KILL. */
+#define ECHOK _ECHOK
+#define _ECHO (1 << 3) /* Enable echo. */
+#define ECHO _ECHO
+#define _ECHONL (1 << 4) /* Echo NL even if ECHO is off. */
+#define ECHONL _ECHONL
+#ifdef __USE_BSD
+#define ECHOPRT (1 << 5) /* Hardcopy visual erase. */
+#define ECHOCTL (1 << 6) /* Echo control characters as ^X. */
+#endif
+#define _ISIG (1 << 7) /* Enable signals. */
+#define ISIG _ISIG
+#define _ICANON (1 << 8) /* Do erase and kill processing. */
+#define ICANON _ICANON
+#ifdef __USE_BSD
+#define ALTWERASE (1 << 9) /* Alternate WERASE algorithm. */
+#endif
+#define _IEXTEN (1 << 10) /* Enable DISCARD and LNEXT. */
+#define IEXTEN _IEXTEN
+#define EXTPROC (1 << 11) /* External processing. */
+#define _TOSTOP (1 << 22) /* Send SIGTTOU for background output. */
+#define TOSTOP _TOSTOP
+#ifdef __USE_BSD
+#define FLUSHO (1 << 23) /* Output being flushed (state). */
+#define NOKERNINFO (1 << 25) /* Disable VSTATUS. */
+#define PENDIN (1 << 29) /* Retype pending input (state). */
+#endif
+#define _NOFLSH (1 << 31) /* Disable flush after interrupt. */
+#define NOFLSH _NOFLSH
+
+ /* Control characters. */
+#define VEOF 0 /* End-of-file character [ICANON]. */
+#define VEOL 1 /* End-of-line character [ICANON]. */
+#ifdef __USE_BSD
+#define VEOL2 2 /* Second EOL character [ICANON]. */
+#endif
+#define VERASE 3 /* Erase character [ICANON]. */
+#ifdef __USE_BSD
+#define VWERASE 4 /* Word-erase character [ICANON]. */
+#endif
+#define VKILL 5 /* Kill-line character [ICANON]. */
+#ifdef __USE_BSD
+#define VREPRINT 6 /* Reprint-line character [ICANON]. */
+#endif
+#define VINTR 8 /* Interrupt character [ISIG]. */
+#define VQUIT 9 /* Quit character [ISIG]. */
+#define VSUSP 10 /* Suspend character [ISIG]. */
+#ifdef __USE_BSD
+#define VDSUSP 11 /* Delayed suspend character [ISIG]. */
+#endif
+#define VSTART 12 /* Start (X-ON) character [IXON, IXOFF]. */
+#define VSTOP 13 /* Stop (X-OFF) character [IXON, IXOFF]. */
+#ifdef __USE_BSD
+#define VLNEXT 14 /* Literal-next character [IEXTEN]. */
+#define VDISCARD 15 /* Discard character [IEXTEN]. */
+#endif
+#define VMIN 16 /* Minimum number of bytes read at once [!ICANON]. */
+#define VTIME 17 /* Time-out value (tenths of a second) [!ICANON]. */
+#ifdef __USE_BSD
+#define VSTATUS 18 /* Status character [ICANON]. */
+#endif
+#define NCCS 20 /* Value duplicated in <hurd/tioctl.defs>. */
+ cc_t c_cc[NCCS];
+
+ /* Input and output baud rates. */
+ speed_t __ispeed, __ospeed;
+#define B0 0 /* Hang up. */
+#define B50 50 /* 50 baud. */
+#define B75 75 /* 75 baud. */
+#define B110 110 /* 110 baud. */
+#define B134 134 /* 134.5 baud. */
+#define B150 150 /* 150 baud. */
+#define B200 200 /* 200 baud. */
+#define B300 300 /* 300 baud. */
+#define B600 600 /* 600 baud. */
+#define B1200 1200 /* 1200 baud. */
+#define B1800 1800 /* 1800 baud. */
+#define B2400 2400 /* 2400 baud. */
+#define B4800 4800 /* 4800 baud. */
+#define B9600 9600 /* 9600 baud. */
+#define B19200 19200 /* 19200 baud. */
+#define B38400 38400 /* 38400 baud. */
+#ifdef __USE_BSD
+#define EXTA 19200
+#define EXTB 38400
+#endif
+};
+
+#define _IOT_termios /* Hurd ioctl type field. */ \
+ _IOT (_IOTS (tcflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2)
+
+/* Values for the OPTIONAL_ACTIONS argument to `tcsetattr'. */
+#define TCSANOW 0 /* Change immediately. */
+#define TCSADRAIN 1 /* Change when pending output is written. */
+#define TCSAFLUSH 2 /* Flush pending input before changing. */
+#ifdef __USE_BSD
+#define TCSASOFT 0x10 /* Flag: Don't alter hardware state. */
+#endif
+
+/* Values for the QUEUE_SELECTOR argument to `tcflush'. */
+#define TCIFLUSH 1 /* Discard data received but not yet read. */
+#define TCOFLUSH 2 /* Discard data written but not yet sent. */
+#define TCIOFLUSH 3 /* Discard all pending data. */
+
+/* Values for the ACTION argument to `tcflow'. */
+#define TCOOFF 1 /* Suspend output. */
+#define TCOON 2 /* Restart suspended output. */
+#define TCIOFF 3 /* Send a STOP character. */
+#define TCION 4 /* Send a START character. */
diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h
new file mode 100644
index 0000000000..c264adc917
--- /dev/null
+++ b/sysdeps/generic/bits/types.h
@@ -0,0 +1,94 @@
+/* Copyright (C) 1991, 92, 94, 95, 96, 97 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/types.h> instead.
+ */
+
+#ifndef _BITS_TYPES_H
+#define _BITS_TYPES_H 1
+
+
+/* Convenience types. */
+typedef unsigned char __u_char;
+typedef unsigned short __u_short;
+typedef unsigned int __u_int;
+typedef unsigned long __u_long;
+#ifdef __GNUC__
+typedef unsigned long long int __u_quad_t;
+typedef long long int __quad_t;
+#else
+typedef struct
+{
+ long __val[2];
+} __quad_t;
+typedef struct
+{
+ __u_long __val[2];
+} __u_quad_t;
+#endif
+typedef signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef signed short int __int16_t;
+typedef unsigned short int __uint16_t;
+typedef signed int __int32_t;
+typedef unsigned int __uint32_t;
+#ifdef __GNUC__
+typedef signed long long int __int64_t;
+typedef unsigned long long int __uint64_t;
+#endif
+typedef __quad_t *__qaddr_t;
+typedef int __dev_t; /* Type of device numbers. */
+typedef unsigned int __uid_t; /* Type of user identifications. */
+typedef unsigned int __gid_t; /* Type of group identifications. */
+typedef unsigned int __ino_t; /* Type of file serial numbers. */
+typedef unsigned int __mode_t; /* Type of file attribute bitmasks. */
+typedef unsigned short int __nlink_t; /* Type of file link counts. */
+typedef long int __off_t; /* Type of file sizes and offsets. */
+typedef __quad_t __loff_t; /* Type of file sizes and offsets. */
+typedef int __pid_t; /* Type of process identifications. */
+typedef int __ssize_t; /* Type of a byte count, or error. */
+typedef __u_quad_t __fsid_t; /* Type of file system IDs. */
+typedef long int __clock_t; /* Type of CPU usage counts. */
+
+/* Everythin' else. */
+typedef long int __daddr_t; /* The type of a disk address. */
+typedef char *__caddr_t;
+typedef long int __time_t;
+typedef long int __swblk_t; /* Type of a swap block maybe? */
+typedef long int __key_t; /* Type of an IPC key */
+
+/* fd_set for select. */
+
+/* Number of descriptors that can fit in an `fd_set'. */
+#define __FD_SETSIZE 256
+
+/* It's easier to assume 8-bit bytes than to get CHAR_BIT. */
+#define __NFDBITS (sizeof (unsigned long int) * 8)
+#define __FDELT(d) ((d) / __NFDBITS)
+#define __FDMASK(d) (1 << ((d) % __NFDBITS))
+
+typedef struct
+ {
+ /* XPG4.2 requires this member name. */
+ unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
+ } __fd_set;
+
+typedef unsigned long int __fd_mask;
+
+#endif /* bits/types.h */
diff --git a/sysdeps/generic/bits/uio.h b/sysdeps/generic/bits/uio.h
new file mode 100644
index 0000000000..1a12697008
--- /dev/null
+++ b/sysdeps/generic/bits/uio.h
@@ -0,0 +1,32 @@
+/* Copyright (C) 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_UIO_H
+#error "Never use <bits/uio.h> directly; include <sys/uio.h> instead."
+#endif
+
+
+/* `struct iovec' -- Structure describing a section of memory. */
+
+struct iovec
+{
+ /* Starting address. */
+ __ptr_t iov_base;
+ /* Length in bytes. */
+ size_t iov_len;
+};
diff --git a/sysdeps/generic/bits/ustat.h b/sysdeps/generic/bits/ustat.h
new file mode 100644
index 0000000000..aa5d493e63
--- /dev/null
+++ b/sysdeps/generic/bits/ustat.h
@@ -0,0 +1,30 @@
+/* Generic declaration of ustat structure.
+Copyright (C) 1994, 1996 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 Library General Public License as
+published by the Free Software Foundation; either version 2 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+__BEGIN_DECLS
+
+struct ustat
+{
+ __daddr_t f_tfree; /* total free */
+ __ino_t f_tinode; /* total inodes free */
+ char f_fname[6]; /* filesystem name */
+ char f_fpack[6]; /* filesystem pack name */
+};
+
+__END_DECLS
diff --git a/sysdeps/generic/bits/utmp.h b/sysdeps/generic/bits/utmp.h
new file mode 100644
index 0000000000..b8decb0598
--- /dev/null
+++ b/sysdeps/generic/bits/utmp.h
@@ -0,0 +1,53 @@
+/* The `struct utmp' type, describing entries in the utmp file. Generic/BSDish
+ Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _UTMP_H
+#error "Never use <bits/utmp.h> directly; include <utmp.h> instead."
+#endif
+
+
+#include <features.h>
+
+#include <paths.h>
+#include <time.h>
+
+
+#define UT_NAMESIZE 8
+#define UT_LINESIZE 8
+#define UT_HOSTSIZE 16
+
+__BEGIN_DECLS
+
+struct lastlog {
+ time_t ll_time;
+ char ll_line[UT_LINESIZE];
+ char ll_host[UT_HOSTSIZE];
+};
+
+struct utmp {
+ char ut_line[UT_LINESIZE];
+ char ut_name[UT_NAMESIZE];
+ char ut_host[UT_HOSTSIZE];
+ long ut_time;
+};
+
+
+#define _HAVE_UT_HOST 1 /* We have the ut_host field. */
+
+
+__END_DECLS
diff --git a/sysdeps/generic/bits/utsname.h b/sysdeps/generic/bits/utsname.h
new file mode 100644
index 0000000000..5594bcc4da
--- /dev/null
+++ b/sysdeps/generic/bits/utsname.h
@@ -0,0 +1,3 @@
+/* The size of the character arrays used to hold the information
+ in a `struct utsname'. Enlarge this as necessary. */
+#define _UTSNAME_LENGTH 1024
diff --git a/sysdeps/generic/bits/waitstatus.h b/sysdeps/generic/bits/waitstatus.h
new file mode 100644
index 0000000000..8e97f2702c
--- /dev/null
+++ b/sysdeps/generic/bits/waitstatus.h
@@ -0,0 +1,104 @@
+/* Definitions of status bits for `wait' et al.
+ Copyright (C) 1992, 1994, 1996, 1997 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_WAIT_H
+#error "Never use <bits/waitstatus.h> directly; include <sys/wait.h> instead."
+#endif
+
+
+/* Everything extant so far uses these same bits. */
+
+
+/* If WIFEXITED(STATUS), the low-order 8 bits of the status. */
+#define __WEXITSTATUS(status) (((status) & 0xff00) >> 8)
+
+/* If WIFSIGNALED(STATUS), the terminating signal. */
+#define __WTERMSIG(status) ((status) & 0x7f)
+
+/* If WIFSTOPPED(STATUS), the signal that stopped the child. */
+#define __WSTOPSIG(status) __WEXITSTATUS(status)
+
+/* Nonzero if STATUS indicates normal termination. */
+#define __WIFEXITED(status) (__WTERMSIG(status) == 0)
+
+/* Nonzero if STATUS indicates termination by a signal. */
+#ifdef __GNUC__
+#define __WIFSIGNALED(status) \
+ (__extension__ ({ int __status = (status); \
+ !__WIFSTOPPED(__status) && !__WIFEXITED(__status); }))
+#else /* Not GCC. */
+#define __WIFSIGNALED(status) (!__WIFSTOPPED(status) && !__WIFEXITED(status))
+#endif /* GCC. */
+
+/* Nonzero if STATUS indicates the child is stopped. */
+#define __WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
+
+/* Nonzero if STATUS indicates the child dumped core. */
+#define __WCOREDUMP(status) ((status) & __WCOREFLAG)
+
+/* Macros for constructing status values. */
+#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
+#define __W_STOPCODE(sig) ((sig) << 8 | 0x7f)
+#define __WCOREFLAG 0x80
+
+
+#ifdef __USE_BSD
+
+#include <endian.h>
+
+union wait
+ {
+ int w_status;
+ struct
+ {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned int __w_termsig:7; /* Terminating signal. */
+ unsigned int __w_coredump:1; /* Set if dumped core. */
+ unsigned int __w_retcode:8; /* Return code if exited normally. */
+ unsigned int:16;
+#endif /* Little endian. */
+#if __BYTE_ORDER == __BIG_ENDIAN
+ unsigned int:16;
+ unsigned int __w_retcode:8;
+ unsigned int __w_coredump:1;
+ unsigned int __w_termsig:7;
+#endif /* Big endian. */
+ } __wait_terminated;
+ struct
+ {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
+ unsigned int __w_stopsig:8; /* Stopping signal. */
+ unsigned int:16;
+#endif /* Little endian. */
+#if __BYTE_ORDER == __BIG_ENDIAN
+ unsigned int:16;
+ unsigned int __w_stopsig:8; /* Stopping signal. */
+ unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
+#endif /* Big endian. */
+ } __wait_stopped;
+ };
+
+#define w_termsig __wait_terminated.__w_termsig
+#define w_coredump __wait_terminated.__w_coredump
+#define w_retcode __wait_terminated.__w_retcode
+#define w_stopsig __wait_stopped.__w_stopsig
+#define w_stopval __wait_stopped.__w_stopval
+
+#endif /* Use BSD. */
diff --git a/sysdeps/generic/iovec.h b/sysdeps/generic/iovec.h
deleted file mode 100644
index 307fc6a18a..0000000000
--- a/sysdeps/generic/iovec.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* `struct iovec' -- Structure describing a section of memory. */
-
-struct iovec
-{
- /* Starting address. */
- __ptr_t iov_base;
- /* Length in bytes. */
- size_t iov_len;
-};
diff --git a/sysdeps/generic/netinet/ip.h b/sysdeps/generic/netinet/ip.h
index a119c629f7..84615a5714 100644
--- a/sysdeps/generic/netinet/ip.h
+++ b/sysdeps/generic/netinet/ip.h
@@ -36,7 +36,7 @@
#ifndef _NETINET_IP_H
#define _NETINET_IP_H
-#include <gnu/types.h>
+#include <bits/types.h>
#include <endian.h>
#include <netinet/in.h>
diff --git a/sysdeps/generic/schedbits.h b/sysdeps/generic/schedbits.h
deleted file mode 100644
index e2cb00e842..0000000000
--- a/sysdeps/generic/schedbits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Definitions of constants and data structure for POSIX 1003.1b-1993
- scheduling interface.
-Copyright (C) 1996 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 Library General Public License as
-published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-#ifndef _SCHEDBITS_H
-#define _SCHEDBITS_H 1
-
-/* Scheduling algorithms. */
-#define SCHED_OTHER 0
-#define SCHED_FIFO 1
-#define SCHED_RR 2
-
-/* Data structure to describe a process' schedulability. */
-struct sched_param
-{
- int sched_priority;
-};
-
-#endif /* schedbits.h */
diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index 11b5906a9d..e740fa9eef 100644
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -47,7 +47,7 @@ extern char **environ;
#if _LIBC
/* This lock protects against simultaneous modifications of `environ'. */
-# include <libc-lock.h>
+# include <bits/libc-lock.h>
__libc_lock_define_initialized (static, envlock)
# define LOCK __libc_lock_lock (envlock)
# define UNLOCK __libc_lock_unlock (envlock)
diff --git a/sysdeps/generic/statfsbuf.h b/sysdeps/generic/statfsbuf.h
deleted file mode 100644
index e5c2dd7f77..0000000000
--- a/sysdeps/generic/statfsbuf.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Definition of `struct statfs', information about a filesystem.
-Copyright (C) 1996 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 Library General Public License as
-published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-#ifndef _STATFSBUF_H
-
-#define _STATFSBUF_H 1
-
-#include <gnu/types.h>
-
-/* GNU Hurd NOTE: The size of this structure (16 ints) is known in
- <hurd/hurd_types.defs>, since it is used in the `file_statfs' RPC. MiG
- does not cope at all well with the passed C structure not being of the
- expected size. There are some filler words at the end to allow for
- future expansion. To increase the size of the structure used in the RPC
- and retain binary compatibility, we would need to assign a new message
- number. */
-
-struct statfs
- {
- unsigned int f_type;
- unsigned int f_bsize;
- unsigned int f_blocks;
- unsigned int f_bfree;
- unsigned int f_bavail;
- unsigned int f_files;
- unsigned int f_ffree;
- __fsid_t f_fsid;
- unsigned int f_namelen;
- unsigned int f_spare[6];
- };
-
-
-#endif /* statfsbuf.h */
diff --git a/sysdeps/generic/sys/mman.h b/sysdeps/generic/sys/mman.h
index 32b152e124..9c2a1b62ce 100644
--- a/sysdeps/generic/sys/mman.h
+++ b/sysdeps/generic/sys/mman.h
@@ -26,7 +26,7 @@
#define _SYS_MMAN_H 1
#include <features.h>
-#include <gnu/types.h>
+#include <bits/types.h>
#define __need_size_t
#include <stddef.h>
diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/bits/utmp.h
index db49ac845c..db49ac845c 100644
--- a/sysdeps/gnu/utmpbits.h
+++ b/sysdeps/gnu/bits/utmp.h
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index f6331d496d..0ec5d26a38 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
ENTRY (__longjmp)
movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */
diff --git a/sysdeps/i386/bytesex.h b/sysdeps/i386/bits/endian.h
index a5d6c5ea92..a5d6c5ea92 100644
--- a/sysdeps/i386/bytesex.h
+++ b/sysdeps/i386/bits/endian.h
diff --git a/sysdeps/i386/huge_val.h b/sysdeps/i386/bits/huge_val.h
index fa071452fb..65a06d8f3c 100644
--- a/sysdeps/i386/huge_val.h
+++ b/sysdeps/i386/bits/huge_val.h
@@ -18,8 +18,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _HUGE_VAL_H
-#define _HUGE_VAL_H 1
+#ifndef _MATH_H
+#error "Never use <bits/huge_val.h> directly; include <math.h> instead."
+#endif
+
#include <features.h>
#include <sys/cdefs.h>
@@ -66,5 +68,3 @@ static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
#endif /* GCC. */
#endif /* __USE_ISOC9X. */
-
-#endif /* huge_val.h */
diff --git a/sysdeps/i386/selectbits.h b/sysdeps/i386/bits/select.h
index 973ecad58e..3912515a7f 100644
--- a/sysdeps/i386/selectbits.h
+++ b/sysdeps/i386/bits/select.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SELECTBITS_H
-#define _SELECTBITS_H 1
+#ifndef _SYS_SELECT_H
+#error "Never use <bits/select.h> directly; include <sys/select.h> instead."
+#endif
+
#if defined __GNUC__ && __GNUC__ >= 2
@@ -53,5 +55,3 @@
#define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
#endif /* GNU CC */
-
-#endif /* selectbits.h */
diff --git a/sysdeps/i386/jmp_buf.h b/sysdeps/i386/bits/setjmp.h
index 0c03073b36..0c03073b36 100644
--- a/sysdeps/i386/jmp_buf.h
+++ b/sysdeps/i386/bits/setjmp.h
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 6efa32bcd1..64d36ca1a9 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -263,6 +263,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_386_COPY:
+ if (sym == NULL)
+ /* This can happen in trace mode if an object could not be
+ found. */
+ break;
if (sym->st_size > refsym->st_size
|| (_dl_verbose && sym->st_size < refsym->st_size))
{
diff --git a/sysdeps/i386/fpu/fenvbits.h b/sysdeps/i386/fpu/bits/fenv.h
index bea89a15b1..63f3e52958 100644
--- a/sysdeps/i386/fpu/fenvbits.h
+++ b/sysdeps/i386/fpu/bits/fenv.h
@@ -16,10 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* This file should never be included directly. */
+#ifndef _FENV_H
+#error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
+#endif
-#ifndef _FENVBITS_H
-#define _FENVBITS_H 1
/* Define bits representing the exception. We use the bit positions
of the appropriate bits in the FPU control word. */
@@ -87,5 +87,3 @@ fenv_t;
/* Floating-point environment where none of the exception is masked. */
# define FE_NOMASK_ENV ((fenv_t *) -2)
#endif
-
-#endif /* fenvbits.h */
diff --git a/sysdeps/i386/fpu/mathbits.h b/sysdeps/i386/fpu/bits/mathdef.h
index f4a22c0757..2387a39510 100644
--- a/sysdeps/i386/fpu/mathbits.h
+++ b/sysdeps/i386/fpu/bits/mathdef.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _MATHBITS_H
-#define _MATHBITS_H 1
+#ifndef _MATH_H
+# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
/* The ix87 FPUs evaluate all values in the 80 bit floating-point format
which is also available for the user as `long double'. Therefore
@@ -37,5 +39,3 @@ typedef long double double_t; /* `double' expressions are evaluated as
/* The values returned by `ilogb' for 0 and NaN respectively. */
#define FP_ILOGB0 0x80000000
#define FP_ILOGBNAN 0x80000000
-
-#endif /* mathbits.h */
diff --git a/sysdeps/i386/fpu/__math.h b/sysdeps/i386/fpu/bits/mathinline.h
index 9e1c23cec0..d5c480a51a 100644
--- a/sysdeps/i386/fpu/__math.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -18,8 +18,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __MATH_H
-#define __MATH_H 1
+#ifndef _BITS_MATHINLINE_H
+#define _BITS_MATHINLINE_H 1
#if defined __GNUG__ && \
(__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ <= 7))
@@ -605,4 +605,4 @@ pow2 (double __x)
#endif /* __NO_MATH_INLINES */
#endif /* __GNUC__ */
-#endif /* __MATH_H */
+#endif /* _BITS_MATHINLINE_H */
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 203c2d16d0..1ba3fc5a75 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
/* Binary compatibility entry point. */
ENTRY (__setjmp)
diff --git a/sysdeps/ieee754/huge_val.h b/sysdeps/ieee754/bits/huge_val.h
index a2520859e4..fe0144c734 100644
--- a/sysdeps/ieee754/huge_val.h
+++ b/sysdeps/ieee754/bits/huge_val.h
@@ -18,12 +18,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _HUGE_VAL_H
-#define _HUGE_VAL_H 1
+#ifndef _MATH_H
+#error "Never use <bits/huge_val.h> directly; include <math.h> instead."
+#endif
+
#include <features.h>
-#include <sys/cdefs.h>
-#include <endian.h>
/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
@@ -36,6 +36,9 @@
#else /* not GCC */
+#include <sys/cdefs.h>
+#include <endian.h>
+
typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
#if __BYTE_ORDER == __BIG_ENDIAN
@@ -84,5 +87,3 @@ static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
#define HUGE_VALL HUGE_VAL
#endif /* __USE_ISOC9X. */
-
-#endif /* huge_val.h */
diff --git a/sysdeps/ieee754/nan.h b/sysdeps/ieee754/bits/nan.h
index 499edbac8c..94988ced9c 100644
--- a/sysdeps/ieee754/nan.h
+++ b/sysdeps/ieee754/bits/nan.h
@@ -17,42 +17,43 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _NAN_H
+#ifndef _MATH_H
+# error "Never use <bits/nan.h> directly; include <math.h> instead."
+#endif
-#define _NAN_H 1
/* IEEE Not A Number. */
#ifdef __GNUC__
-#define NAN \
+# define NAN \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
{ __l: 0x7ff8000000000000ULL }).__d)
-#define NANF \
+# define NANF \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
{ __l: 0x7fc00000UL }).__d)
#else
-#include <endian.h>
+# include <endian.h>
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define __nan_bytes { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 }
-#define __nanf_bytes { 0x7f, 0xc0, 0, 0 }
-#endif
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f }
-#define __nanf_bytes { 0, 0, 0xc0, 0x7f }
-#endif
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define __nan_bytes { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 }
+# define __nanf_bytes { 0x7f, 0xc0, 0, 0 }
+# endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f }
+# define __nanf_bytes { 0, 0, 0xc0