diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/ldlang.c | 8 | ||||
| -rw-r--r-- | ld/plugin.c | 12 |
3 files changed, 28 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 407cc2d..7ce5d7a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2011-07-09 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/12942 + * ldlang.c (section_already_linked): Pass "struct already_linked *" + to bfd_section_already_linked. + (lang_process): Set link_info.loading_lto_outputs before + loading LTO outputs. + * plugin.c: Include "libbfd.h". + (add_symbols): Call bfd_section_already_linked with comdat_key. + 2011-06-20 H.J. Lu <hongjiu.lu@intel.com> * configure.tgt: Revert x32 change. diff --git a/ld/ldlang.c b/ld/ldlang.c index 7e06613..860ce27 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -2237,7 +2237,12 @@ section_already_linked (bfd *abfd, asection *sec, void *data) } if (!(abfd->flags & DYNAMIC)) - bfd_section_already_linked (abfd, sec, &link_info); + { + struct already_linked linked; + linked.comdat_key = NULL; + linked.u.sec = sec; + bfd_section_already_linked (abfd, &linked, &link_info); + } } /* The wild routines. @@ -6544,6 +6549,7 @@ lang_process (void) einfo (_("%P%F: %s: plugin reported error after all symbols read\n"), plugin_error_plugin ()); /* Open any newly added files, updating the file chains. */ + link_info.loading_lto_outputs = TRUE; open_input_bfds (added.head, OPEN_BFD_NORMAL); /* Restore the global list pointer now they have all been added. */ lang_list_remove_tail (stat_ptr, &added); diff --git a/ld/plugin.c b/ld/plugin.c index 60eb102..0a0ee0c 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -32,6 +32,7 @@ #include "plugin.h" #include "plugin-api.h" #include "elf-bfd.h" +#include "libbfd.h" #if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) #include <windows.h> #endif @@ -385,7 +386,16 @@ add_symbols (void *handle, int nsyms, const struct ld_plugin_symbol *syms) for (n = 0; n < nsyms; n++) { enum ld_plugin_status rv; - asymbol *bfdsym = bfd_make_empty_symbol (abfd); + asymbol *bfdsym; + + if (syms[n].comdat_key) + { + struct already_linked linked; + linked.comdat_key = xstrdup (syms[n].comdat_key); + linked.u.abfd = abfd; + bfd_section_already_linked (abfd, &linked, &link_info); + } + bfdsym = bfd_make_empty_symbol (abfd); symptrs[n] = bfdsym; rv = asymbol_from_plugin_symbol (abfd, bfdsym, syms + n); if (rv != LDPS_OK) |