2002-05-23 Jeff Johnston <jjohnstn@redhat.com>

        * libc/sys/linux/Makefile.am: Add resource.c.
        * libc/sys/linux/Makefile.in: Regenerated.
        * libc/sys/linux/resource.c: New file.
        * libc/sys/linux/time.c: Add settimeofday, getitimer, and setitimer.
        * libc/sys/linux/machine/i386/Makefile.am: Remove syscalls.c.
        * libc/sys/linux/machine/i386/Makefile.in: Regenerated.
        * libc/sys/linux/machine/i386/syscalls.c: Removed as functions
        are now found in libc/sys/linux/resource.c.

7 files changed, 31 insertions, 28 deletions

diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index b75a41d40..592485635 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -12,8 +12,8 @@ LIB_SOURCES = \
 	brk.c flockfile.c funlockfile.c getoptlong.c getreent.c ids.c \
 	inode.c io.c io64.c linux.c mmap.c \
 	pread.c pread64.c process.c pwrite.c pwrite64.c raise.c realpath.c \
-	sched.c select.c shm_open.c shm_unlink.c signal.c siglongjmp.c \
-	socket.c sleep.c stack.c \
+	resource.c sched.c select.c shm_open.c shm_unlink.c signal.c \
+	siglongjmp.c socket.c sleep.c stack.c \
 	sysconf.c systat.c system.c tcdrain.c termios.c time.c \
 	usleep.c wait.c
 
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index a61195d38..66b1587b5 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -102,8 +102,8 @@ LIB_SOURCES = \
 	brk.c flockfile.c funlockfile.c getoptlong.c getreent.c ids.c \
 	inode.c io.c io64.c linux.c mmap.c \
 	pread.c pread64.c process.c pwrite.c pwrite64.c raise.c realpath.c \
-	sched.c select.c shm_open.c shm_unlink.c signal.c siglongjmp.c \
-	socket.c sleep.c stack.c \
+	resource.c sched.c select.c shm_open.c shm_unlink.c signal.c \
+	siglongjmp.c socket.c sleep.c stack.c \
 	sysconf.c systat.c system.c tcdrain.c termios.c time.c \
 	usleep.c wait.c
 
@@ -138,10 +138,11 @@ LIBS = @LIBS@
 @USE_LIBTOOL_FALSE@lib_a_OBJECTS =  brk.o flockfile.o funlockfile.o \
 @USE_LIBTOOL_FALSE@getoptlong.o getreent.o ids.o inode.o io.o io64.o \
 @USE_LIBTOOL_FALSE@linux.o mmap.o pread.o pread64.o process.o pwrite.o \
-@USE_LIBTOOL_FALSE@pwrite64.o raise.o realpath.o sched.o select.o \
-@USE_LIBTOOL_FALSE@shm_open.o shm_unlink.o signal.o siglongjmp.o \
-@USE_LIBTOOL_FALSE@socket.o sleep.o stack.o sysconf.o systat.o system.o \
-@USE_LIBTOOL_FALSE@tcdrain.o termios.o time.o usleep.o wait.o
+@USE_LIBTOOL_FALSE@pwrite64.o raise.o realpath.o resource.o sched.o \
+@USE_LIBTOOL_FALSE@select.o shm_open.o shm_unlink.o signal.o \
+@USE_LIBTOOL_FALSE@siglongjmp.o socket.o sleep.o stack.o sysconf.o \
+@USE_LIBTOOL_FALSE@systat.o system.o tcdrain.o termios.o time.o \
+@USE_LIBTOOL_FALSE@usleep.o wait.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 @USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = 
@@ -149,10 +150,11 @@ LTLIBRARIES =  $(noinst_LTLIBRARIES)
 @USE_LIBTOOL_TRUE@funlockfile.lo getoptlong.lo getreent.lo ids.lo \
 @USE_LIBTOOL_TRUE@inode.lo io.lo io64.lo linux.lo mmap.lo pread.lo \
 @USE_LIBTOOL_TRUE@pread64.lo process.lo pwrite.lo pwrite64.lo raise.lo \
