Changeset 618 for trunk/src/binutils/gas/as.c

Timestamp:

Aug 16, 2003, 11:33:53 PM (22 years ago)

Author:

bird

Message:

Joined the port of 2.11.2 with 2.14.

File:

• trunk/src/binutils/gas/as.c (modified) (13 diffs, 1 prop)

trunk/src/binutils/gas/as.c

@@ -1 +1 @@
 /* as.c - GAS main program.
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001
+   1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -44 +44 @@
 #include "dwarf2dbg.h"
 
+#ifdef BFD_ASSEMBLER
+#include "bfdver.h"
+#endif
+
 #ifdef HAVE_ITBL_CPU
 #include "itbl-ops.h"
@@ -62 +66 @@
 static void perform_an_assembly_pass PARAMS ((int argc, char **argv));
 static int macro_expr PARAMS ((const char *, int, sb *, int *));
+#ifdef USING_CGEN
+/* Perform any cgen specific initialisation for gas.  */
+extern void gas_cgen_begin PARAMS ((void));
+#endif
 
 /* True if a listing is wanted.  */
@@ -217 +225 @@
 #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);
@@ -359 +367 @@
 
   char *shortopts;
-  extern CONST char *md_shortopts;
+  extern const char *md_shortopts;
   static const char std_shortopts[] = {
     '-', 'J',
@@ -383 +391 @@
 #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'},
@@ -509 +521 @@
 
         case OPTION_TARGET_HELP:
-          md_show_usage (stdout);
-          exit (EXIT_SUCCESS);
+          md_show_usage (stdout);
+          exit (EXIT_SUCCESS);
 
         case OPTION_HELP:
@@ -533 +545 @@
         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);
-          printf (_("Copyright 2001 Free Software Foundation, Inc.\n"));
+#endif
+          printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
           printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
@@ -596 +612 @@
             if (optarg == NULL)
               {
-                as_warn (_("No file name following -t option\n"));
+                as_warn (_("no file name following -t option"));
                 break;
               }
@@ -611 +627 @@
             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;
@@ -774 +787 @@
   *pargc = new_argc;
   *pargv = new_argv;
+
+#ifdef md_after_parse_args
+  md_after_parse_args ();
+#endif
 }
 
 static long start_time;
+
+int main PARAMS ((int, char **));
 
 int
@@ -799 +818 @@
   setlocale (LC_MESSAGES, "");
 #endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   if (debug_memory)
-    {
-#ifdef BFD_ASSEMBLER
-      extern long _bfd_chunksize;
-      _bfd_chunksize = 64;
-#endif
-      chunksize = 64;
-    }
+    chunksize = 64;
 
 #ifdef HOST_SPECIAL_INIT
@@ -1119 +1135 @@
   md_begin ();
 
+#ifdef USING_CGEN
+  gas_cgen_begin ();
+#endif
 #ifdef obj_begin
   obj_begin ();