*** empty log message ***

[binutils-gdb.git] / gas / as.c

diff --git a/gas/as.c b/gas/as.c
index 83fbf1a2eaf8f0c0cc38112f6daba36865210546..43f413f5e1264980f39a77983a54a9707d578e99 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -43,6 +43,10 @@
 #include "macro.h"
 #include "dwarf2dbg.h"
 
+#ifdef BFD_ASSEMBLER
+#include "bfdver.h"
+#endif
+
 #ifdef HAVE_ITBL_CPU
 #include "itbl-ops.h"
 #else
@@ -350,7 +354,7 @@ parse_args (pargc, pargv)
      as if it were the argument of an option with character code 1.  */
 
   char *shortopts;
-  extern CONST char *md_shortopts;
+  extern const char *md_shortopts;
   static const char std_shortopts[] = {
     '-', 'J',
 #ifndef WORKING_DOT_WORD
@@ -374,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)