From 90b65e2d06b900f3d282515d2d0f7113a56eca99 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 26 Aug 2002 18:56:09 +0000 Subject: 2002-08-26 Jeff Johnston * 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. --- newlib/libc/reent/Makefile.am | 28 ++++++++++++++++++++-------- newlib/libc/reent/Makefile.in | 37 +++++++++++++++++++++---------------- newlib/libc/reent/fstat64r.c | 4 ++-- newlib/libc/reent/lseek64r.c | 4 ++-- newlib/libc/reent/open64r.c | 4 ++-- 5 files changed, 47 insertions(+), 30 deletions(-) (limited to 'newlib/libc/reent') diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am index 0504158d4..a94be9b5e 100644 --- a/newlib/libc/reent/Makefile.am +++ b/newlib/libc/reent/Makefile.am @@ -16,11 +16,23 @@ STDIO64_DEFS = \ open64r.def endif -LIB_SOURCES = \ +ELIX_2_OBJS = $(STDIO64_OBJECTS) +ELIX_3_OBJS = execr.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +endif +endif + +GENERAL_SOURCES = \ closer.c \ reent.c \ impure.c \ - execr.c \ fstatr.c \ getreent.c \ linkr.c \ @@ -39,15 +51,15 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libreent.la -libreent_la_SOURCES = $(LIB_SOURCES) -libreent_la_LIBADD = $(STDIO64_OBJECTS) -libreent_la_DEPENDENCIES = $(STDIO64_OBJECTS) +libreent_la_SOURCES = $(GENERAL_SOURCES) +libreent_la_LIBADD = $(LIB_OBJS) +libreent_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) -lib_a_LIBADD = $(STDIO64_OBJECTS) -lib_a_DEPENDENCIES = $(STDIO64_OBJECTS) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in index 91d0bce7a..8333eafe5 100644 --- a/newlib/libc/reent/Makefile.in +++ b/newlib/libc/reent/Makefile.in @@ -120,11 +120,16 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) @HAVE_STDIO64_DIR_TRUE@ lseek64r.def \ @HAVE_STDIO64_DIR_TRUE@ open64r.def -LIB_SOURCES = \ +ELIX_2_OBJS = $(STDIO64_OBJECTS) +ELIX_3_OBJS = execr.$(oext) +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) + +GENERAL_SOURCES = \ closer.c \ reent.c \ impure.c \ - execr.c \ fstatr.c \ getreent.c \ linkr.c \ @@ -143,15 +148,15 @@ LIB_SOURCES = \ libreent_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libreent.la -@USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) -@USE_LIBTOOL_TRUE@libreent_la_LIBADD = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS) -@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS) +@USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libreent_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS) -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = \ closer.def \ @@ -187,17 +192,17 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ @USE_LIBTOOL_FALSE@lib_a_OBJECTS = closer.$(OBJEXT) reent.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@impure.$(OBJEXT) execr.$(OBJEXT) fstatr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getreent.$(OBJEXT) linkr.$(OBJEXT) lseekr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@openr.$(OBJEXT) readr.$(OBJEXT) signalr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@signgam.$(OBJEXT) sbrkr.$(OBJEXT) statr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@timer.$(OBJEXT) unlinkr.$(OBJEXT) writer.$(OBJEXT) +@USE_LIBTOOL_FALSE@impure.$(OBJEXT) fstatr.$(OBJEXT) getreent.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@linkr.$(OBJEXT) lseekr.$(OBJEXT) openr.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@readr.$(OBJEXT) signalr.$(OBJEXT) signgam.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sbrkr.$(OBJEXT) statr.$(OBJEXT) timer.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@unlinkr.$(OBJEXT) writer.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) @USE_LIBTOOL_TRUE@libreent_la_OBJECTS = closer.lo reent.lo impure.lo \ -@USE_LIBTOOL_TRUE@execr.lo fstatr.lo getreent.lo linkr.lo lseekr.lo \ -@USE_LIBTOOL_TRUE@openr.lo readr.lo signalr.lo signgam.lo sbrkr.lo \ -@USE_LIBTOOL_TRUE@statr.lo timer.lo unlinkr.lo writer.lo +@USE_LIBTOOL_TRUE@fstatr.lo getreent.lo linkr.lo lseekr.lo openr.lo \ +@USE_LIBTOOL_TRUE@readr.lo signalr.lo signgam.lo sbrkr.lo statr.lo \ +@USE_LIBTOOL_TRUE@timer.lo unlinkr.lo writer.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/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c index c74cf58d4..c418778b7 100644 --- a/newlib/libc/reent/fstat64r.c +++ b/newlib/libc/reent/fstat64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of fstat system call. This implementation just calls the fstat system call. */ @@ -8,6 +6,8 @@ #include #include <_syslist.h> +#ifdef __LARGE64_FILES + /* Some targets provides their own versions of these functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c index c760a5b5d..886734be8 100644 --- a/newlib/libc/reent/lseek64r.c +++ b/newlib/libc/reent/lseek64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of lseek system call. */ #include @@ -9,6 +7,8 @@ /* Some targets provides their own versions of this functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ +#ifdef __LARGE64_FILES + #ifdef _REENT_ONLY #ifndef REENTRANT_SYSCALLS_PROVIDED #define REENTRANT_SYSCALLS_PROVIDED diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c index d5ec7bcc5..30310d301 100644 --- a/newlib/libc/reent/open64r.c +++ b/newlib/libc/reent/open64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of open system call. */ #include @@ -7,6 +5,8 @@ #include #include <_syslist.h> +#ifdef __LARGE64_FILES + /* Some targets provides their own versions of this functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ -- cgit v1.2.3