Add 'n' in order to prevent "-n" from being taken as an abbreviation for

"--no-pipeline-knowledge".

3 files changed, 14 insertions, 1 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 57b607c..3663948 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+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-08  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldlang.c (lang_size_sections_1): Don't complain about
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index c570486..78a0c35 100644
--- 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\''},
diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index e9cf48f..2678409 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -104,11 +104,13 @@ foreach testitem $seltests {
     }
 
     # V850 targets need libgcc.a
+    # FIXME: This does not work with installed toolchains!
     if [istarget v850*-*-elf] {
 	set objfile "$objfile -L ../gcc -lgcc"
     }
 
     # ARM targets need libgcc.a in THUMB mode so that __call_via_r3 is provided
+    # FIXME: This does not work with installed toolchains!
     if {[istarget arm-*-*] || [istarget xscale-*-*]} {
 	set objfile "$objfile -L ../gcc -lgcc"
     }