diff options
| author | Dave Korn <dave.korn@artimi.com> | 2010-11-05 07:20:07 +0000 |
|---|---|---|
| committer | Dave Korn <dave.korn@artimi.com> | 2010-11-05 07:20:07 +0000 |
| commit | d44ad554d42dd9e80692b0fd2a48b950d6a7a38e (patch) | |
| tree | 987bf61e8b05d508a46bd6d738d8fd110fd69a02 /ld/ldfile.c | |
| parent | f4eaaf7fceed097ed62542f9940986b1de01aa48 (diff) | |
| download | gdb-d44ad554d42dd9e80692b0fd2a48b950d6a7a38e.zip gdb-d44ad554d42dd9e80692b0fd2a48b950d6a7a38e.tar.gz gdb-d44ad554d42dd9e80692b0fd2a48b950d6a7a38e.tar.bz2 | |
* plugin.h (plugin_active_plugins_p): New prototype.
(is_ir_dummy_bfd): Delete prototype.
* plugin.c: Fix formatting issues.
(is_ir_dummy_bfd): Make static.
(plugin_active_plugins_p): New function.
* ldfile.c (ldfile_try_open_bfd): Use it to save work if no plugins
are loaded. Always close file descriptor after claim handler returns.
* ldmain.c (add_archive_element): Likewise.
Diffstat (limited to 'ld/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index 701b380..6364469 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -312,7 +312,8 @@ success: bfd_object that it sets the bfd's arch and mach, which will be needed when and if we want to bfd_create a new one using this one as a template. */ - if (bfd_check_format (entry->the_bfd, bfd_object)) + if (bfd_check_format (entry->the_bfd, bfd_object) + && plugin_active_plugins_p ()) { int fd = open (attempt, O_RDONLY | O_BINARY); if (fd >= 0) @@ -330,6 +331,8 @@ success: if (plugin_call_claim_file (&file, &claimed)) einfo (_("%P%F: %s: plugin reported error claiming file\n"), plugin_error_plugin ()); + /* fd belongs to us, not the plugin; but we don't need it. */ + close (fd); if (claimed) { /* Discard the real file's BFD and substitute the dummy one. */ @@ -340,10 +343,9 @@ success: } else { - /* If plugin didn't claim the file, we don't need the fd or the - dummy bfd. Can't avoid speculatively creating it, alas. */ + /* If plugin didn't claim the file, we don't need the dummy + bfd. Can't avoid speculatively creating it, alas. */ bfd_close_all_done (file.handle); - close (fd); entry->claimed = FALSE; } } |