diff --git a/ld/.Sanitize b/ld/.Sanitize
index 104a0c0502..bf3cbc6d74 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -45,6 +45,7 @@ ld.1
 gen-doc.texi
 ld.h
 ld.texinfo
+ldcref.c
 ldctor.c
 ldctor.h
 ldemul.c
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 43250c6850..94a541ef67 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,20 @@
+Tue Jun  4 18:43:07 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ldcref.c: New file.
+	* ld.h (add_cref, output_cref): Declare.
+	* ldmain.c (main): Initialize notice_all field.  If it is set at
+	end of link, call output_cref.
+	(notice): Rename from notice_ysym.  Check notice_all.
+	* ldmisc.c (finfo): Make globally visible.
+	* ldmisc.h (finfo): Declare.
+	* lexsup.c (OPTION_CREF): Define.
+	(ld_options): Add "cref".
+	(parse_args): Handle OPTION_CREF.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add ldcref.c.
+	(OFILES): Add ldcref.o.
+	* ld.texinfo, ld.1: Document --cref.
+
 Tue Jun  4 12:12:25 1996  Tom Tromey  <tromey@csk3.cygnus.com>
 
 	* Makefile.in (install): Make $(tooldir) and $(tooldir)/bin.
diff --git a/ld/ld.1 b/ld/ld.1
index 1037e2a0bb..ef3633ee5f 100644
--- a/ld/ld.1
+++ b/ld/ld.1
@@ -33,6 +33,7 @@ ld \- the GNU linker
 .RB "[\|" "\-c\ "\c
 .I commandfile\c
 \&\|] 
+.RB "[\|" \-\-cref "\|]"
 .RB "[\|" \-d | \-dc | \-dp\c
 \|]
 .br
@@ -408,6 +409,12 @@ line by bracketing it between `\|\c
 .B }\c
 \|' characters.
 
+.TP
+.B \-\-cref
+Output a cross reference table.  If a linker map file is being
+generated, the cross reference table is printed to the map file.
+Otherwise, it is printed on the standard output.
+
 .TP
 .B \-d 
 .TP