X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fplugin.c;h=fd7bac04ece081d124abf3b13597def9cfc13865;hb=2168b2688ae343a61c467450068503295a5e3deb;hp=0a29e378d50dee96c6ab695bacd32c40d7ee7634;hpb=17d5dae239c8e8cca84afffd3672981379536491;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/plugin.c b/bfd/plugin.c index 0a29e378d5..fd7bac04ec 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -1,6 +1,5 @@ /* Plugin support for BFD. - Copyright 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -19,7 +18,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" +#include "sysdep.h" #include "bfd.h" #if BFD_SUPPORTS_PLUGINS @@ -34,7 +33,6 @@ #endif #include #include "plugin-api.h" -#include "sysdep.h" #include "plugin.h" #include "libbfd.h" #include "libiberty.h" @@ -85,7 +83,9 @@ dlerror (void) #define bfd_plugin_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) #define bfd_plugin_get_lineno _bfd_nosymbols_get_lineno #define bfd_plugin_find_nearest_line _bfd_nosymbols_find_nearest_line +#define bfd_plugin_find_line _bfd_nosymbols_find_line #define bfd_plugin_find_inliner_info _bfd_nosymbols_find_inliner_info +#define bfd_plugin_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string #define bfd_plugin_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define bfd_plugin_read_minisymbols _bfd_generic_read_minisymbols #define bfd_plugin_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol @@ -94,7 +94,6 @@ dlerror (void) #define bfd_plugin_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents #define bfd_plugin_bfd_relax_section bfd_generic_relax_section #define bfd_plugin_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define bfd_plugin_bfd_link_hash_table_free _bfd_generic_link_hash_table_free #define bfd_plugin_bfd_link_add_symbols _bfd_generic_link_add_symbols #define bfd_plugin_bfd_link_just_syms _bfd_generic_link_just_syms #define bfd_plugin_bfd_final_link _bfd_generic_final_link @@ -107,6 +106,7 @@ dlerror (void) #define bfd_plugin_section_already_linked _bfd_generic_section_already_linked #define bfd_plugin_bfd_define_common_symbol bfd_generic_define_common_symbol #define bfd_plugin_bfd_copy_link_hash_symbol_type _bfd_generic_copy_link_hash_symbol_type +#define bfd_plugin_bfd_link_check_relocs _bfd_generic_link_check_relocs static enum ld_plugin_status message (int level ATTRIBUTE_UNUSED, @@ -138,7 +138,7 @@ add_symbols (void * handle, { bfd *abfd = handle; struct plugin_data_struct *plugin_data = - bfd_alloc (abfd, sizeof (plugin_data_struct));; + bfd_alloc (abfd, sizeof (plugin_data_struct)); plugin_data->nsyms = nsyms; plugin_data->syms = syms; @@ -159,15 +159,61 @@ bfd_plugin_set_program_name (const char *program_name) } static int -try_load_plugin (const char *pname) +try_claim (bfd *abfd) { - static void *plugin_handle; - int tv_size = 4; - struct ld_plugin_tv tv[tv_size]; + int claimed = 0; + struct ld_plugin_input_file file; + bfd *iobfd; + + file.name = abfd->filename; + + if (abfd->my_archive) + { + iobfd = abfd->my_archive; + file.offset = abfd->origin; + file.filesize = arelt_size (abfd); + } + else + { + iobfd = abfd; + file.offset = 0; + file.filesize = 0; + } + + if (!iobfd->iostream && !bfd_open_file (iobfd)) + return 0; + + file.fd = fileno ((FILE *) iobfd->iostream); + + if (!abfd->my_archive) + { + struct stat stat_buf; + if (fstat (file.fd, &stat_buf)) + return 0; + file.filesize = stat_buf.st_size; + } + + file.handle = abfd; + off_t cur_offset = lseek(file.fd, 0, SEEK_CUR); + claim_file (&file, &claimed); + lseek(file.fd, cur_offset, SEEK_SET); + if (!claimed) + return 0; + + return 1; +} + +static int +try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p) +{ + void *plugin_handle; + struct ld_plugin_tv tv[4]; int i; ld_plugin_onload onload; enum ld_plugin_status status; + *has_plugin_p = 0; + plugin_handle = dlopen (pname, RTLD_NOW); if (!plugin_handle) { @@ -200,26 +246,67 @@ try_load_plugin (const char *pname) if (status != LDPS_OK) goto err; + *has_plugin_p = 1; + + abfd->plugin_format = bfd_plugin_no; + if (!claim_file) goto err; + if (!try_claim (abfd)) + goto err; + + abfd->plugin_format = bfd_plugin_yes; + return 1; err: - plugin_handle = NULL; return 0; } +/* There may be plugin libraries in lib/bfd-plugins. */ + +static int has_plugin = -1; + +static const bfd_target *(*ld_plugin_object_p) (bfd *); + static const char *plugin_name; void bfd_plugin_set_plugin (const char *p) { plugin_name = p; + has_plugin = p != NULL; +} + +/* Return TRUE if a plugin library is used. */ + +bfd_boolean +bfd_plugin_specified_p (void) +{ + return has_plugin > 0; +} + +extern const bfd_target plugin_vec; + +/* Return TRUE if TARGET is a pointer to plugin_vec. */ + +bfd_boolean +bfd_plugin_target_p (const bfd_target *target) +{ + return target == &plugin_vec; +} + +/* Register OBJECT_P to be used by bfd_plugin_object_p. */ + +void +register_ld_plugin_object_p (const bfd_target *(*object_p) (bfd *)) +{ + ld_plugin_object_p = object_p; } static int -load_plugin (void) +load_plugin (bfd *abfd) { char *plugin_dir; char *p; @@ -227,11 +314,14 @@ load_plugin (void) struct dirent *ent; int found = 0; + if (!has_plugin) + return found; + if (plugin_name) - return try_load_plugin (plugin_name); + return try_load_plugin (plugin_name, abfd, &has_plugin); if (plugin_program_name == NULL) - return 0; + return found; plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); p = make_relative_prefix (plugin_program_name, @@ -248,10 +338,13 @@ load_plugin (void) { char *full_name; struct stat s; + int valid_plugin; full_name = concat (p, "/", ent->d_name, NULL); if (stat(full_name, &s) == 0 && S_ISREG (s.st_mode)) - found = try_load_plugin (full_name); + found = try_load_plugin (full_name, abfd, &valid_plugin); + if (has_plugin <= 0) + has_plugin = valid_plugin; free (full_name); if (found) break; @@ -269,56 +362,13 @@ load_plugin (void) static const bfd_target * bfd_plugin_object_p (bfd *abfd) { - int claimed = 0; - struct ld_plugin_input_file file; - bfd *iobfd; - static int have_loaded = 0; - static int have_plugin = 0; - - if (!have_loaded) - { - have_loaded = 1; - have_plugin = load_plugin (); - } - if (!have_plugin) - return NULL; - - file.name = abfd->filename; - - if (abfd->my_archive) - { - iobfd = abfd->my_archive; - file.offset = abfd->origin; - file.filesize = arelt_size (abfd); - } - else - { - iobfd = abfd; - file.offset = 0; - file.filesize = 0; - } + if (ld_plugin_object_p) + return ld_plugin_object_p (abfd); - if (!iobfd->iostream && !bfd_open_file (iobfd)) - return NULL; - - file.fd = fileno ((FILE *) iobfd->iostream); - - if (!abfd->my_archive) - { - struct stat stat_buf; - if (fstat (file.fd, &stat_buf)) - return NULL; - file.filesize = stat_buf.st_size; - } - - file.handle = abfd; - off_t cur_offset = lseek(file.fd, 0, SEEK_CUR); - claim_file (&file, &claimed); - lseek(file.fd, cur_offset, SEEK_SET); - if (!claimed) + if (abfd->plugin_format == bfd_plugin_uknown && !load_plugin (abfd)) return NULL; - return abfd->xvec; + return abfd->plugin_format == bfd_plugin_yes ? abfd->xvec : NULL; } /* Copy any private info we understand from the input bfd @@ -401,7 +451,7 @@ static flagword convert_flags (const struct ld_plugin_symbol *sym) { switch (sym->def) - { + { case LDPK_DEF: case LDPK_COMMON: case LDPK_UNDEF: @@ -433,7 +483,7 @@ bfd_plugin_canonicalize_symtab (bfd *abfd, for (i = 0; i < nsyms; i++) { - asymbol *s = bfd_alloc (abfd, sizeof (asymbol)); + asymbol *s = bfd_alloc (abfd, sizeof (asymbol)); BFD_ASSERT (s); alocation[i] = s; @@ -516,7 +566,7 @@ const bfd_target plugin_vec = 0, /* symbol_leading_char. */ '/', /* ar_pad_char. */ 15, /* ar_max_namelen. */ - 0, /* match priority. */ + 255, /* match priority. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32,