revert 4 untested commits

sysdeps/nacl/sysdep.h

 #ifndef _NACL_SYSDEP_H
 #define _NACL_SYSDEP_H 1
 
 #if !defined(__ASSEMBLER__)
 #include <futex_emulation.h>
 #include <irt_syscalls.h>
 #include <lowlevellock.h>
 
 /* Implementation of all syscalls for use in platform- and OS- independent code
    as inline functions.  Each function translates the syscall arguments into IRT
@@ skipping 96 matching lines @@
 INTERNAL_SYSCALL_capset_2 (int *err, struct __user_cap_header_struct *hdrp,
                            const struct __user_cap_data_struct *datap)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_chdir_1 (int *err, const char *path)
 {
-  *err = __nacl_irt_chdir (path);
+  *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_chmod_2 (int *err, const char *path, mode_t mode)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
@@ skipping 103 matching lines @@
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_dup3_3 (int *err, int oldfd, int newfd, int flags)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
-INTERNAL_SYSCALL_epoll_create_1 (int *err, int size)
+INTERNAL_SYSCALL_epoll_create_1 (int *err, int flags)
 {
-  int fd;
-  *err = __nacl_irt_epoll_create (size, &fd);
-  return fd;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_create1_1 (int *err, int flags)
 {
-  int fd;
-  *err = __nacl_irt_epoll_create1 (flags, &fd);
-  return fd;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_ctl_4 (int *err, int epfd, int op, int fd,
                               struct epoll_event *event)
 {
-  *err = __nacl_irt_epoll_ctl (epfd, op, fd, event);
+  *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_pwait_6 (int *err, int epfd, struct epoll_event *events,
                                 int maxevents, int timeout,
-                                const sigset_t *sigmask, size_t sigset_size)
+                                const sigset_t *sigmask, size_t sigsetsize)
 {
-  int count;
-  *err = __nacl_irt_epoll_pwait (epfd, events, maxevents, timeout, sigmask,
-                                 sigset_size, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_execve_3 (int *err, const char *filename, char *const argv[],
                            char *const envp[])
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_wait_4 (int *err, int epfd, struct epoll_event *events,
                                int maxevents, int timeout)
 {
-  int count;
-  *err = __nacl_irt_epoll_wait (epfd, events, maxevents, timeout, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_eventfd2_2 (int *err, unsigned int initval, int flags)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
@@ skipping 286 matching lines @@
   return 0;
 }
 
 /* NOTE! The user-level library version returns a character pointer.
 
    The system call just returns the length of the buffer filled (which includes
    the ending '\0' character), or zero in case of error.  */
 __extern_always_inline int
 INTERNAL_SYSCALL_getcwd_2 (int *err, char *buf, size_t size)
 {
-  int len;
-  *err = __nacl_irt_getcwd (buf, size, &len);
-  return len;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline gid_t
 INTERNAL_SYSCALL_getegid_0 (int *err)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline uid_t
@@ skipping 305 matching lines @@
 INTERNAL_SYSCALL_mincore_3 (int *err, void *addr, size_t length,
                             unsigned char *vec)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_mkdir_2 (int *err, const char *pathname, mode_t mode)
 {
-  *err = __nacl_irt_mkdir (pathname, mode);
+  *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_mkdirat_3 (int *err, int dirfd, const char *pathname,
                             mode_t mode)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
@@ skipping 227 matching lines @@
 INTERNAL_SYSCALL_pivot_root_2 (int *err, const char *new_root,
                                const char *put_old)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_poll_3 (int *err, struct pollfd *fds, nfds_t nfds, int timeout)
 {
-  int count;
-  *err = __nacl_irt_poll (fds, nfds, timeout, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_ppoll_5 (int *err, struct pollfd *fds, nfds_t nfds,
                           const struct timespec *timeout,
-                          const sigset_t *sigmask, size_t sigset_size)
+                          const sigset_t *sigmask, size_t sigsetsize)
 {
-  int count;
-  *err = __nacl_irt_ppoll (fds, nfds, timeout, sigmask, sigset_size, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_prctl_5 (int *err, int option, unsigned long arg2,
                           unsigned long arg3, unsigned long arg4,
                           unsigned long arg5)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_pselect6_6 (int *err, int nfds, fd_set *readfds,
-                             fd_set *writefds, fd_set *exceptfds,
-                             const struct timeval *timeout,
-                             void *sigmask)
+                             fd_set *writefds, fd_set *exceptfds,
+                             const struct timespec *timeout,
+                             void *sigmask)
 {
-  int count;
-  *err = __nacl_irt_pselect (nfds, readfds, writefds, exceptfds, timeout,
-                             sigmask, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline long
 INTERNAL_SYSCALL_ptrace_4 (int *err, enum __ptrace_request request, pid_t pid,
                            void *addr, void *data)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
@@ skipping 92 matching lines @@
 INTERNAL_SYSCALL_renameat_4 (int *err, int olddfd, const char *oldname,
                              int newdfd, const char *newname)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_rmdir_1 (int *err, const char *pathname)
 {
-  *err = __nacl_irt_rmdir (pathname);
+  *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_rt_sigpending_2 (int *err, sigset_t *set, size_t sigsetsize)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
@@ skipping 101 matching lines @@
 }
 
 #ifdef __i386__
 #define INTERNAL_SYSCALL_select_5 INTERNAL_SYSCALL__newselect_5
 #endif
 __extern_always_inline int
 INTERNAL_SYSCALL_select_5 (int *err, int nfds, fd_set *readfds,
                            fd_set *writefds, fd_set *exceptfds,
                            const struct timeval *timeout)
 {
-  int count;
-  *err = __nacl_irt_select (nfds, readfds, writefds, exceptfds, timeout, &count);
-  return count;
+  *err = (38 /* ENOSYS */);
+  return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_semctl_4 (int *err, int semid, int semnum, int cmd,
 #ifdef _SEM_SEMUN_UNDEFINED
                            int semun)
 #else
                            union semun semun)
 #endif
 {
@@ skipping 200 matching lines @@
 __extern_always_inline int
 INTERNAL_SYSCALL_signalfd_3 (int *err, int fd, const sigset_t *mask,
                              size_t sigsetsize)
 {
   return INTERNAL_SYSCALL_signalfd4_4 (err, fd, mask, sigsetsize, 0);
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_socket_3 (int *err, int domain, int type, int protocol)
 {
-  int sd;
-  *err = __nacl_irt_socket (domain, type, protocol, &sd);
-  return sd;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_accept_3 (int *err, int sockfd, struct sockaddr* addr,
-                           socklen_t* addr_len)
-{
-  int sd;
-  *err = __nacl_irt_accept (sockfd, addr, addr_len, &sd);
-  return sd;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_bind_3 (int *err, int sockfd, struct sockaddr* addr,
-                         socklen_t addr_len)
-{
-  *err = __nacl_irt_bind (sockfd, addr, addr_len);
+  *err = (38 /* ENOSYS */);
   return 0;
 }
 
-__extern_always_inline int
-INTERNAL_SYSCALL_getpeername_3 (int *err, int sockfd, struct sockaddr* addr,
-                                socklen_t* addr_len)
-{
-  *err = __nacl_irt_getpeername (sockfd, addr, addr_len);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_getsockname_3 (int *err, int sockfd, struct sockaddr* addr,
-                                socklen_t* addr_len)
-{
-  *err = __nacl_irt_getsockname (sockfd, addr, addr_len);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_getsockopt_5 (int *err, int sockfd, int level, int optname,
-                               void *optval, socklen_t *optlen)
-{
-  *err = __nacl_irt_getsockopt (sockfd, level, optname, optval, optlen);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_setsockopt_5 (int *err, int sockfd, int level, int optname,
-                               const void *optval, socklen_t optlen)
-{
-  *err = __nacl_irt_setsockopt (sockfd, level, optname, optval, optlen);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_listen_2 (int *err, int sockfd, int backlog)
-{
-  *err = __nacl_irt_listen (sockfd, backlog);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_connect_3 (int *err, int sockfd, struct sockaddr* addr,
-                            socklen_t addr_len)
-{
-  *err = __nacl_irt_connect (sockfd, addr, addr_len);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_socketpair_4 (int *err, int domain, int type, int protocol,
-                             int sv[2])
-{
-  *err = __nacl_irt_socketpair (domain, type, protocol, sv);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_shutdown_2 (int *err, int sockfd, int how)
-{
-  *err = __nacl_irt_shutdown (sockfd, how);
-  return 0;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_send_4 (int *err, int sockfd, const void *buf, size_t len, int flags)
-{
-  int ret;
-  *err = __nacl_irt_send (sockfd, buf, len, flags, &ret);
-  return ret;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_sendto_6 (int *err, int sockfd, const void *buf, size_t len,
-                           int flags, const struct sockaddr *dest_addr,
-                                                   socklen_t addrlen)
-{
-  int ret;
-  *err = __nacl_irt_sendto (sockfd, buf, len, flags, dest_addr, addrlen, &ret);
-  return ret;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_recv_4 (int *err, int sockfd, void *buf, size_t len, int flags)
-{
-  int ret;
-  *err = __nacl_irt_recv (sockfd, buf, len, flags, &ret);
-  return ret;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_recvfrom_6 (int *err, int sockfd, void *buf, size_t len, int flags,
-                           struct sockaddr *dest_addr, socklen_t *addrlen)
-{
-  int ret;
-  *err = __nacl_irt_recvfrom (sockfd, buf, len, flags, dest_addr, addrlen, &ret);
-  return ret;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_sendmsg_3 (int *err, int sockfd, const struct msghdr *msg, int flags)
-{
-  int ret;
-  *err = __nacl_irt_sendmsg (sockfd, msg, flags, &ret);
-  return ret;
-}
-
-__extern_always_inline int
-INTERNAL_SYSCALL_recvmsg_3 (int *err, int sockfd, struct msghdr *msg, int flags)
-{
-  int ret;
-  *err = __nacl_irt_recvmsg (sockfd, msg, flags, &ret);
-  return ret;
-}
-
 __extern_always_inline ssize_t
 INTERNAL_SYSCALL_splice_6 (int *err, int fd_in, loff_t *off_in, int fd_out,
                            loff_t *off_out, size_t len, unsigned int flags)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_stime_1 (int *err, time_t *t)
@@ skipping 439 matching lines @@
 #define PSEUDO_END_ERRVAL(name)                 \
   END (name)
 
 #undef SYSCALL_ERROR_HANDLER_TLS_STORE
 #define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff)   \
   movl %gs:0, %eax;                                     \
   movl src, (%eax,destoff)
 
 #endif
 #endif