diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2002-08-26 22:56:09 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2002-08-26 22:56:09 +0400 |
| commit | 90b65e2d06b900f3d282515d2d0f7113a56eca99 (patch) | |
| tree | 5a624046078a7d6cdab38a41210143de1ea52a48 /newlib/libc/ctype | |
| parent | 874ab2d639a959d5f51839d4d315b2f2738cf359 (diff) | |
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.
Diffstat (limited to 'newlib/libc/ctype')
| -rw-r--r-- | newlib/libc/ctype/Makefile.am | 29 | ||||
| -rw-r--r-- | newlib/libc/ctype/Makefile.in | 41 |
2 files changed, 41 insertions, 29 deletions
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am index 216950c1b..1572aa698 100644 --- a/newlib/libc/ctype/Makefile.am +++ b/newlib/libc/ctype/Makefile.am @@ -4,12 +4,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ ctype_.c \ isalnum.c \ isalpha.c \ - isascii.c \ - isblank.c \ iscntrl.c \ isdigit.c \ islower.c \ @@ -18,21 +16,34 @@ LIB_SOURCES = \ ispunct.c \ isspace.c \ isxdigit.c \ - toascii.c \ tolower.c \ - toupper.c \ - _tolower.c \ - _toupper.c + toupper.c + +## The following handles EL/IX level 2 functions +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + isascii.$(oext) \ + isblank.$(oext) \ + toascii.$(oext) \ + _tolower.$(oext) \ + _toupper.$(oext) +endif libctype_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libctype.la -libctype_la_SOURCES = $(LIB_SOURCES) +libctype_la_SOURCES = $(GENERAL_SOURCES) +libctype_la_LIBADD = $(LIB_OBJS) +libctype_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +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/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in index 5878fae65..38358d788 100644 --- a/newlib/libc/ctype/Makefile.in +++ b/newlib/libc/ctype/Makefile.in @@ -110,12 +110,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ ctype_.c \ isalnum.c \ isalpha.c \ - isascii.c \ - isblank.c \ iscntrl.c \ isdigit.c \ islower.c \ @@ -124,21 +122,29 @@ LIB_SOURCES = \ ispunct.c \ isspace.c \ isxdigit.c \ - toascii.c \ tolower.c \ - toupper.c \ - _tolower.c \ - _toupper.c + toupper.c +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ isascii.$(oext) \ +@ELIX_LEVEL_1_FALSE@ isblank.$(oext) \ +@ELIX_LEVEL_1_FALSE@ toascii.$(oext) \ +@ELIX_LEVEL_1_FALSE@ _tolower.$(oext) \ +@ELIX_LEVEL_1_FALSE@ _toupper.$(oext) libctype_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libctype.la -@USE_LIBTOOL_TRUE@libctype_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libctype_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libctype_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libctype_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_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 = \ isalnum.def \ @@ -172,24 +178,19 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = @USE_LIBTOOL_FALSE@lib_a_OBJECTS = ctype_.$(OBJEXT) isalnum.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) isascii.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isblank.$(OBJEXT) iscntrl.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) iscntrl.$(OBJEXT) \ @USE_LIBTOOL_FALSE@isdigit.$(OBJEXT) islower.$(OBJEXT) \ @USE_LIBTOOL_FALSE@isupper.$(OBJEXT) isprint.$(OBJEXT) \ @USE_LIBTOOL_FALSE@ispunct.$(OBJEXT) isspace.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) toascii.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tolower.$(OBJEXT) toupper.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@_tolower.$(OBJEXT) _toupper.$(OBJEXT) +@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) tolower.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@toupper.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libctype_la_LIBADD = @USE_LIBTOOL_TRUE@libctype_la_OBJECTS = ctype_.lo isalnum.lo isalpha.lo \ -@USE_LIBTOOL_TRUE@isascii.lo isblank.lo iscntrl.lo isdigit.lo \ -@USE_LIBTOOL_TRUE@islower.lo isupper.lo isprint.lo ispunct.lo \ -@USE_LIBTOOL_TRUE@isspace.lo isxdigit.lo toascii.lo tolower.lo \ -@USE_LIBTOOL_TRUE@toupper.lo _tolower.lo _toupper.lo +@USE_LIBTOOL_TRUE@iscntrl.lo isdigit.lo islower.lo isupper.lo \ +@USE_LIBTOOL_TRUE@isprint.lo ispunct.lo isspace.lo isxdigit.lo \ +@USE_LIBTOOL_TRUE@tolower.lo toupper.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) |