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, 74 insertions, 46 deletions

diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index baf3de9fd..cdd7987a0 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -4,12 +4,11 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = \
+GENERAL_SOURCES = \
 	__adjust.c 	\
 	__exp10.c 	\
 	__ten_mu.c 	\
 	_Exit.c		\
-	a64l.c		\
 	abort.c  	\
 	abs.c 		\
 	assert.c  	\
@@ -20,28 +19,17 @@ LIB_SOURCES = \
 	atol.c		\
 	calloc.c	\
 	div.c  		\
-	drand48.c	\
 	dtoa.c 		\
 	dtoastub.c 	\
-	ecvtbuf.c 	\
-	efgcvt.c 	\
 	environ.c	\
 	envlock.c	\
 	eprintf.c	\
-	erand48.c	\
 	exit.c 		\
 	getenv.c  	\
 	getenv_r.c	\
-	getopt.c	\
-	getsubopt.c	\
-	jrand48.c	\
-	l64a.c		\
 	labs.c 		\
-	lcong48.c	\
 	ldiv.c  	\
 	ldtoa.c		\
-	lrand48.c	\
-	malign.c	\
 	malloc.c  	\
 	mblen.c		\
 	mblen_r.c	\
@@ -51,60 +39,100 @@ LIB_SOURCES = \
 	mbtowc_r.c	\
 	mlock.c		\
 	mprec.c		\
-	mrand48.c	\
-	msize.c		\
 	mstats.c	\
-	mtrim.c		\
-	nrand48.c	\
-	on_exit.c	\
-	putenv.c	\
-	putenv_r.c	\
 	rand.c		\
-	rand48.c	\
 	rand_r.c	\
 	realloc.c	\
-	seed48.c	\
-	setenv.c	\
-	setenv_r.c	\
-	srand48.c	\
 	strtod.c	\
 	strtol.c	\
-	strtoll.c	\
-	strtoll_r.c	\
 	strtoul.c	\
-	strtoull.c	\
-	strtoull_r.c	\
-	system.c	\
-	valloc.c	\
 	wcstombs.c	\
 	wcstombs_r.c	\
 	wctomb.c	\
-	wctomb_r.c	\
-	btowc.c		\
-	mbrlen.c	\
-	mbrtowc.c	\
-	mbsinit.c	\
-	mbsrtowcs.c	\
-	wcrtomb.c	\
-	wcsrtombs.c	\
-	wctob.c
+	wctomb_r.c
+
+EXTENDED_SOURCES = \
+	drand48.c	\
+	ecvtbuf.c 	\
+	efgcvt.c 	\
+	erand48.c	\
+	jrand48.c	\
+	lcong48.c	\
+	lrand48.c	\
+	mrand48.c	\
+	msize.c		\
+	mtrim.c		\
+	nrand48.c	\
+	rand48.c	\
+	seed48.c	\
+	srand48.c	\
+	strtoll.c	\
+	strtoll_r.c	\
+	strtoull.c	\
+	strtoull_r.c
+
+ELIX_2_OBJS = \
+	a64l.$(oext)		\
+	btowc.$(oext)		\
+	getopt.$(oext)		\
+	getsubopt.$(oext)	\
+	l64a.$(oext)		\
+	malign.$(oext)		\
+	malignr.$(oext)		\
+	malloptr.$(oext)	\
+	mbrlen.$(oext)		\
+	mbrtowc.$(oext)		\
+	mbsinit.$(oext)		\
+	mbsrtowcs.$(oext)	\
+	on_exit.$(oext)		\
+	pvallocr.$(oext)	\
+	valloc.$(oext)		\
+	vallocr.$(oext)		\
+	wcrtomb.$(oext)		\
+	wcsrtombs.$(oext)	\
+	wctob.$(oext)
+
+ELIX_3_OBJS = \
+	putenv.$(oext)		\
+	putenv_r.$(oext)	\
+	setenv.$(oext)		\
+	setenv_r.$(oext)
+
+ELIX_4_OBJS = \
+	system.$(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
 
 # Because of how libtool moves objects around, mallocr must be built last.
-LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) malignr.$(oext) \
-	vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) mallocr.$(oext)
+LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \
+	mallinfor.$(oext) msizer.$(oext) mallocr.$(oext)
 
 libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstdlib.la
-libstdlib_la_SOURCES = $(LIB_SOURCES)
-libstdlib_la_LIBADD = $(LIBADD_OBJS)
+libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
+libstdlib_la_LIBADD = $(LIB_OBJS) $(LIBADD_OBJS)
+libstdlib_la_DEPENDENCIES = $(LIB_OBJS) $(LIBADD_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) $(EXTENDED_SOURCES)
+lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
+lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
 LIB_COMPILE = $(COMPILE)
 noinst_DATA =
 endif # USE_LIBTOOL