2002-08-26 Jeff Johnston <jjohnstn@redhat.com>

        * Makefile.am(LIBC_OBJECTLISTS): Add STDIO64_OBJECTLIST.
        * Makefile.in: Regenerated.
        * acinclude.m4: Add support for --enable-newlib-elix-level option.
        * aclocal.m4: Regenerated.
        * configure: Ditto.
        * configure.host: Add code to define _ELIX_LEVEL if
        --enable-newlib-elix-level option is used.
        * configure.in:
        * libc/aclocal.m4: Regenerated.
        * libc/configure: Ditto.
        * libc/argz/Makefile.am: Add EL/IX level checking.
        * libc/argz/Makefile.in: Regenerated.
        * libc/argz/dummy.c: New file.
        * libc/ctype/Makefile.am: Add EL/IX level checking.
        * libc/ctype/Makefile.in: Regenerated.
        * libc/locale/Makefile.am: Add EL/IX level checking.
        * libc/locale/Makefile.in: Regenerated.
        * libc/posix/Makefile.am: Add EL/IX level checking.
        * libc/posix/Makefile.in: Regenerated.
        * libc/posix/telldir.c: Add EL/IX level checking.
        * libc/reent/Makefile.am: Ditto.
        * libc/reent/fstat64r.c: Ditto.
        * libc/reent/lseek64r.c: Ditto.
        * libc/reent/open64r.c: Ditto.
        * libc/reent/Makefile.in: Regenerated.
        * libc/search/Makefile.am: Add EL/IX level checking.
        * libc/search/Makefile.in: Regenerated.
        * libc/stdio/Makefile.am: Add EL/IX level checking.
        * libc/stdio/Makefile.in: Regenerated.
        * libc/stdio64/Makefile.am: Add EL/IX level checking.
        * libc/stdio64/Makefile.in: Regenerated.
        * libc/stdio64/dummy.c: New file.
        * libc/stdio64/fgetpos64.c: Fix so _LARGEFILE_64 macro is checked
        after first include.
        * libc/stdio64/fopen64.c: Ditto.
        * libc/stdio64/freopen64.c: Ditto.
        * libc/stdio64/fseeko64.c: Ditto.
        * libc/stdio64/fsetpos64.c: Ditto.
        * libc/stdio64/ftello64.c: Ditto.
        * libc/stdio64/tmpfile64.c: Ditto.
        * libc/stdlib/Makefile.am: Add EL/IX level checking.
        * libc/stdlib/Makefile.in: Regenerated.
        * libc/stdlib/mstats.c: Add EL/IX level checking.
        * libc/string/Makefile.am: Ditto.
        * libc/string/Makefile.in: Regenerated.
        * libc/sys/linux/Makefile.am: Add EL/IX level checking.
        * libc/sys/linux/Makefile.in: Regenerated.
        * libc/sys/linux/aclocal.m4: Ditto.
        * libc/sys/linux/configure: Ditto.
        * libc/sys/linux/aio.c: Add EL/IX level checking.
        * libc/sys/linux/ftok.c: Ditto.
        * libc/sys/linux/getdate.c: Ditto.
        * libc/sys/linux/ids.c: Ditto.
        * libc/sys/linux/inode.c: Ditto.
        * libc/sys/linux/io.c: Ditto.
        * libc/sys/linux/process.c: Ditto.
        * libc/sys/linux/resource.c: Ditto.
        * libc/sys/linux/sched.c: Ditto.
        * libc/sys/linux/sig.c: Ditto.
        * libc/sys/linux/termios.c: Ditto.
        * libc/sys/linux/wait.c: Ditto plus add __waitpid and
        __libc___waitpid weak aliases.
        * libc/sys/linux/machine/i386/syscall.h: Add new _base macros
        that generate the code for a syscall, but do not create a
        weak alias.
        * libc/syscalls/Makefile.am: Add EL/IX level checking.
        * libc/syscalls/Makefile.in: Regenerated.
        * libc/time/tzset_r.c: Change to replace strdup with equivalent
        functionality.
        * libc/unix/Makefile.am: Add EL/IX level checking.
        * libc/unix/Makefile.in: Regenerated.

1 files changed, 66 insertions, 46 deletions

diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 55845d45a..00d189b71 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -11,9 +11,8 @@ SUBLIBS = \
 	cmath/libcmath.la \
 	$(LINUX_MACH_LIB)
 
-LIB_SOURCES = \
+GENERAL_SOURCES = \
 	aio.c \
-	aio64.c \
 	brk.c \
 	calloc.c \
 	callocr.c \
@@ -22,42 +21,24 @@ LIB_SOURCES = \
 	clock_getres.c \
 	clock_gettime.c \
 	clock_settime.c \
-	confstr.c \
-	ctermid.c \
-	fclean.c \
 	flockfile.c \
-	fpathconf.c \
 	free.c \
 	freer.c \
