From ef5bdbd1fed09ce8310f4ec3d1cc808a50216b73 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 7 Feb 2003 15:32:22 +0000 Subject: 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. --- ld/ChangeLog | 9 +++++++++ ld/emultempl/armelf.em | 11 +++++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 958acc0..aa947b4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2003-02-07 Nick Clifton + + * 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 * genscripts.sh (LIB_PATH): Don't append LIBPATH_SUFFIX to paths diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 05a7af0..c0b88f8 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -193,15 +193,14 @@ 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}, ' -- cgit v1.1