Merge unix/inet/syscalls.list into unix/syscalls.list.

diff --git a/ChangeLog b/ChangeLog
index 357287f..254e944 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-17  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/unix/inet/syscalls.list: File removed.  Move contents into ...
+       * sysdeps/unix/syscalls.list: ... here.
+
        * sysdeps/posix/getaddrinfo.c
        (save_gaiconf_mtime, check_gaiconf_mtime): New functions.
        (gaiconf_init, gaiconf_reload): Use them.

diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list
deleted file mode 100644 (file)
index aafafd1..0000000
--- a/sysdeps/unix/inet/syscalls.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# File name    Caller  Syscall name    # args  Strong name     Weak names
-
-accept         -       accept          Ci:iBN  __libc_accept   accept
-bind           -       bind            i:ipi   __bind          bind
-connect                -       connect         Ci:ipi  __libc_connect  __connect connect
-gethostid      -       gethostid       i:      gethostid
-gethostname    -       gethostname     i:bn    __gethostname   gethostname
-getpeername    -       getpeername     i:ibN   __getpeername   getpeername
-getsockname    -       getsockname     i:ibN   __getsockname   getsockname
-getsockopt     -       getsockopt      i:iiiBN getsockopt
-listen         -       listen          i:ii    __listen        listen
-recv           -       recv            Ci:ibni __libc_recv     recv
-recvfrom       -       recvfrom        Ci:ibniBN       __libc_recvfrom __recvfrom recvfrom
-recvmsg                -       recvmsg         Ci:ipi  __libc_recvmsg  __recvmsg recvmsg
-send           -       send            Ci:ibni __libc_send     __send send 
-sendmsg                -       sendmsg         Ci:ipi  __libc_sendmsg  __sendmsg sendmsg
-sendto         -       sendto          Ci:ibnibn       __libc_sendto   __sendto sendto
-sethostid      -       sethostid       i:i     sethostid
-sethostname    -       sethostname     i:pi    sethostname
-setsockopt     -       setsockopt      i:iiibn setsockopt      __setsockopt
-shutdown       -       shutdown        i:ii    shutdown
-socket         -       socket          i:iii   __socket        socket
-socketpair     -       socketpair      i:iiif  socketpair

diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index bd780f5..b38b03e 100644 (file)
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -1,13 +1,16 @@
 # File name    Caller  Syscall name    Args    Strong name     Weak names
 
+accept         -       accept          Ci:iBN  __libc_accept   accept
 access         -       access          i:si    __access        access
 acct           -       acct            i:S     acct
 adjtime                -       adjtime         i:pp    __adjtime       adjtime
+bind           -       bind            i:ipi   __bind          bind
 chdir          -       chdir           i:s     __chdir         chdir
 chmod          -       chmod           i:si    __chmod         chmod
 chown          -       chown           i:sii   __chown         __chown_internal chown
 chroot         -       chroot          i:s     chroot
 close          -       close           Ci:i    __libc_close    __close close
+connect                -       connect         Ci:ipi  __libc_connect  __connect connect
 dup            -       dup             i:i     __dup           dup
 dup2           -       dup2            i:ii    __dup2          dup2
 dup3           -       dup3            i:iii   __dup3          dup3
@@ -21,16 +24,22 @@ ftruncate   -       ftruncate       i:ii    __ftruncate     ftruncate
 getdomain      -       getdomainname   i:si    getdomainname
 getgid         -       getgid          Ei:     __getgid        getgid
 getgroups      -       getgroups       i:ip    __getgroups     getgroups
+gethostid      -       gethostid       i:      gethostid
+gethostname    -       gethostname     i:bn    __gethostname   gethostname
 getitimer      -       getitimer       i:ip    __getitimer     getitimer
+getpeername    -       getpeername     i:ibN   __getpeername   getpeername
 getpid         -       getpid          Ei:     __getpid        getpid
 getpriority    -       getpriority     i:ii    getpriority
 getrlimit      -       getrlimit       i:ip    __getrlimit     getrlimit
 getrusage      -       getrusage       i:ip    __getrusage     getrusage
+getsockname    -       getsockname     i:ibN   __getsockname   getsockname
+getsockopt     -       getsockopt      i:iiiBN getsockopt
 gettimeofday   -       gettimeofday    i:pP    __gettimeofday  gettimeofday
 getuid         -       getuid          Ei:     __getuid        getuid
 ioctl          -       ioctl           i:iiI   __ioctl         ioctl
 kill           -       kill            i:ii    __kill          kill
 link           -       link            i:ss    __link          link
+listen         -       listen          i:ii    __listen        listen
 lseek          -       lseek           i:iii   __libc_lseek    __lseek lseek
 madvise                -       madvise         i:pii   madvise
 mkdir          -       mkdir           i:si    __mkdir         mkdir
@@ -45,14 +54,22 @@ read                -       read            Ci:ibn  __libc_read     __read read
 readlink       -       readlink        i:spi   __readlink      readlink
 readv          -       readv           Ci:ipi  __readv         readv
 reboot         -       reboot          i:i     reboot
+recv           -       recv            Ci:ibni __libc_recv     recv
+recvfrom       -       recvfrom        Ci:ibniBN       __libc_recvfrom __recvfrom recvfrom
+recvmsg                -       recvmsg         Ci:ipi  __libc_recvmsg  __recvmsg recvmsg
 rename         -       rename          i:ss    rename
 rmdir          -       rmdir           i:s     __rmdir         rmdir
 select         -       select          Ci:iPPPP        __select        __libc_select select
+send           -       send            Ci:ibni __libc_send     __send send
+sendmsg                -       sendmsg         Ci:ipi  __libc_sendmsg  __sendmsg sendmsg
+sendto         -       sendto          Ci:ibnibn       __libc_sendto   __sendto sendto
 setdomain      -       setdomainname   i:si    setdomainname
 setegid                -       setegid         i:i     __setegid       setegid
 seteuid                -       seteuid         i:i     __seteuid       seteuid
 setgid         -       setgid          i:i     __setgid        setgid
 setgroups      -       setgroups       i:ip    setgroups
+sethostid      -       sethostid       i:i     sethostid
+sethostname    -       sethostname     i:pi    sethostname
 setitimer      -       setitimer       i:ipp   __setitimer     setitimer
 setpgid                -       setpgrp         i:ii    __setpgid       setpgid
 setpriority    -       setpriority     i:iii   setpriority
@@ -60,10 +77,14 @@ setregid    -       setregid        i:ii    __setregid      setregid
 setreuid       -       setreuid        i:ii    __setreuid      setreuid
 setrlimit      -       setrlimit       i:ip    __setrlimit setrlimit
 setsid         -       setsid          i:      __setsid        setsid
+setsockopt     -       setsockopt      i:iiibn setsockopt      __setsockopt
 settimeofday   -       settimeofday    i:PP    __settimeofday  settimeofday
 setuid         -       setuid          i:i     __setuid        setuid
+shutdown       -       shutdown        i:ii    shutdown
 sigaction      -       sigaction       i:ipp   __sigaction     sigaction
 sigsuspend     -       sigsuspend      Ci:p    sigsuspend
+socket         -       socket          i:iii   __socket        socket
+socketpair     -       socketpair      i:iiif  socketpair
 sstk           -       sstk            b:i     sstk
 statfs         -       statfs          i:sp    __statfs        statfs
 swapoff                -       swapoff         i:s     swapoff