-	fstab.c \
-	fstatvfs.c \
-	fstatvfs64.c \
 	ftok.c \
-	ftw.c \
-	ftw64.c \
 	funlockfile.c \
 	getdate.c \
 	getdate_err.c \
 	gethostname.c \
-	getoptlong.c \
 	getreent.c \
-	getrlimit64.c \
-	getwd.c \
 	ids.c \
 	inode.c \
 	io.c \
-	io64.c \
 	ipc.c \
 	linux.c \
-	malign.c \
-	malignr.c \
 	mallinfor.c \
 	mallocr.c \
-	malloptr.c \
 	mallstatsr.c \
 	mmap.c \
-	mntent.c \
-	mntent_r.c \
 	mq_close.c \
 	mq_getattr.c \
 	mq_notify.c \
@@ -72,29 +53,21 @@ LIB_SOURCES = \
 	mtrim.c \
 	mtrimr.c \
 	ntp_gettime.c \
-	pathconf.c \
 	pread.c \
-	pread64.c \
 	process.c \
 	prof-freq.c \
 	profile.c \
 	psignal.c \
-	pvallocr.c \
 	pwrite.c \
-	pwrite64.c \
 	raise.c \
-	readdir64.c \
 	realloc.c \
 	reallocr.c \
-	realpath.c \
 	rename.c \
 	resource.c \
-	scandir64.c \
 	sched.c \
 	select.c \
 	seteuid.c \
 	sethostname.c \
-	setrlimit64.c \
 	shm_open.c \
 	shm_unlink.c \
 	sig.c \
@@ -106,26 +79,74 @@ LIB_SOURCES = \
 	sigwait.c \
 	socket.c \
 	sleep.c \
-	stack.c \
-	statvfs.c \
-	statvfs64.c \
 	strsignal.c \
 	strverscmp.c \
 	sysconf.c \
 	sysctl.c \
 	systat.c \
-	system.c \
 	tcdrain.c \
 	tcsendbrk.c \
 	termios.c \
 	time.c \
-	ttyname_r.c \
 	usleep.c \
-	utimes.c \
-	vallocr.c \
-	versionsort.c \
-	versionsort64.c \
-	wait.c
+	versionsort.c 
+
+ELIX_2_OBJS = \
+	aio64.$(oext) \
+	confstr.$(oext) \
+	ctermid.$(oext) \
+	fclean.$(oext) \
+	fpathconf.$(oext) \
+	fstab.$(oext) \
+	fstatvfs.$(oext) \
+	fstatvfs64.$(oext) \
+	ftw.$(oext) \
+	ftw64.$(oext) \
+	getoptlong.$(oext) \
+	getrlimit64.$(oext) \
+	getwd.$(oext) \
+	io64.$(oext) \
+	malign.$(oext) \
+	malignr.$(oext) \
+	malloptr.$(oext) \
+	mcheck.$(oext) \
+	mntent.$(oext) \
+	mntent_r.$(oext) \
+	pathconf.$(oext) \
+	pread64.$(oext) \
+	pvallocr.$(oext) \
+	pwrite64.$(oext) \
+	readdir64.$(oext) \
+	realpath.$(oext) \
+	scandir64.$(oext) \
+	setrlimit64.$(oext) \
+	statvfs.$(oext) \
+	statvfs64.$(oext) \
+	ttyname_r.$(oext) \
+	utimes.$(oext) \
+	vallocr.$(oext) \
+	versionsort64.$(oext)
+
+ELIX_3_OBJS = \
+	system.$(oext) \
+	wait.$(oext)
+
+ELIX_4_OBJS = \
+	stack.$(oext)
+
+if ELIX_LEVEL_1
+LIB_OBJS =
+else
+if ELIX_LEVEL_2
+LIB_OBJS = $(ELIX_2_OBJS)
+else
+if ELIX_LEVEL_3
+LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
+else
+LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
+endif
+endif
+endif
 
 # 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
@@ -135,25 +156,24 @@ liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
 ADD_OBJS = \
 	malloc.$(oext) \
-	mcheck.$(oext) \
 	$(LINUX_MACH_LIB)
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblinux.la
-liblinux_la_SOURCES = $(LIB_SOURCES)
-liblinux_la_LIBADD = $(ADD_OBJS)
-liblinux_la_DEPENDENCIES = $(ADD_OBJS)
+liblinux_la_SOURCES = $(GENERAL_SOURCES)
+liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
+liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
 LIBC_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_LIBADD = $(ADD_OBJS)
-lib_a_DEPENDENCIES = $(ADD_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES)
+lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
+lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
 LIBC_COMPILE = $(COMPILE)
 noinst_DATA =
 
-lib.a:  $(ADD_OBJS) $(lib_a_OBJECTS)
+lib.a:  $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS)
 	rm -f $@
 	rm -rf tmp
 	mkdir tmp