diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2004-07-19 16:40:52 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2004-07-19 16:40:52 +0000 |
| commit | e56f61be758d90c463cc220c50ad7f30b955c2af (patch) | |
| tree | 44a55597c662b3a96fc3faa041f88962121e02dc /bfd/elflink.c | |
| parent | 756d8c7093fdf0f2134628c2f7514e8231ce4e82 (diff) | |
| download | fsf-binutils-gdb-e56f61be758d90c463cc220c50ad7f30b955c2af.zip fsf-binutils-gdb-e56f61be758d90c463cc220c50ad7f30b955c2af.tar.gz fsf-binutils-gdb-e56f61be758d90c463cc220c50ad7f30b955c2af.tar.bz2 | |
bfd/
2004-07-19 H.J. Lu <hongjiu.lu@intel.com>
* bfd-in.h (dynamic_lib_link_class): Add DYN_NO_ADD_NEEDED and
DYN_NO_NEEDED.
(bfd_elf_get_dyn_lib_class): New prototype.
* elf.c (bfd_elf_get_dyn_lib_class): New function.
* elflink.c (elf_link_add_object_symbols): Check DYN_AS_NEEDED,
DYN_DT_NEEDED and DYN_NO_NEEDED bits to see if a DT_NEEDED
entry is needed. Issue an error if a DT_NEEDED entry is needed
for a file marked DYN_NO_NEEDED.
(elf_link_check_versioned_symbol): Check the DYN_DT_NEEDED bit
for DT_NEEDED tags.
* bfd-in2.h: Regenerated.
ld/
2004-07-19 H.J. Lu <hongjiu.lu@intel.com>
* emultempl/elf32.em (gld${EMULATION_NAME}_load_symbols): Also
check the add_needed field.
(dt_needed): New struct.
(gld${EMULATION_NAME}_try_needed): Change the first argument
to a pointer to struct dt_needed. Check the DYN_NO_ADD_NEEDED
bit in the file where the DT_NEEDED entry comes from.
(gld${EMULATION_NAME}_search_needed): Change the second
argument to a pointer to struct dt_needed.
(gld${EMULATION_NAME}_check_ld_so_conf): Updated.
(gld${EMULATION_NAME}_after_open): Likewise.
* ld.texinfo: Add --add-needed document.
* ldlang.c (new_afile): Set p->add_needed.
* ldlang.h (lang_input_statement_type): Add add_needed field.
* ldmain.h (add_needed): Declare.
* ldmain.c (add_needed): New global var.
* lexsup.c (option_values): Add OPTION_ADD_NEEDED and
OPTION_NO_ADD_NEEDED.
(ld_options): Likewise.
(parse_args): Handle them.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index a6dafae..4920d9d 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3064,8 +3064,13 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) /* If this dynamic lib was specified on the command line with --as-needed in effect, then we don't want to add a DT_NEEDED tag unless the lib is actually used. Similary for libs brought - in by another lib's DT_NEEDED. */ - add_needed = elf_dyn_lib_class (abfd) == DYN_NORMAL; + in by another lib's DT_NEEDED. When --no-add-needed is used + on a dynamic lib, we don't want to add a DT_NEEDED entry for + any dynamic library in DT_NEEDED tags in the dynamic lib at + all. */ + add_needed = (elf_dyn_lib_class (abfd) + & (DYN_AS_NEEDED | DYN_DT_NEEDED + | DYN_NO_NEEDED)) == 0; s = bfd_get_section_by_name (abfd, ".dynamic"); if (s != NULL) @@ -3846,7 +3851,17 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) /* A symbol from a library loaded via DT_NEEDED of some other library is referenced by a regular object. - Add a DT_NEEDED entry for it. */ + Add a DT_NEEDED entry for it. Issue an error if + --no-add-needed is used. */ + if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) + { + (*_bfd_error_handler) + (_("%s: invalid DSO for symbol `%s' definition"), + bfd_archive_filename (abfd), name); + bfd_set_error (bfd_error_bad_value); + goto error_free_vers; + } + add_needed = TRUE; ret = elf_add_dt_needed_tag (info, soname, add_needed); if (ret < 0) @@ -5818,7 +5833,7 @@ elf_link_check_versioned_symbol (struct bfd_link_info *info, case bfd_link_hash_undefweak: abfd = h->root.u.undef.abfd; if ((abfd->flags & DYNAMIC) == 0 - || elf_dyn_lib_class (abfd) != DYN_DT_NEEDED) + || (elf_dyn_lib_class (abfd) & DYN_DT_NEEDED) == 0) return FALSE; break; |