Merge sysdeps/unix/inet into sysdeps/unix

[Carlos O'Donell]

On Tue, Apr 24, 2012 at 9:17 AM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> Just as I noted in
> <http://sourceware.org/ml/libc-alpha/2012-04/msg00843.html> that mmap
> and related syscalls can nowadays be considered standard for any
> Unix-like system, so sysdeps/unix/mman seems unnecessary, so the same
> seems to apply to sysdeps/unix/inet, which (a) defines syscalls in
> syscalls.list and (b) enables various glibc directories using Subdirs.
> (Apart from general redundancy of these directories, the large number
> of makefile rules generated for all the sysdeps directories has been
> mentioned as something slowing down glibc builds, so on those grounds
> as well it seems useful to reduce the number of such directories.  The
> precise arrangements for how the functions relate to syscalls do of
> course vary from platform to platform, e.g. Linux use of socketcall on
> some platforms, but this does not affect the principle of merging the
> directories; systems continue to override syscalls.list entries just
> as they did before, whether they are in sysdeps/unix/syscalls.list or
> sysdeps/unix/inet/syscalls.list.)
>
> I propose this patch, relative to a tree with
> <http://sourceware.org/ml/libc-alpha/2012-04/msg00843.html> applied,
> to merge sysdeps/unix/inet into sysdeps/unix.  Tested x86_64,
> including making sure the compiled library binaries are identical
> before and after the patch.
>
> 2012-04-24  Joseph Myers  <joseph@codesourcery.com>
>
>        * sysdeps/unix/Subdirs (inet): Add directory from
>        sysdeps/unix/inet/Subdirs.
>        (resolv): Likewise.
>        (hesiod): Likewise.
>        (sunrpc): Likewise.
>        (nis): Likewise.
>        (nscd): Likewise.
>        (streams): Likewise.
>        * sysdeps/unix/syscalls.list (accept): Add syscall from
>        sysdeps/unix/inet/syscalls.list.
>        (bind): Likewise.
>        (connect): Likewise.
>        (gethostid): Likewise.
>        (gethostname): Likewise.
>        (getpeername): Likewise.
>        (getsockname): Likewise.
>        (getsockopt): Likewise.
>        (listen): Likewise.
>        (recv): Likewise.
>        (recvfrom): Likewise.
>        (recvmsg): Likewise.
>        (send): Likewise.
>        (sendmsg): Likewise.
>        (sendto): Likewise.
>        (sethostid): Likewise.
>        (sethostname): Likewise.
>        (setsockopt): Likewise.
>        (shutdown): Likewise.
>        (socket): Likewise.
>        (socketpair): Likewise.
>        * sysdeps/unix/bsd/Implies: Don't include unix/inet.
>        * sysdeps/unix/sysv/linux/Implies: Likewise.
>        * sysdeps/unix/inet/Subdirs: Remove.
>        * sysdeps/unix/inet/syscalls.list: Likewise.

This looks good to me. The fewer places I need to look at or edit in
the future the better.

Cheers,
Carlos.