aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorSterling Augustine <saugustine@google.com>2010-06-21 23:56:34 +0000
committerSterling Augustine <saugustine@google.com>2010-06-21 23:56:34 +0000
commit58e8191cff66f5f2db40eaa984d822191f108781 (patch)
tree89a722f35dd20b43fce0b76d694cf0c44494761d /gas
parent42218b9f16a40780716d3ec5b817d3d44fbf4d2e (diff)
downloadfsf-binutils-gdb-58e8191cff66f5f2db40eaa984d822191f108781.zip
fsf-binutils-gdb-58e8191cff66f5f2db40eaa984d822191f108781.tar.gz
fsf-binutils-gdb-58e8191cff66f5f2db40eaa984d822191f108781.tar.bz2
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.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/as.c9
2 files changed, 12 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7dd487e..818bd76 100644
--- 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 fd74cb1..d617b33 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);