From 58e8191cff66f5f2db40eaa984d822191f108781 Mon Sep 17 00:00:00 2001 From: Sterling Augustine Date: Mon, 21 Jun 2010 23:56:34 +0000 Subject: [PATCH] 2010-06-21 Sterling Augustine PR gas/11728 * as.c: Globalize keep_it. (main): Remove keep_it. Move conditional from here... (close_output_file): ...to here. --- gas/ChangeLog | 7 +++++++ gas/as.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7dd487e29f..818bd76c9f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2010-06-21 Sterling Augustine + + 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 * doc/as.texinfo (Overview): Use @itemx for grouped @table diff --git a/gas/as.c b/gas/as.c index fd74cb147d..d617b3398d 100644 --- 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);