merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e3e8614d1cba34cebf0ce712901f456284bbc98f..6e9f93fcc75c09883ca60a647f14fb659f123748 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-25  Daniel Jacobowitz  <drow@mvista.com>
+
+       * Makefile.in (regex.o): Add dependency on config.h.
+
 2001-07-18  Andreas Schwab  <schwab@suse.de>
 
        * regex.c (WORDCHAR_P) [WCHAR]: Also return true for the

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index fd2f41581187f80dc134b954c5c94f8cc1ed4d3c..0cded6b6f653bf7e06f8946819c6be5d3214ce4f 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -282,7 +282,7 @@ objalloc.o: config.h $(INCDIR)/objalloc.h
 obstack.o: config.h $(INCDIR)/obstack.h
 partition.o: config.h $(INCDIR)/partition.h
 pexecute.o: config.h $(INCDIR)/libiberty.h
-regex.o: $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
+regex.o: config.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
 rename.o: config.h
 setenv.o: config.h
 sort.o: config.h $(INCDIR)/sort.h $(INCDIR)/ansidecl.h