* ldver.c (help): New function.

	* ldver.h: Declare it.
	* ldlex.l, ldgram.y: Recognize new options --help and --version.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2fea547798eef44760af5b87e544085e50d8f15c..0425c130df4176684a22d94fcc18add2f008971f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,10 +1,20 @@
+Sat Jun 26 12:03:57 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+       * ldver.c (help): New function.
+       * ldver.h: Declare it.
+       * ldlex.l, ldgram.y: Recognize new options --help and --version.
+
 Mon Jun 21 20:39:48 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
 
        * Makefile.in (INCLUDES): Don't need ../include any more.
 
 Mon Jun 21 16:38:35 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
 
-       * .Sanitize (Things-to-keep): Add emulparams, emultempl, scripttempl.
+       * ldlex.l, ldgram.y: Support new -oformat option.
+       Remove attempt at supporting script fragments on the command line.
+       * ldlang.c (lang_add_output_format): Take new arg, FROM_SCRIPT.
+       * mri.c (mri_format), ldgram.y: Change callers.
+       * ldlang.h: Change prototype.
 
 Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
        

diff --git a/ld/ld.1 b/ld/ld.1
index e0eb6d0ae835c6e040a5d7b67ec461b678911470..f6eec25cba4eceb62b595350f306c6f93458f644 100644 (file)
--- a/ld/ld.1
+++ b/ld/ld.1
@@ -53,6 +53,7 @@ ld \- the GNU linker
 .RB "[\|" \-G\c
 .I size\c
 \&\|]
+.RB "[\|" \-\-help "\|]"
 .RB "[\|" \-i "\|]"
 .RB "[\|" \-l\c
 .I ar\c
@@ -97,6 +98,7 @@ ld \- the GNU linker
 \&]
 .RB "[\|" \-V "\|]"
 .RB "[\|" \-v "\|]"
+.RB "[\|" \-\-version "\|]"
 .RB "[\|" \-X "\|]" 
 .RB "[\|" \-x "\|]" 
 .ad b
@@ -465,6 +467,15 @@ to
 .I size
 under MIPS ECOFF.  Ignored for other object file formats.
 
+.TP
+.B \-\-help
+Print a summary of the command-line options on the standard output and exit.
+This option and
+.B \-\-version
+begin with two dashes instead of one
+for compatibility with other GNU programs.  The other options start with
+only one dash for compatibility with other linkers.
+
 .TP
 .B \-i
 Perform an incremental link (same as option \c
@@ -742,6 +753,12 @@ Display the version number for \c
 \&.
 Print which input files can and can not be opened.
 
+.TP
+.B \-\-version
+Display the version number for \c
+.B ld
+and exit.
+
 .TP
 .B \-X 
 If \c