From c92c35e7061ef1444fb08d73f8618d2dac543ee3 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 15 Feb 2004 02:24:53 +0000 Subject: [PATCH] Use bfd_cache_close, instead of accessing bfd->iostream directly. --- binutils/ChangeLog | 5 +++++ binutils/ar.c | 4 ++-- binutils/arsup.c | 2 +- ld/ChangeLog | 4 ++++ ld/ldmain.c | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 49ce6e7..9c9ce85 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2004-02-14 Andrew Cagney + + * ar.c (remove_output): Use bfd_cache_close. + * arsup.c (ar_end): Ditto. + 2004-01-21 Roland McGrath * readelf.c (get_note_type): Match NT_AUXV. diff --git a/binutils/ar.c b/binutils/ar.c index 5771427..b85d62e 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -324,8 +324,8 @@ remove_output (void) { if (output_filename != NULL) { - if (output_bfd != NULL && output_bfd->iostream != NULL) - fclose ((FILE *) (output_bfd->iostream)); + if (output_bfd != NULL) + bfd_cache_close (output_bfd); if (output_file != NULL) fclose (output_file); unlink (output_filename); diff --git a/binutils/arsup.c b/binutils/arsup.c index 676a6bc..a621bf9 100644 --- a/binutils/arsup.c +++ b/binutils/arsup.c @@ -433,7 +433,7 @@ ar_end (void) { if (obfd) { - fclose ((FILE *)(obfd->iostream)); + bfd_cache_close (obfd); unlink (bfd_get_filename (obfd)); } } diff --git a/ld/ChangeLog b/ld/ChangeLog index b2a7766..358b767 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2004-02-14 Andrew Cagney + + * ldmain.c (remove_output): Call bfd_cache_close. + 2004-02-14 Richard Sandiford * emulparams/elf32bmipn32-defs.sh (OTHER_SECTIONS): Discard diff --git a/ld/ldmain.c b/ld/ldmain.c index bbafcdb..88b5c75 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -159,8 +159,8 @@ remove_output (void) { if (output_filename) { - if (output_bfd && output_bfd->iostream) - fclose ((FILE *) (output_bfd->iostream)); + if (output_bfd) + bfd_cache_close (output_bfd); if (delete_output_file_on_failure) unlink (output_filename); } -- 2.7.4