+2004-10-06 Paolo Bonzini <bonzini@gnu.org>
+
+ Fix wrong conflict resolution in:
+
+ 2004-08-16 Paolo Bonzini <bonzini@gnu.org>
+
+ * Makefile.in: Regenerate.
+ * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
+ in the recursive `make', instead of hardwiring `all'.
+ (Autogenerated TARGET-* variables): New.
+
+2004-10-05 Ulrich Weigand <uweigand@de.ibm.com>
+
+ Merged from GCC / libtool upstream:
+ 2004-10-02 P.J. Darcy <darcypj@us.ibm.com>
+ * ltcf-c.sh (tpf*): Add ld_shlibs=yes.
+ * ltcf-cxx.sh (tpf*): Likewise.
+ * ltconfig (tpf*): Add TPF OS configuration support.
+
2004-09-30 Tomer Levi <Tomer.Levi@nsc.com>
* configure.in: Enable target-libgloss for crx-*-*.