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, 21 insertions, 13 deletions

diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index 77885e43e..ac388328e 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -4,11 +4,9 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = \
-	asprintf.c			\
+GENERAL_SOURCES = \
 	clearerr.c 			\
 	fclose.c 			\
-	fcloseall.c			\
 	fdopen.c 			\
 	feof.c 				\
 	ferror.c 			\
@@ -28,10 +26,8 @@ LIB_SOURCES = \
 	freopen.c 			\
 	fscanf.c 			\
 	fseek.c 			\
-	fseeko.c 			\
 	fsetpos.c 			\
 	ftell.c 			\
-	ftello.c 			\
 	fvwrite.c 			\
 	fwalk.c 			\
 	fwrite.c 			\
@@ -42,10 +38,8 @@ LIB_SOURCES = \
 	getdelim.c			\
 	getline.c			\
 	gets.c 				\
-	getw.c				\
 	iprintf.c 			\
 	makebuf.c			\
-	mktemp.c 			\
 	perror.c 			\
 	printf.c 			\
 	putc.c 				\
@@ -53,7 +47,6 @@ LIB_SOURCES = \
 	putc_u.c			\
 	putchar_u.c			\
 	puts.c 				\
-	putw.c				\
 	refill.c 			\
 	remove.c 			\
 	rename.c 			\
@@ -72,7 +65,6 @@ LIB_SOURCES = \
 	tmpfile.c 			\
 	tmpnam.c 			\
 	ungetc.c 			\
-	vasprintf.c			\
 	vfscanf.c 			\
 	vprintf.c 			\
 	vscanf.c			\
@@ -82,20 +74,36 @@ LIB_SOURCES = \
 	wbuf.c 				\
 	wsetup.c 
 
+## The following are EL/IX level 2 interfaces
+if ELIX_LEVEL_1
+LIB_OBJS =
+else
+LIB_OBJS = \
+	asprintf.$(oext)		\
+	fcloseall.$(oext)		\
+	fseeko.$(oext) 			\
+	ftello.$(oext) 			\
+	getw.$(oext)			\
+	mktemp.$(oext) 			\
+	putw.$(oext)
+endif
+
 LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext)
 
 libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstdio.la
-libstdio_la_SOURCES = $(LIB_SOURCES)
-libstdio_la_LIBADD = $(LIBADD_OBJS)
+libstdio_la_SOURCES = $(GENERAL_SOURCES)
+libstdio_la_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
+libstdio_la_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
 LIB_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_LIBADD = $(LIBADD_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES)
+lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
+lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
 LIB_COMPILE = $(COMPILE)
 noinst_DATA =
 endif # USE_LIBTOOL