* as.c (parse_args): Print the date as well for --version.

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

diff --git a/gas/as.c b/gas/as.c
index b8d7b44eb4302b9c033d6209b6f18e4c0dde8054..d5922b07d1aca0a6d9c39a08db4c0080d895ac59 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -208,7 +208,7 @@ print_version_id ()
 
 #ifdef BFD_ASSEMBLER
   fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s"),
-          VERSION, TARGET_ALIAS, BFD_VERSION);
+          VERSION, TARGET_ALIAS, BFD_VERSION_STRING);
 #else
   fprintf (stderr, _("GNU assembler version %s (%s)"), VERSION, TARGET_ALIAS);
 #endif
@@ -232,7 +232,6 @@ Options:\n\
                          m      include macro expansions\n\
                          n      omit forms processing\n\
                          s      include symbols\n\
-                         L      include line debug statistics (if applicable)\n\
                          =FILE  list to FILE (must be last sub-option)\n"));
 
   fprintf (stream, _("\
@@ -402,7 +401,7 @@ parse_args (pargc, pargv)
 #define OPTION_LISTING_LHS_WIDTH (OPTION_STD_BASE + 9)
     {"listing-lhs-width", required_argument, NULL, OPTION_LISTING_LHS_WIDTH},
 #define OPTION_LISTING_LHS_WIDTH2 (OPTION_STD_BASE + 10)
-    {"listing-lhs-width", required_argument, NULL, OPTION_LISTING_LHS_WIDTH2},
+    {"listing-lhs-width2", required_argument, NULL, OPTION_LISTING_LHS_WIDTH2},
 #define OPTION_LISTING_RHS_WIDTH (OPTION_STD_BASE + 11)
     {"listing-rhs-width", required_argument, NULL, OPTION_LISTING_RHS_WIDTH},
 #define OPTION_LISTING_CONT_LINES (OPTION_STD_BASE + 12)
@@ -525,7 +524,7 @@ parse_args (pargc, pargv)
 
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
-         printf (_("GNU assembler %s\n"), VERSION);
+         printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
          printf (_("Copyright 2001 Free Software Foundation, Inc.\n"));
          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
@@ -588,7 +587,7 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
 
            if (optarg == NULL)
              {
-               as_warn (_("No file name following -t option\n"));
+               as_warn (_("no file name following -t option"));
                break;
              }
 
@@ -603,11 +602,8 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
               internal table.  */
            itbl_files->name = xstrdup (optarg);
            if (itbl_parse (itbl_files->name) != 0)
-             {
-               fprintf (stderr, _("Failed to read instruction table %s\n"),
-                        itbl_files->name);
-               exit (EXIT_SUCCESS);
-             }
+             as_fatal (_("failed to read instruction table %s\n"),
+                       itbl_files->name);
          }
          break;
 
@@ -770,6 +766,8 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
 
 static long start_time;
 
+int main PARAMS ((int, char **));
+
 int
 main (argc, argv)
      int argc;
@@ -783,6 +781,9 @@ main (argc, argv)
 
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);