2005-10-26 Jeff Johnston <jjohnstn@redhat.com>

        * libc/Makefile.am: Reorder SUBLIBS so machine and sys
        directories can override properly.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 3aaf333..ff3605d 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * libc/Makefile.am: Reorder SUBLIBS so machine and sys
+       directories can override properly.
+
 2005-10-20  Jeff Johnston  <jjohnstn@redhat.com>
 
        * libc/include/math.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): When

diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 8fd0581..feba1b1 100644 (file)
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -50,15 +50,15 @@ SUBLIBS = \
        $(LIBC_SIGNAL_LIB) \
        time/libtime.$(aext) \
        locale/liblocale.$(aext) \
-       $(LIBC_SYS_LIB) \
        reent/libreent.$(aext) \
        $(LIBC_EXTRA_LIB) \
        errno/liberrno.$(aext) \
        misc/libmisc.$(aext) \
-       $(LIBC_MACHINE_LIB) \
        $(LIBC_UNIX_LIB) \
        $(LIBC_POSIX_LIB) \
-       $(LIBC_SYSCALL_LIB)
+       $(LIBC_SYSCALL_LIB) \
+       $(LIBC_MACHINE_LIB) \
+       $(LIBC_SYS_LIB)
 else
 noinst_LIBRARIES = libc.a
 SUBLIBS = \
@@ -72,16 +72,16 @@ SUBLIBS = \
        $(LIBC_SIGNAL_LIB) \
        time/lib.$(aext) \
        locale/lib.$(aext) \
-       $(LIBC_SYS_LIB) \
        reent/lib.$(aext) \
        $(LIBC_EXTRA_LIB) \
        errno/lib.$(aext) \
        misc/lib.$(aext) \
-       $(LIBC_MACHINE_LIB) \
        $(LIBC_UNIX_LIB) \
        $(LIBC_POSIX_LIB) \
        $(LIBC_SYSCALL_LIB) \
-        $(NEWLIB_ICONV_LIBS)
+        $(NEWLIB_ICONV_LIBS) \
+       $(LIBC_MACHINE_LIB) \
+       $(LIBC_SYS_LIB)
 endif
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib

diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index b848858..f94585c 100644 (file)
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -129,8 +129,8 @@ SUBDIRS = argz stdlib ctype search stdio $(STDIO64_SUBDIR) string $(SIGNAL_SUBDI
 noinst_DATA = $(CRT0)
 
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libc.la
-@USE_LIBTOOL_TRUE@SUBLIBS =    argz/libargz.$(aext)    stdlib/libstdlib.$(aext)        ctype/libctype.$(aext)  search/libsearch.$(aext)        stdio/libstdio.$(aext)  $(LIBC_STDIO64_LIB)     string/libstring.$(aext)        $(LIBC_SIGNAL_LIB)      time/libtime.$(aext)    locale/liblocale.$(aext)        $(LIBC_SYS_LIB)         reent/libreent.$(aext)  $(LIBC_EXTRA_LIB)       errno/liberrno.$(aext)  misc/libmisc.$(aext)    $(LIBC_MACHINE_LIB)     $(LIBC_UNIX_LIB)        $(LIBC_POSIX_LIB)       $(LIBC_SYSCALL_LIB)
-@USE_LIBTOOL_FALSE@SUBLIBS =   argz/lib.$(aext)        stdlib/lib.$(aext)      ctype/lib.$(aext)       search/lib.$(aext)      stdio/lib.$(aext)       $(LIBC_STDIO64_LIB)     string/lib.$(aext)      $(LIBC_SIGNAL_LIB)      time/lib.$(aext)        locale/lib.$(aext)      $(LIBC_SYS_LIB)         reent/lib.$(aext)       $(LIBC_EXTRA_LIB)       errno/lib.$(aext)       misc/lib.$(aext)        $(LIBC_MACHINE_LIB)     $(LIBC_UNIX_LIB)        $(LIBC_POSIX_LIB)       $(LIBC_SYSCALL_LIB)         $(NEWLIB_ICONV_LIBS)
+@USE_LIBTOOL_TRUE@SUBLIBS =    argz/libargz.$(aext)    stdlib/libstdlib.$(aext)        ctype/libctype.$(aext)  search/libsearch.$(aext)        stdio/libstdio.$(aext)  $(LIBC_STDIO64_LIB)     string/libstring.$(aext)        $(LIBC_SIGNAL_LIB)      time/libtime.$(aext)    locale/liblocale.$(aext)        reent/libreent.$(aext)  $(LIBC_EXTRA_LIB)       errno/liberrno.$(aext)  misc/libmisc.$(aext)    $(LIBC_UNIX_LIB)        $(LIBC_POSIX_LIB)       $(LIBC_SYSCALL_LIB)     $(LIBC_MACHINE_LIB)     $(LIBC_SYS_LIB)
+@USE_LIBTOOL_FALSE@SUBLIBS =   argz/lib.$(aext)        stdlib/lib.$(aext)      ctype/lib.$(aext)       search/lib.$(aext)      stdio/lib.$(aext)       $(LIBC_STDIO64_LIB)     string/lib.$(aext)      $(LIBC_SIGNAL_LIB)      time/lib.$(aext)        locale/lib.$(aext)      reent/lib.$(aext)       $(LIBC_EXTRA_LIB)       errno/lib.$(aext)       misc/lib.$(aext)        $(LIBC_UNIX_LIB)        $(LIBC_POSIX_LIB)       $(LIBC_SYSCALL_LIB)         $(NEWLIB_ICONV_LIBS)        $(LIBC_MACHINE_LIB)     $(LIBC_SYS_LIB)
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = libc.a
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib