aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/output-file.c5
-rw-r--r--gas/write.c3
3 files changed, 13 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index cb063fb..3a90951 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-04 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR gas/13056
+ * output-file.c (output_file_close): Call bfd_cache_close_all
+ on error.
+
+ * write.c (write_object_file): Revert the last change.
+
2011-08-04 Alan Modra <amodra@gmail.com>
* write.c (write_object_file): Call set_symtab even if we had
diff --git a/gas/output-file.c b/gas/output-file.c
index e993033..3e871f0 100644
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -59,7 +59,10 @@ output_file_close (char *filename)
return;
/* Close the bfd. */
- res = bfd_close (stdoutput);
+ if (had_errors ())
+ res = bfd_cache_close_all ();
+ else
+ res = bfd_close (stdoutput);
/* Prevent an infinite loop - if the close failed we will call as_fatal
which will call xexit() which may call this function again... */
diff --git a/gas/write.c b/gas/write.c
index 39b88a6..5eb4b56 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2073,14 +2073,13 @@ write_object_file (void)
obj_adjust_symtab ();
#endif
- set_symtab ();
-
/* Stop if there is an error. */
if (had_errors ())
return;
/* Now that all the sizes are known, and contents correct, we can
start writing to the file. */
+ set_symtab ();
/* If *_frob_file changes the symbol value at this point, it is
responsible for moving the changed value into symp->bsym->value