ld -o behaviour

[Ben Elliston]

ian wrote:

  I think it would be also OK to simply remove the -omagic option.  I
  think it was only introduced so that -N would have a long option
  name.

If you think that'll be okay, here is a tested patch.  Comments?

2000-12-26  Ben Elliston  <bje@redhat.com>

	* lexsup.c (ld_options): Remove -omagic; require -N.
	* ld.texinfo (Options): Undocument -omagic.

--- lexsup.c    2000/12/12 20:53:00     1.24
+++ lexsup.c    2000/12/26 09:32:15
@@ -198,7 +198,7 @@
       'M', NULL, N_("Print map file on standard output"), TWO_DASHES },
   { {"nmagic", no_argument, NULL, 'n'},
       'n', NULL, N_("Do not page align data"), TWO_DASHES },
-  { {"omagic", no_argument, NULL, 'N'},
+  { {NULL, no_argument, NULL, 'N'},
       'N', NULL, N_("Do not page align data, do not make text readonly"),
       TWO_DASHES },
   { {"output", required_argument, NULL, 'o'}, 

--- ld.texinfo  2000/12/12 22:37:20     1.29
+++ ld.texinfo  2000/12/26 09:32:56
@@ -562,11 +562,9 @@
 @code{NMAGIC} if possible.

 @kindex -N
-@kindex --omagic
 @cindex read/write from cmd line
 @cindex OMAGIC
 @item -N
-@itemx --omagic
 Set the text and data sections to be readable and writable.  Also, do
 not page-align the data segment.  If the output format supports Unix
 style magic numbers, mark the output as @code{OMAGIC}.