-@USE_LIBTOOL_TRUE@realpath.lo sched.lo select.lo shm_open.lo \
-@USE_LIBTOOL_TRUE@shm_unlink.lo signal.lo siglongjmp.lo socket.lo \
-@USE_LIBTOOL_TRUE@sleep.lo stack.lo sysconf.lo systat.lo system.lo \
-@USE_LIBTOOL_TRUE@tcdrain.lo termios.lo time.lo usleep.lo wait.lo
+@USE_LIBTOOL_TRUE@realpath.lo resource.lo sched.lo select.lo \
+@USE_LIBTOOL_TRUE@shm_open.lo shm_unlink.lo signal.lo siglongjmp.lo \
+@USE_LIBTOOL_TRUE@socket.lo sleep.lo stack.lo sysconf.lo systat.lo \
+@USE_LIBTOOL_TRUE@system.lo tcdrain.lo termios.lo time.lo usleep.lo \
+@USE_LIBTOOL_TRUE@wait.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.am b/newlib/libc/sys/linux/machine/i386/Makefile.am
index 330a414c0..a3ceef50a 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = setjmp.S sigset.c syscalls.c
+LIB_SOURCES = setjmp.S sigset.c
 
 liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.in b/newlib/libc/sys/linux/machine/i386/Makefile.in
index c84ef686c..a167b9b63 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.in
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.in
@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = setjmp.S sigset.c syscalls.c
+LIB_SOURCES = setjmp.S sigset.c
 
 liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
 
@@ -116,12 +116,11 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  setjmp.o sigset.o syscalls.o
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  setjmp.o sigset.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 liblinuxi386_la_LIBADD = 
-@USE_LIBTOOL_TRUE@liblinuxi386_la_OBJECTS =  setjmp.lo sigset.lo \
-@USE_LIBTOOL_TRUE@syscalls.lo
+@USE_LIBTOOL_TRUE@liblinuxi386_la_OBJECTS =  setjmp.lo sigset.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/newlib/libc/sys/linux/machine/i386/syscalls.c b/newlib/libc/sys/linux/machine/i386/syscalls.c
deleted file mode 100644
index 838dd73b3..000000000
--- a/newlib/libc/sys/linux/machine/i386/syscalls.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* miscellaneous i386-specific linux syscalls */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/resource.h>
-#include <machine/syscall.h>
-#include <errno.h>
-
-_syscall2(int,getrlimit,int,resource,struct rlimit *,rlp);
-_syscall2(int,setrlimit,int,resource,const struct rlimit *,rlp);
-
diff --git a/newlib/libc/sys/linux/resource.c b/newlib/libc/sys/linux/resource.c
new file mode 100644
index 000000000..4a80bbfce
--- /dev/null
+++ b/newlib/libc/sys/linux/resource.c
@@ -0,0 +1,10 @@
+/* libc/sys/linux/resource.c - Process resource functions */
+
+/* Copyright 2002, Red Hat Inc. */
+
+#include <sys/resource.h>
+#include <machine/syscall.h>
+
+_syscall2(int,getrusage,int,who,struct rusage *,r_usage)
+_syscall2(int,getrlimit,int,resource,struct rlimit *,rlp)
+_syscall2(int,setrlimit,int,resource,const struct rlimit *,rlp)
diff --git a/newlib/libc/sys/linux/time.c b/newlib/libc/sys/linux/time.c
index a7ecc5adc..efb90b266 100644
--- a/newlib/libc/sys/linux/time.c
+++ b/newlib/libc/sys/linux/time.c
@@ -12,7 +12,10 @@
 
 _syscall1(time_t,time,time_t *,t)
 _syscall1(clock_t,times,struct tms *,buf)
+_syscall2(int,getitimer,int,type,struct itimerval *,old)
+_syscall3(int,setitimer,int,type,const struct itimerval *,new,struct itimerval *,old)
 _syscall2(int,gettimeofday,struct timeval *,tv,struct timezone *,tz)
+_syscall2(int,settimeofday,const struct timeval *,tv,const struct timezone *,tz)
 _syscall2(int,nanosleep,const struct timespec *,req,struct timespec *,rem)
 
 weak_alias(__libc_gettimeofday,__gettimeofday);