diff --git a/ld/ChangeLog b/ld/ChangeLog
index f7df81645e..e3e975059d 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 29 15:21:50 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* ldlang.c (lang_check): Don't try to set the architecture if the
+	input and output files are incompatible.  Just warn.
+
 Wed Aug 24 12:52:30 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
 	* configure.in: Change i[34]86 to i[345]86.