2010-06-21 Sterling Augustine <sterling@tensilica.com>

	PR gas/11728
	* as.c: Globalize keep_it.
	(main): Remove keep_it. Move conditional from here...
	(close_output_file): ...to here.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7dd487e29f59e870afd2d808254891a778f93afc..818bd76c9fcdd8cda1a3535e5077ac719d72ce62 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-21  Sterling Augustine  <sterling@tensilica.com>
+
+       PR gas/11728
+       * as.c: Globalize keep_it.
+       (main): Remove keep_it. Move conditional from here...
+       (close_output_file): ...to here.
+
 2010-06-21  Andreas Schwab  <schwab@redhat.com>
 
        * doc/as.texinfo (Overview): Use @itemx for grouped @table

diff --git a/gas/as.c b/gas/as.c
index fd74cb147df376c5767ab9194a21f06269a3429b..d617b3398d397313d020076595261e1891d96d96 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -98,6 +98,9 @@ int debug_memory = 0;
 /* Enable verbose mode.  */
 int verbose = 0;
 
+/* Keep the output file.  */
+int keep_it = 0;
+
 segT reg_section;
 segT expr_section;
 segT text_section;
@@ -953,6 +956,8 @@ static void
 close_output_file (void)
 {
   output_file_close (out_file_name);
+  if (!keep_it)
+    unlink_if_ordinary (out_file_name);
 }
 
 /* The interface between the macro code and gas expression handling.  */
@@ -1082,7 +1087,6 @@ main (int argc, char ** argv)
   char ** argv_orig = argv;
 
   int macro_strip_at;
-  int keep_it;
 
   start_time = get_run_time ();
 
@@ -1245,9 +1249,6 @@ main (int argc, char ** argv)
   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);