2005-04-07 Shaun Jackman <sjackman@gmail.com>

        * libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no
        ELIX level is defined.
        * libc/unix/Makefile.in: Regenerated.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0b3b337..68097d1 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-07  Shaun Jackman  <sjackman@gmail.com>
+
+       * libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no
+       ELIX level is defined.
+       * libc/unix/Makefile.in: Regenerated.
+
 2005-04-05  Dave Korn  <dave.korn@artimi.com>
 
        * libc/stdio/vfscanf.c (__svfscanf_r): If an error occurs processing

diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index 24d1bfb..a5d57cf 100644 (file)
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -29,12 +29,10 @@ else
 if ELIX_LEVEL_3
 LIB_OBJS = $(ELIX_2_OBJS)
 else
-if ELIX_LEVEL_4
 LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
 endif
 endif
 endif
-endif
 
 libunix_la_LDFLAGS = -Xcompiler -nostdlib
 

diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index cdc056b..a3bb1b0 100644 (file)
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -121,7 +121,7 @@ ELIX_4_OBJS =       getlogin.$(oext)                getpass.$(oext)                 getpwent.$(oext)                getut.$(o
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
 
 libunix_la_LDFLAGS = -Xcompiler -nostdlib