Fix comment from last commit.

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

diff --git a/gas/as.c b/gas/as.c
index dab04e947ef4cc34d7c0ddddcbb88f3f90b1a9b8..346ecc84c03749e1e1a8bc67b5fd1fdaae658820 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -350,7 +350,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
@@ -500,8 +500,8 @@ parse_args (pargc, pargv)
          break;
 
        case OPTION_TARGET_HELP:
-          md_show_usage (stdout);
-          exit (EXIT_SUCCESS);
+         md_show_usage (stdout);
+         exit (EXIT_SUCCESS);
 
        case OPTION_HELP:
          show_usage (stdout);
@@ -524,7 +524,11 @@ parse_args (pargc, pargv)
 
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
+#ifdef BFD_ASSEMBLER
          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
+#else
+         printf (_("GNU assembler %s\n"), VERSION);
+#endif
          printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
@@ -793,13 +797,7 @@ main (argc, argv)
   textdomain (PACKAGE);
 
   if (debug_memory)
-    {
-#ifdef BFD_ASSEMBLER
-      extern long _bfd_chunksize;
-      _bfd_chunksize = 64;
-#endif
-      chunksize = 64;
-    }
+    chunksize = 64;
 
 #ifdef HOST_SPECIAL_INIT
   HOST_SPECIAL_INIT (argc, argv);