Duplicate --keep-locals entry in order to prevent it being confused with -k.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b48a63ee688780fcc5b809c0e3cb0aaf8d553901..38634c223e13c9790104efa5a4bfacfc5f3c36b5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-17  Nick Clifton  <nickc@redhat.com>
+
+       * as.c (std_longopts): Duplicate --keep-locals entry in order to
+       prevent it being confused with -k.
+
 2002-12-16  Andrew MacLeod  <amacleod@redhat.com>
 
        * config/tc-xstormy16.c (md_cgen_lookup_reloc): If a relocation 

diff --git a/gas/as.c b/gas/as.c
index 0a9d5201bd959619b10f5d834170830f51e69de6..43f413f5e1264980f39a77983a54a9707d578e99 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -378,6 +378,10 @@ parse_args (pargc, pargv)
   static const struct option std_longopts[] = {
 #define OPTION_HELP (OPTION_STD_BASE)
     {"help", no_argument, NULL, OPTION_HELP},
+    /* getopt allows abbreviations, so we do this to stop it from
+       treating -k as an abbreviation for --keep-locals.  Some
+       ports use -k to enable PIC assembly.  */
+    {"keep-locals", no_argument, NULL, 'L'},
     {"keep-locals", no_argument, NULL, 'L'},
     {"mri", no_argument, NULL, 'M'},
 #define OPTION_NOCPP (OPTION_STD_BASE + 1)