Add 'n' to short option list in order to prevent "-n" from being taken as an

abbreviation for "--no-pipeline-knowledge".

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 00968dc751111a29c36b71db489c8fff89b0351b..6f6e0d3f9e4b6a54444d1e307456b62c79f4cba8 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -28,6 +28,12 @@
        * emulparams/elf64_s390.sh (ARCH): Change to "s390:64-bit".
        * emulparams/elf_s390.sh (ARCH): Change to "s390:31-bit".
 
+2002-04-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * emultempl/armelf.em (PARSE_AND_LIST_SHORTOPTS): Add 'n' in order
+       to prevent "-n" from being taken as an abbreviation for
+       "--no-pipeline-knowledge".
+
 2002-04-04  Alan Modra  <amodra@bigpond.net.au>
 
        * dep-in.sed: Cope with absolute paths.

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index c570486f6c0eb770c1ecd1ad9b2698012c96cd0f..78a0c35d4b5ab365cb9d1a32dbc16052e932d71c 100644 (file)
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -156,7 +156,12 @@ PARSE_AND_LIST_PROLOGUE='
 #define OPTION_THUMB_ENTRY             301
 '
 
-PARSE_AND_LIST_SHORTOPTS=p
+# Note we add 'n' to the short option list in order to prevent
+# getopt_long_only from thinking that -n is a unique abbreviation
+# for --no-pipeline-knowledge.  There is no case to handle 'n' here
+# however, so instead it will be passed back to parse_args() in
+# lexsup.c where it will be handled.
+PARSE_AND_LIST_SHORTOPTS=pn
 
 PARSE_AND_LIST_LONGOPTS='
   { "no-pipeline-knowledge", no_argument, NULL, '\'p\''},