merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index cf9d8e47e3ab9d2088362a4f658bf0497b11270d..b085addcfb16a48d965418d599e01bbb1ac97b22 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-14  Loren J. Rittle  <ljrittle@acm.org>
+
+       * Makefile.in (distclean): Remove config.cache.
+
 2004-01-13  Daniel Jacobowitz  <drow@mvista.com>
 
        * cp-demangle.c (d_make_comp): DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 139cb68a11f657a1b798171f6f761b048c305475..fc86feb4bba21a6365988dfc86c5c7786a94168d 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -376,7 +376,7 @@ clean: clean-subdir
 distclean: distclean-subdir
        $(MAKE) SUBDIRS="" clean
        @$(MULTICLEAN) multi-clean DO=distclean
-       -rm -f *~ Makefile config.status xhost-mkfrag TAGS multilib.out
+       -rm -f *~ Makefile config.cache config.status xhost-mkfrag TAGS multilib.out
        -rm -f config.log
        -rmdir testsuite 2>/dev/null
 maintainer-clean realclean: maintainer-clean-subdir