aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2012-11-06 06:43:59 +0000
committerAlan Modra <amodra@bigpond.net.au>2012-11-06 06:43:59 +0000
commit1cc68fa2628bdb1a3ca92fc34afd0a372a420dd3 (patch)
tree7cf01353c6502faa8906e8460a562e890dc080dc
parent456ead43cd262ba81e131894fea91e461d053941 (diff)
downloadbinutils-current-1cc68fa2628bdb1a3ca92fc34afd0a372a420dd3.tar.gz
* mach-o.c (bfd_mach_o_close_and_cleanup): Don't call
_bfd_generic_close_and_cleanup for mach_o_fat archives.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/mach-o.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6e6937ceb..cea4177ec 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2012-11-06 Alan Modra <amodra@gmail.com>
+ * mach-o.c (bfd_mach_o_close_and_cleanup): Don't call
+ _bfd_generic_close_and_cleanup for mach_o_fat archives.
+
+2012-11-06 Alan Modra <amodra@gmail.com>
+
* coff-tic4x.c (tic4x_coff0_vec, tic4x_coff0_beh_vec,
tic4x_coff1_vec, tic4x_coff1_beh_vec, tic4x_coff2_vec,
tic4x_coff2_beh_vec): Allow SEC_CODE and SEC_READONLY in
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 0379f4f8e..9a003e8f5 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -4864,6 +4864,9 @@ bfd_mach_o_close_and_cleanup (bfd *abfd)
}
}
+ if (bfd_get_format (abfd) == bfd_archive
+ && abfd->xvec == &mach_o_fat_vec)
+ return TRUE;
return _bfd_generic_close_and_cleanup (abfd);
}