diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-11-12 22:10:17 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-11-12 22:10:17 +0000 |
| commit | cbabf313dbc89aa1c3c84116dc6629ed631bae71 (patch) | |
| tree | b6f5bb3af10e53e839f25713a6fc2f98959e6004 /bfd/archive.c | |
| parent | 857e8d77958e57b5af73c20b9ffc537e835d88f8 (diff) | |
| download | binutils-redhat-cbabf313dbc89aa1c3c84116dc6629ed631bae71.tar.gz | |
Properly copy BFD_COMPRESS and BFD_DECOMPRESS to archive element.
2010-11-12 H.J. Lu <hongjiu.lu@intel.com>
* archive.c (_bfd_get_elt_at_filepos): Copy BFD_COMPRESS and
BFD_DECOMPRESS.
(bfd_openr_next_archived_file): Revert the last change.
Diffstat (limited to 'bfd/archive.c')
| -rw-r--r-- | bfd/archive.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index ed4014151d..258c8d9aae 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -655,6 +655,9 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos) n_nfd->arelt_data = new_areldata; + /* Copy BFD_COMPRESS and BFD_DECOMPRESS flags. */ + n_nfd->flags |= archive->flags & (BFD_COMPRESS | BFD_DECOMPRESS); + if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd)) return n_nfd; @@ -697,8 +700,6 @@ DESCRIPTION bfd * bfd_openr_next_archived_file (bfd *archive, bfd *last_file) { - bfd *abfd; - if ((bfd_get_format (archive) != bfd_archive) || (archive->direction == write_direction)) { @@ -706,14 +707,8 @@ bfd_openr_next_archived_file (bfd *archive, bfd *last_file) return NULL; } - abfd = BFD_SEND (archive, + return BFD_SEND (archive, openr_next_archived_file, (archive, last_file)); - - /* Copy BFD_COMPRESS and BFD_DECOMPRESS flags. */ - if (abfd) - abfd->flags |= archive->flags & (BFD_COMPRESS | BFD_DECOMPRESS); - - return abfd; } bfd * |