merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index a2a430e39927bdc8b5ef87540892df96e0bdd5c8..cd7200d0404edb77b2f5c1ddc22ebb4934175327 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Brendan Kehoe  <brendan@zen.org>
+
+       * libiberty/Makefile.in (floatformat.o): Add dependency on
+       config.h to accompany change of 2003-12-03.
+
 2003-12-15  Ian Lance Taylor  <ian@wasabisystems.com>
 
        Fix handling of constructor/destructor of standard substitution:

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 5d2dc3cbf8d531e04e63fa527ca4498de84ff61b..5fff39be8b832ce8ae197e44f590196c42bd9f92 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -437,7 +437,8 @@ dyn-string.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/dyn-string.h \
 fdmatch.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 fibheap.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/fibheap.h \
        $(INCDIR)/libiberty.h
-floatformat.o: $(INCDIR)/ansidecl.h $(INCDIR)/floatformat.h
+floatformat.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/floatformat.h \
+       $(INCDIR)/libiberty.h
 fnmatch.o: config.h $(INCDIR)/fnmatch.h $(INCDIR)/safe-ctype.h
 getcwd.o: config.h
 getopt.o: config.h $(INCDIR)/getopt.h