gdb/

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

diff --git a/gas/as.c b/gas/as.c
index b05f9d514a3086189fd0d0aeec00e32e0e0fe6dc..1325038f532191f47a312bbb71679b5b37f5cd1f 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -1,19 +1,20 @@
 /* as.c - GAS main program.
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 /* as.c - GAS main program.
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,

-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    any later version.
 

-   GAS is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GAS is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.

 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free


@@ -45,13 +46,12 @@
 #ifdef HAVE_ITBL_CPU
 #include "itbl-ops.h"
 #else
 #ifdef HAVE_ITBL_CPU
 #include "itbl-ops.h"
 #else

-#define itbl_parse(itbl_file) 1

 #define itbl_init()
 #endif
 
 #ifdef HAVE_SBRK
 #ifdef NEED_DECLARATION_SBRK
 #define itbl_init()
 #endif
 
 #ifdef HAVE_SBRK
 #ifdef NEED_DECLARATION_SBRK

-extern PTR sbrk ();
+extern void *sbrk ();

 #endif
 #endif
 
 #endif
 #endif
 


@@ -60,13 +60,6 @@ extern PTR sbrk ();
 extern void gas_cgen_begin (void);
 #endif
 
 extern void gas_cgen_begin (void);
 #endif
 

-/* Keep a record of the itbl files we read in.  */
-struct itbl_file_list
-{
-  struct itbl_file_list *next;
-  char *name;
-};
-

 /* We build a list of defsyms as we read the options, and then define
    them after we have initialized everything.  */
 struct defsym_list
 /* We build a list of defsyms as we read the options, and then define
    them after we have initialized everything.  */
 struct defsym_list


@@ -106,6 +99,9 @@ int debug_memory = 0;
 /* Enable verbose mode.  */
 int verbose = 0;
 
 /* Enable verbose mode.  */
 int verbose = 0;
 

+/* Keep the output file.  */
+int keep_it = 0;
+

 segT reg_section;
 segT expr_section;
 segT text_section;
 segT reg_section;
 segT expr_section;
 segT text_section;


@@ -117,7 +113,15 @@ static char *listing_filename = NULL;
 
 static struct defsym_list *defsyms;
 
 
 static struct defsym_list *defsyms;
 

+#ifdef HAVE_ITBL_CPU
+/* Keep a record of the itbl files we read in.  */
+struct itbl_file_list
+{
+  struct itbl_file_list *next;
+  char *name;
+};

 static struct itbl_file_list *itbl_files;
 static struct itbl_file_list *itbl_files;

+#endif

 
 static long start_time;
 
 
 static long start_time;
 


@@ -232,6 +236,7 @@ Options:\n\
                          Sub-options [default hls]:\n\
                          c      omit false conditionals\n\
                          d      omit debugging directives\n\
                          Sub-options [default hls]:\n\
                          c      omit false conditionals\n\
                          d      omit debugging directives\n\

+                         g      include general info\n\

                          h      include high-level source\n\
                          l      include assembly\n\
                          m      include macro expansions\n\
                          h      include high-level source\n\
                          l      include assembly\n\
                          m      include macro expansions\n\


@@ -241,9 +246,20 @@ Options:\n\
 
   fprintf (stream, _("\
   --alternate             initially turn on alternate macro syntax\n"));
 
   fprintf (stream, _("\
   --alternate             initially turn on alternate macro syntax\n"));

