1 files changed, 8 insertions, 38 deletions

diff --git a/newlib/libc/sys/linux/io.c b/newlib/libc/sys/linux/io.c
index 25dccc660..6187e701b 100644
--- a/newlib/libc/sys/linux/io.c
+++ b/newlib/libc/sys/linux/io.c
@@ -9,19 +9,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <poll.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 #define __NR___ioctl __NR_ioctl
 #define __NR___flock __NR_flock
-#define __NR___mknod __NR_mknod
 
-_syscall3(ssize_t,read,int,fd,void *,buf,size_t,count)
-_syscall3(ssize_t,write,int,fd,const void *,buf,size_t,count)
+_syscall3(int,read,int,fd,void *,buf,size_t,count)
+_syscall3(int,write,int,fd,const void *,buf,size_t,count)
 _syscall3(int,open,const char *,file,int,flag,mode_t,mode)
 _syscall1(int,close,int,fd)
 _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
@@ -29,22 +26,11 @@ _syscall0(int,sync)
 _syscall1(int,dup,int,fd)
 _syscall2(int,dup2,int,oldfd,int,newfd)
 _syscall3(int,fcntl,int,fd,int,cmd,long,arg)
-_syscall1(int,fdatasync,int,fd)
-_syscall1(int,fsync,int,fd)
-_syscall3(int,poll,struct pollfd *,fds,nfds_t,nfds,int,timeout)
 
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-_syscall3(ssize_t,readv,int,fd,const struct iovec *,vec,int,count)
-_syscall3(ssize_t,writev,int,fd,const struct iovec *,buf,int,count)
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-_syscall2(int,ftruncate,int,fd,off_t,len)
-_syscall2(int,truncate,const char *,path,off_t,len)
-#endif
 
 static _syscall3(int,__ioctl,int,fd,int,request,void *,arg)
 
+
 int ioctl(int fd,int request,...)
 {
     va_list ap;
@@ -56,29 +42,13 @@ int ioctl(int fd,int request,...)
     return res;
 }
 
-static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd)
 
-int flock(int fd,int operation)
-{
-    return __flock(fd,operation);
-}
+/* Why are all the types gratuituously different ? */
 
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
+static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd)
 
-static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t,dev)
 
-int mkfifo(const char *path, mode_t mode)
+int flock(int fd,int operation)
 {
-   dev_t dev = 0;
-   return __mknod(path, mode | S_IFIFO, dev);
+    return __flock(fd,operation);
 }
-#endif
-
-weak_alias(__libc_close,__close);
-weak_alias(__libc_fcntl,__fcntl);
-weak_alias(__libc_lseek,__lseek);
-weak_alias(__libc_open,__open);
-weak_alias(__libc_read,__read);
-weak_alias(__libc_write,__write);
-weak_alias(__libc_poll,__poll);
-