X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ChangeLog;h=cf51807869c26f5d9a0698631b6d61404c4d9f2a;hb=938d2b7434405c3e8cf1ceeb9496ff0bac01e84c;hp=027f923376aa0b1b77a39a8bc76c455abf3ad2f3;hpb=f5f8b5baf4e8df45804583c7a8494b1f257cc0ed;p=deliverable%2Fbinutils-gdb.git

diff --git a/ChangeLog b/ChangeLog
index 027f923376..cf51807869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Merge from gcc:
+	PR bootstrap/43615
+	PR bootstrap/43328
+	Revert:
+	2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	* configure.ac: Do not pass --enable-multilib nor
+	--disable-multilib in baseargs.  Accept explicitly passed
+	--enable_multilib.
+	* configure: Regenerate.
+
 2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	PR bootstrap/43328