+#ifdef HAVE_ZLIB_H
+  fprintf (stream, _("\
+  --compress-debug-sections\n\
+                          compress DWARF debug sections using zlib\n"));
+  fprintf (stream, _("\
+  --nocompress-debug-sections\n\
+                          don't compress DWARF debug sections\n"));
+#endif /* HAVE_ZLIB_H */

   fprintf (stream, _("\
   -D                      produce assembler debugging messages\n"));
   fprintf (stream, _("\
   fprintf (stream, _("\
   -D                      produce assembler debugging messages\n"));
   fprintf (stream, _("\

+  --debug-prefix-map OLD=NEW\n\
+                          map OLD to NEW in debug information\n"));
+  fprintf (stream, _("\

   --defsym SYM=VAL        define symbol SYM to given value\n"));
 #ifdef USE_EMULATIONS
   {
   --defsym SYM=VAL        define symbol SYM to given value\n"));
 #ifdef USE_EMULATIONS
   {


@@ -268,6 +284,9 @@ Options:\n\
   --execstack             require executable stack for this object\n"));
   fprintf (stream, _("\
   --noexecstack           don't require executable stack for this object\n"));
   --execstack             require executable stack for this object\n"));
   fprintf (stream, _("\
   --noexecstack           don't require executable stack for this object\n"));

+  fprintf (stream, _("\
+  --size-check=[error|warning]\n\
+                         ELF .size directive check (default --size-check=error)\n"));

 #endif
   fprintf (stream, _("\
   -f                      skip whitespace and comment preprocessing\n"));
 #endif
   fprintf (stream, _("\
   -f                      skip whitespace and comment preprocessing\n"));


@@ -321,9 +340,11 @@ Options:\n\
   --warn                  don't suppress warnings\n"));
   fprintf (stream, _("\
   --fatal-warnings        treat warnings as errors\n"));
   --warn                  don't suppress warnings\n"));
   fprintf (stream, _("\
   --fatal-warnings        treat warnings as errors\n"));

+#ifdef HAVE_ITBL_CPU

   fprintf (stream, _("\
   --itbl INSTTBL          extend instruction set to include instructions\n\
                           matching the specifications defined in file INSTTBL\n"));
   fprintf (stream, _("\
   --itbl INSTTBL          extend instruction set to include instructions\n\
                           matching the specifications defined in file INSTTBL\n"));

+#endif

   fprintf (stream, _("\
   -w                      ignored\n"));
   fprintf (stream, _("\
   fprintf (stream, _("\
   -w                      ignored\n"));
   fprintf (stream, _("\


@@ -390,8 +411,10 @@ parse_args (int * pargc, char *** pargv)
     'v',
 #endif
     'w', 'X',
     'v',
 #endif
     'w', 'X',

+#ifdef HAVE_ITBL_CPU

     /* New option for extending instruction set (see also --itbl below).  */
     't', ':',
     /* New option for extending instruction set (see also --itbl below).  */
     't', ':',

+#endif

     '\0'
   };
   struct option *longopts;
     '\0'
   };
   struct option *longopts;


@@ -407,8 +430,8 @@ parse_args (int * pargc, char *** pargv)
       OPTION_DUMPCONFIG,
       OPTION_VERBOSE,
       OPTION_EMULATION,
       OPTION_DUMPCONFIG,
       OPTION_VERBOSE,
       OPTION_EMULATION,

+      OPTION_DEBUG_PREFIX_MAP,

       OPTION_DEFSYM,
       OPTION_DEFSYM,

-      OPTION_INSTTBL,

       OPTION_LISTING_LHS_WIDTH,
       OPTION_LISTING_LHS_WIDTH2,
       OPTION_LISTING_RHS_WIDTH,
       OPTION_LISTING_LHS_WIDTH,
       OPTION_LISTING_LHS_WIDTH2,
       OPTION_LISTING_RHS_WIDTH,


@@ -423,11 +446,14 @@ parse_args (int * pargc, char *** pargv)
       OPTION_TARGET_HELP,
       OPTION_EXECSTACK,
       OPTION_NOEXECSTACK,
       OPTION_TARGET_HELP,
       OPTION_EXECSTACK,
       OPTION_NOEXECSTACK,

+      OPTION_SIZE_CHECK,

       OPTION_ALTERNATE,
       OPTION_AL,
       OPTION_HASH_TABLE_SIZE,
       OPTION_REDUCE_MEMORY_OVERHEADS,
       OPTION_ALTERNATE,
       OPTION_AL,
       OPTION_HASH_TABLE_SIZE,
       OPTION_REDUCE_MEMORY_OVERHEADS,

-      OPTION_WARN_FATAL
+      OPTION_WARN_FATAL,
+      OPTION_COMPRESS_DEBUG,
+      OPTION_NOCOMPRESS_DEBUG

     /* When you add options here, check that they do
        not collide with OPTION_MD_BASE.  See as.h.  */
     };
     /* When you add options here, check that they do
        not collide with OPTION_MD_BASE.  See as.h.  */
     };


@@ -435,7 +461,7 @@ parse_args (int * pargc, char *** pargv)
   static const struct option std_longopts[] =
   {
     /* Note: commas are placed at the start of the line rather than
   static const struct option std_longopts[] =
   {
     /* Note: commas are placed at the start of the line rather than

-       the end of the preceeding line so that it is simpler to
+       the end of the preceding line so that it is simpler to

        selectively add and remove lines from this list.  */
     {"alternate", no_argument, NULL, OPTION_ALTERNATE}
     /* The entry for "a" is here to prevent getopt_long_only() from
        selectively add and remove lines from this list.  */
     {"alternate", no_argument, NULL, OPTION_ALTERNATE}
     /* The entry for "a" is here to prevent getopt_long_only() from


@@ -445,12 +471,16 @@ parse_args (int * pargc, char *** pargv)
     ,{"a", optional_argument, NULL, 'a'}
     /* Handle -al=<FILE>.  */
     ,{"al", optional_argument, NULL, OPTION_AL}
     ,{"a", optional_argument, NULL, 'a'}
     /* Handle -al=<FILE>.  */
     ,{"al", optional_argument, NULL, OPTION_AL}

+    ,{"compress-debug-sections", no_argument, NULL, OPTION_COMPRESS_DEBUG}
+    ,{"nocompress-debug-sections", no_argument, NULL, OPTION_NOCOMPRESS_DEBUG}
+    ,{"debug-prefix-map", required_argument, NULL, OPTION_DEBUG_PREFIX_MAP}

     ,{"defsym", required_argument, NULL, OPTION_DEFSYM}
     ,{"dump-config", no_argument, NULL, OPTION_DUMPCONFIG}
     ,{"emulation", required_argument, NULL, OPTION_EMULATION}
 #if defined OBJ_ELF || defined OBJ_MAYBE_ELF
     ,{"execstack", no_argument, NULL, OPTION_EXECSTACK}
     ,{"noexecstack", no_argument, NULL, OPTION_NOEXECSTACK}
     ,{"defsym", required_argument, NULL, OPTION_DEFSYM}
     ,{"dump-config", no_argument, NULL, OPTION_DUMPCONFIG}
     ,{"emulation", required_argument, NULL, OPTION_EMULATION}
 #if defined OBJ_ELF || defined OBJ_MAYBE_ELF
     ,{"execstack", no_argument, NULL, OPTION_EXECSTACK}
     ,{"noexecstack", no_argument, NULL, OPTION_NOEXECSTACK}

+    ,{"size-check", required_argument, NULL, OPTION_SIZE_CHECK}

 #endif
     ,{"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL}
     ,{"gdwarf-2", no_argument, NULL, OPTION_GDWARF2}
 #endif
     ,{"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL}
     ,{"gdwarf-2", no_argument, NULL, OPTION_GDWARF2}


@@ -462,13 +492,15 @@ parse_args (int * pargc, char *** pargv)
     ,{"gstabs+", no_argument, NULL, OPTION_GSTABS_PLUS}
     ,{"hash-size", required_argument, NULL, OPTION_HASH_TABLE_SIZE}
     ,{"help", no_argument, NULL, OPTION_HELP}
     ,{"gstabs+", no_argument, NULL, OPTION_GSTABS_PLUS}
     ,{"hash-size", required_argument, NULL, OPTION_HASH_TABLE_SIZE}
     ,{"help", no_argument, NULL, OPTION_HELP}

+#ifdef HAVE_ITBL_CPU

     /* New option for extending instruction set (see also -t above).
        The "-t file" or "--itbl file" option extends the basic set of
        valid instructions by reading "file", a text file containing a
        list of instruction formats.  The additional opcodes and their
        formats are added to the built-in set of instructions, and
        mnemonics for new registers may also be defined.  */
     /* New option for extending instruction set (see also -t above).
        The "-t file" or "--itbl file" option extends the basic set of
        valid instructions by reading "file", a text file containing a
        list of instruction formats.  The additional opcodes and their
        formats are added to the built-in set of instructions, and
        mnemonics for new registers may also be defined.  */

-    ,{"itbl", required_argument, NULL, OPTION_INSTTBL}
+    ,{"itbl", required_argument, NULL, 't'}
+#endif

     /* 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.  */
     /* 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.  */


@@ -496,7 +528,8 @@ parse_args (int * pargc, char *** pargv)
      dependent list.  Include space for an extra NULL option and
      always NULL terminate.  */
   shortopts = concat (std_shortopts, md_shortopts, (char *) NULL);
      dependent list.  Include space for an extra NULL option and
      always NULL terminate.  */
   shortopts = concat (std_shortopts, md_shortopts, (char *) NULL);

-  longopts = xmalloc (sizeof (std_longopts) + md_longopts_size + sizeof (struct option));
+  longopts = (struct option *) xmalloc (sizeof (std_longopts)
+                                        + md_longopts_size + sizeof (struct option));

   memcpy (longopts, std_longopts, sizeof (std_longopts));
   memcpy (((char *) longopts) + sizeof (std_longopts), md_longopts, md_longopts_size);
   memset (((char *) longopts) + sizeof (std_longopts) + md_longopts_size,
   memcpy (longopts, std_longopts, sizeof (std_longopts));
   memcpy (((char *) longopts) + sizeof (std_longopts), md_longopts, md_longopts_size);
   memset (((char *) longopts) + sizeof (std_longopts) + md_longopts_size,


@@ -507,7 +540,7 @@ parse_args (int * pargc, char *** pargv)
   old_argv = *pargv;
 
   /* Initialize a new argv that contains no options.  */
   old_argv = *pargv;
 
   /* Initialize a new argv that contains no options.  */

-  new_argv = xmalloc (sizeof (char *) * (old_argc + 1));
+  new_argv = (char **) xmalloc (sizeof (char *) * (old_argc + 1));

   new_argv[0] = old_argv[0];
   new_argc = 1;
   new_argv[new_argc] = NULL;
   new_argv[0] = old_argv[0];
   new_argc = 1;
   new_argv[new_argc] = NULL;


@@ -590,10 +623,11 @@ parse_args (int * pargc, char *** pargv)
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);

-         printf (_("Copyright 2007 Free Software Foundation, Inc.\n"));
+         printf (_("Copyright 2011 Free Software Foundation, Inc.\n"));

          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\

-the GNU General Public License.  This program has absolutely no warranty.\n"));
+the GNU General Public License version 3 or later.\n\
+This program has absolutely no warranty.\n"));

          printf (_("This assembler was configured for a target of `%s'.\n"),
                  TARGET_ALIAS);
          exit (EXIT_SUCCESS);
          printf (_("This assembler was configured for a target of `%s'.\n"),
                  TARGET_ALIAS);
          exit (EXIT_SUCCESS);


@@ -619,6 +653,22 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
 #endif
          exit (EXIT_SUCCESS);
 
 #endif
          exit (EXIT_SUCCESS);
 

+       case OPTION_COMPRESS_DEBUG:
+#ifdef HAVE_ZLIB_H
+         flag_compress_debug = 1;
+#else
+         as_warn (_("cannot compress debug sections (zlib not installed)"));
+#endif /* HAVE_ZLIB_H */
+         break;
+
+       case OPTION_NOCOMPRESS_DEBUG:
+         flag_compress_debug = 0;
+         break;
+
+       case OPTION_DEBUG_PREFIX_MAP:
+         add_debug_prefix_map (optarg);
+         break;
+

        case OPTION_DEFSYM:
          {
            char *s;
        case OPTION_DEFSYM:
          {
            char *s;


@@ -631,7 +681,7 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
              as_fatal (_("bad defsym; format is --defsym name=value"));
            *s++ = '\0';
            i = bfd_scan_vma (s, (const char **) NULL, 0);
              as_fatal (_("bad defsym; format is --defsym name=value"));
            *s++ = '\0';
            i = bfd_scan_vma (s, (const char **) NULL, 0);

-           n = xmalloc (sizeof *n);
+           n = (struct defsym_list *) xmalloc (sizeof *n);

            n->next = defsyms;
            n->name = optarg;
            n->value = i;
            n->next = defsyms;
            n->name = optarg;
            n->value = i;


@@ -639,7 +689,7 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
          }
          break;
 
          }
          break;
 

-       case OPTION_INSTTBL:
+#ifdef HAVE_ITBL_CPU

        case 't':
          {
            /* optarg is the name of the file containing the instruction
        case 't':
          {
            /* optarg is the name of the file containing the instruction


@@ -667,6 +717,7 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
                        itbl_files->name);
          }
          break;
                        itbl_files->name);
          }
          break;

+#endif

 
        case OPTION_DEPFILE:
          start_dependencies (optarg);
 
        case OPTION_DEPFILE:
          start_dependencies (optarg);


@@ -767,6 +818,15 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
          flag_noexecstack = 1;
          flag_execstack = 0;
          break;
          flag_noexecstack = 1;
          flag_execstack = 0;
          break;

+
+       case OPTION_SIZE_CHECK:
+         if (strcasecmp (optarg, "error") == 0)
+           flag_size_check = size_check_error;
+         else if (strcasecmp (optarg, "warning") == 0)
+           flag_size_check = size_check_warning;
+         else
+           as_fatal (_("Invalid --size-check= option: `%s'"), optarg);
+         break;

 #endif
        case 'Z':
          flag_always_generate_output = 1;
 #endif
        case 'Z':
          flag_always_generate_output = 1;


@@ -810,6 +870,9 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
                    case 'd':
                      listing |= LISTING_NODEBUG;
                      break;
                    case 'd':
                      listing |= LISTING_NODEBUG;
                      break;

+                   case 'g':
+                     listing |= LISTING_GENERAL;
+                     break;

                    case 'h':
                      listing |= LISTING_HLL;
                      break;
                    case 'h':
                      listing |= LISTING_HLL;
                      break;


@@ -929,13 +992,13 @@ dump_statistics (void)
 #endif
 }
 
 #endif
 }
 

-#ifndef OBJ_VMS

 static void
 close_output_file (void)
 {
   output_file_close (out_file_name);
 static void
 close_output_file (void)
 {
   output_file_close (out_file_name);

+  if (!keep_it)
+    unlink_if_ordinary (out_file_name);

 }
 }

-#endif

 
 /* The interface between the macro code and gas expression handling.  */
 
 
 /* The interface between the macro code and gas expression handling.  */
 


@@ -974,10 +1037,13 @@ static void
 perform_an_assembly_pass (int argc, char ** argv)
 {
   int saw_a_file = 0;
 perform_an_assembly_pass (int argc, char ** argv)
 {
   int saw_a_file = 0;

+#ifndef OBJ_MACH_O

   flagword applicable;
   flagword applicable;

+#endif

 
   need_pass_2 = 0;
 
 
   need_pass_2 = 0;
 

+#ifndef OBJ_MACH_O

   /* Create the standard sections, and those the assembler uses
      internally.  */
   text_section = subseg_new (TEXT_SECTION_NAME, 0);
   /* Create the standard sections, and those the assembler uses
      internally.  */
   text_section = subseg_new (TEXT_SECTION_NAME, 0);


@@ -994,12 +1060,15 @@ perform_an_assembly_pass (int argc, char ** argv)
                                       | SEC_DATA));
   bfd_set_section_flags (stdoutput, bss_section, applicable & SEC_ALLOC);
   seg_info (bss_section)->bss = 1;
                                       | SEC_DATA));
   bfd_set_section_flags (stdoutput, bss_section, applicable & SEC_ALLOC);
   seg_info (bss_section)->bss = 1;

+#endif

   subseg_new (BFD_ABS_SECTION_NAME, 0);
   subseg_new (BFD_UND_SECTION_NAME, 0);
   reg_section = subseg_new ("*GAS `reg' section*", 0);
   expr_section = subseg_new ("*GAS `expr' section*", 0);
 
   subseg_new (BFD_ABS_SECTION_NAME, 0);
   subseg_new (BFD_UND_SECTION_NAME, 0);
   reg_section = subseg_new ("*GAS `reg' section*", 0);
   expr_section = subseg_new ("*GAS `expr' section*", 0);
 

+#ifndef OBJ_MACH_O

   subseg_set (text_section, 0);
   subseg_set (text_section, 0);

+#endif

 
   /* This may add symbol table entries, which requires having an open BFD,
      and sections already created.  */
 
   /* This may add symbol table entries, which requires having an open BFD,
      and sections already created.  */


@@ -1037,7 +1106,6 @@ create_obj_attrs_section (void)
 {
   segT s;
   char *p;
 {
   segT s;
   char *p;

-  addressT addr;

   offsetT size;
   const char *name;
 
   offsetT size;
   const char *name;
 


@@ -1051,7 +1119,7 @@ create_obj_attrs_section (void)
       elf_section_type (s)
        = get_elf_backend_data (stdoutput)->obj_attrs_section_type;
       bfd_set_section_flags (stdoutput, s, SEC_READONLY | SEC_DATA);
       elf_section_type (s)
        = get_elf_backend_data (stdoutput)->obj_attrs_section_type;
       bfd_set_section_flags (stdoutput, s, SEC_READONLY | SEC_DATA);

-      addr = frag_now_fix ();
+      frag_now_fix ();

       p = frag_more (size);
       bfd_elf_set_obj_attr_contents (stdoutput, (bfd_byte *)p, size);
     }
       p = frag_more (size);
       bfd_elf_set_obj_attr_contents (stdoutput, (bfd_byte *)p, size);
     }


@@ -1062,8 +1130,9 @@ create_obj_attrs_section (void)
 int
 main (int argc, char ** argv)
 {
 int
 main (int argc, char ** argv)
 {

+  char ** argv_orig = argv;
+

   int macro_strip_at;
   int macro_strip_at;

-  int keep_it;

 
   start_time = get_run_time ();
 
 
   start_time = get_run_time ();
 


@@ -1115,10 +1184,8 @@ main (int argc, char ** argv)
   input_scrub_begin ();
   expr_begin ();
 
   input_scrub_begin ();
   expr_begin ();
 

-#ifndef OBJ_VMS /* Does its own file handling.  */

   /* It has to be called after dump_statistics ().  */
   xatexit (close_output_file);
   /* It has to be called after dump_statistics ().  */
   xatexit (close_output_file);

-#endif

 
   if (flag_print_statistics)
     xatexit (dump_statistics);
 
   if (flag_print_statistics)
     xatexit (dump_statistics);


@@ -1133,7 +1200,9 @@ main (int argc, char ** argv)
   PROGRESS (1);
 
   output_file_create (out_file_name);
   PROGRESS (1);
 
   output_file_create (out_file_name);

-  assert (stdoutput != 0);
+  gas_assert (stdoutput != 0);
+
+  dot_symbol_init ();

 
 #ifdef tc_init_after_args
   tc_init_after_args ();
 
 #ifdef tc_init_after_args
   tc_init_after_args ();


@@ -1141,6 +1210,11 @@ main (int argc, char ** argv)
 
   itbl_init ();
 
 
   itbl_init ();
 

+  dwarf2_init ();
+
+  local_symbol_make (".gasversion.", absolute_section,
+                    BFD_VERSION / 10000UL, &predefined_address_frag);
+

   /* Now that we have fully initialized, and have created the output
      file, define any symbols requested by --defsym command line
      arguments.  */
   /* Now that we have fully initialized, and have created the output
      file, define any symbols requested by --defsym command line
      arguments.  */


@@ -1214,8 +1288,10 @@ main (int argc, char ** argv)
   if (keep_it)
     write_object_file ();
 
   if (keep_it)
     write_object_file ();
 

+  fflush (stderr);
+

 #ifndef NO_LISTING
 #ifndef NO_LISTING

-  listing_print (listing_filename);
+  listing_print (listing_filename, argv_orig);

 #endif
 
   if (flag_fatal_warnings && had_warnings () > 0 && had_errors () == 0)
 #endif
 
   if (flag_fatal_warnings && had_warnings () > 0 && had_errors () == 0)


@@ -1224,9 +1300,6 @@ main (int argc, char ** argv)
   if (had_errors () > 0 && ! flag_always_generate_output)
     keep_it = 0;
 
   if (had_errors () > 0 && ! flag_always_generate_output)
     keep_it = 0;
 

-  if (!keep_it)
-    unlink_if_ordinary (out_file_name);
-

   input_scrub_end ();
 
   END_PROGRESS (myname);
   input_scrub_end ();
 
   END_PROGRESS (myname);