Add duplicate entry for no-pipeline-knowledge. This will prevent the getopt

package from thinking that there are any shorter abbreviations for
--no-pipeline-knowledge.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 958acc005d750eb99534b207133382142a8cb94c..aa947b45d7388bdae4558519e942cf773f853c9d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-07  Nick Clifton  <[email protected]>
+
+       * emultempl/armelf.em (PARSE_AND_LIST_SHORTOPTS): Remove 'n' short
+       opt.
+       (PARSE_AND_LIST_LONGOPTS): Add duplicate entry for
+       no-pipeline-knowledge.  This will prevent the getopt package from
+       thinking that there are any shorter abbreviations for
+       --no-pipeline-knowledge.
+
 2003-02-07  Jakub Jelinek  <[email protected]>
 
        * genscripts.sh (LIB_PATH): Don't append LIBPATH_SUFFIX to paths

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 05a7af0f8b5401515cf4d57c48705139a060fdd2..c0b88f8ea7bc40441ffc767f657991b21811d723 100644 (file)
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -193,14 +193,13 @@ PARSE_AND_LIST_PROLOGUE='
 #define OPTION_THUMB_ENTRY             301
 '
 
-# 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_SHORTOPTS=p
 
+# Note we have duplicate entries for no-pipeline-knowledge in order
+# to prevent getopt_long_only from thinking that -n is a unique
+# abbreviation for --no-pipeline-knowledge.
 PARSE_AND_LIST_LONGOPTS='
+  { "no-pipeline-knowledge", no_argument, NULL, '\'p\''},
   { "no-pipeline-knowledge", no_argument, NULL, '\'p\''},
   { "thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
 '