diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1915fa8362..d5e740f8ce 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 30 12:25:55 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ld.h (args_type): Add warn_mismatch field.
+	* ldmain.c (main): Initialize warn_mismatch field.
+	* lexsup.c (parse_args): Handle --no-warn-mismatch option.
+	* ldlang.c (ignore_bfd_error): New static function.
+	(lang_check): If warn_mismatch is false, don't warn about
+	mismatched input files.
+	* ld.texinfo, ld.1: Document new option.
+
 start-sanitize-tx49
 Wed Oct 29 17:50:26 1997  Gavin Koch  <gavin@cygnus.com>
 
diff --git a/ld/ld.1 b/ld/ld.1
index 610f046b69..79c9f102c0 100644
--- a/ld/ld.1
+++ b/ld/ld.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1991, 92, 93, 94, 95, 1996 Free Software Foundation
+.\" Copyright (c) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
 .TH ld 1 "17 August 1992" "cygnus support" "GNU Development Tools"
 .de BP
@@ -91,6 +91,7 @@ ld \- the GNU linker
 .RB "[\|" \-n | \-N "\|]" 
 .RB "[\|" \-noinhibit-exec "\|]" 
 .RB "[\|" \-no\-keep\-memory "\|]" 
+.RB "[\|" \-no\-warn\-mismatch "\|]" 
 .RB "[\|" "\-oformat\ "\c
 .I output-format\c
 \&\|] 
@@ -665,6 +666,16 @@ linker to instead optimize for memory usage, by rereading the symbol
 tables as necessary.  This may be required if the linker runs out of
 memory space while linking a large executable.
 
+.TP
+.B \-no\-warn\-mismatch
+Normally the linker will give an error if you try to link together
+input files that are mismatched for some reason, perhaps because they
+have been compiled for different processors or for different
+endiannesses.  This option tells the linker that it should silently
+permit such possible errors.  This option should only be used with
+care, in cases when you have taken some special action that ensures
+that the linker errors are inappropriate.
+
 .TP
 .BI "\-o " "output"
 .I output\c