2002-04-03 Jeff Johnston <jjohnstn@redhat.com>

	* configure.host: Add support for machine subdirectory of
	sys subdirectory.
	* configure.in: Add check for sys machine subdirectory.
	* Makefile.am: Ditto.
	* configure: Regenerated.
	* Makefile.in: Ditto.
	* libc/sys/linux/crt0.c: Moved to machine/i386 directory.
	* libc/sys/linux/sys/syscall.h: Ditto.
	* libc/sys/linux/sleep.c: New file.
	* libc/sys/linux/socket.c: Ditto.
	* libc/sys/linux/sockops.h: Ditto.
	* libc/sys/linux/stack.c: Ditto.
	* libc/sys/linux/usleep.c: Ditto.
	* libc/sys/linux/machine/Makefile.am: Ditto.
	* libc/sys/linux/machine/Makefile.in: Ditto.
	* libc/sys/linux/machine/aclocal.m4: Ditto.
	* libc/sys/linux/machine/configure: Ditto.
	* libc/sys/linux/machine/configure.in: Ditto.
	* libc/sys/linux/machine/i386/Makefile.am: Ditto.
	* libc/sys/linux/machine/i386/Makefile.in: Ditto.
	* libc/sys/linux/machine/i386/aclocal.m4: Ditto.
	* libc/sys/linux/machine/i386/configure: Ditto.
	* libc/sys/linux/machine/i386/configure.in: Ditto.
	* libc/sys/linux/machine/i386/crt0.c: Ditto.
	* libc/sys/linux/machine/i386/sigset.c: Ditto.
	* libc/sys/linux/machine/i386/sigstack.h: Ditto.
	* libc/sys/linux/machine/i386/socketcall.h: Ditto.
	* libc/sys/linux/machine/i386/syscall.h: Ditto.
	* libc/sys/linux/sys/select.h: Ditto.
	* libc/sys/linux/configure.in: Add support for machine directory.
	* libc/sys/linux/Makefile.am: Ditto plus add new files above.
	* libc/sys/linux/Makefile.in: Regenerated.
	* libc/sys/linux/configure: Ditto.
	* libc/sys/linux/brk.c: Use machine/syscall.h instead of sys/syscall.h.
	* libc/sys/linux/inode.c: Ditto.
	* libc/sys/linux/linux.c: Ditto.
	* libc/sys/linux/process.c: Ditto.
	* libc/sys/linux/systat.c: Ditto.
	* libc/sys/linux/time.c: Ditto.
	* libc/sys/linux/wait.c: Ditto.
	* libc/sys/linux/ids.c: Change header plus add setfsgid/setfsuid.
	* libc/sys/linux/io.c: Change header plus add readv/writev.
	* libc/sys/linux/signal.c: Change header plus change sigsuspend to
	use __sigsuspend syscall.
	* libc/sys/linux/select.c: Change header plus change select to
	use _newselect syscall.
	* libc/sys/linux/sys/cdefs.h: Add a number of standard definitions
	used by glibc header files.
	* libc/sys/linux/sys/types.h: Add __socklen_t and __useconds_t
	types.

1 files changed, 29 insertions, 1 deletions

diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 1e114221c..7c936a9a4 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -4,9 +4,13 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
+SUBDIRS = machine .
+SUBLIBS = $(LINUX_MACH_LIB)
+
 LIB_SOURCES = \
 	brk.c getoptlong.c ids.c inode.c io.c linux.c process.c realpath.c \
-	select.c signal.c systat.c termios.c time.c wait.c
+	select.c signal.c socket.c sleep.c stack.c systat.c termios.c time.c \
+	usleep.c wait.c
 
 # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
 # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux
@@ -17,17 +21,41 @@ liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblinux.la
 liblinux_la_SOURCES = $(LIB_SOURCES)
+liblinux_la_LIBADD = $(LINUX_MACH_LIB)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
+lib_a_LIBADD = $(LINUX_MACH_LIB)
+lib_a_DEPENDENCIES = $(LINUX_MACH_LIB)
 noinst_DATA =
+
+lib.a:  $(LINUX_MACH_LIB) $(lib_a_OBJECTS)
+	rm -f $@
+	rm -rf tmp
+	mkdir tmp
+	cd tmp; \
+	for i in $(SUBLIBS); do \
+	  $(AR) x ../$$i; \
+	done; \ 
+	$(AR) $(AR_FLAGS) ../$@ *.o
+	$(RANLIB) $@
+	rm -rf tmp
+
 endif # USE_LIBTOOL
 
+
 include $(srcdir)/../../../Makefile.shared
 
 all: crt0.o
 
+crt0.o: machine/crt0.o
+	rm -f $@
+	ln machine/crt0.o $@ >/dev/null 2>/dev/null || cp machine/crt0.o $@
+
+machine/crt0.o: ; @true
+
+
 signal.$(oext):	siglist.inc
 
 siglist.inc: