diff options
| author | Tristan Gingold <gingold@adacore.com> | 2010-04-30 09:40:41 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2010-04-30 09:40:41 +0000 |
| commit | 79cff59ba79f13707445bf2d3868a4ba5e744e83 (patch) | |
| tree | f38ba1ff0b28473ff4f9e946b929f8d6dde706b2 /bfd/vms-alpha.c | |
| parent | b82b88b206e4dc32f36eb9e3c456972eca5d5489 (diff) | |
| download | binutils-redhat-79cff59ba79f13707445bf2d3868a4ba5e744e83.tar.gz | |
bfd/
2010-04-30 Tristan Gingold <gingold@adacore.com>
* vms-lib.c (struct lib_tdata): Field artdata added, fields nbr_syms
and syms removed.
(struct carsym_mem): New structure.
(vms_add_index): New function.
(vms_add_indexes_from_list): New function.
(vms_traverse_index): Parameter carsym changed to carsym_mem.
Code adjusted to handle elfidx.
(vms_lib_read_index): Adjusted for vms_traverse_index changes.
Parameter NBREL is now a pointer.
(_bfd_vms_lib_archive_p): Adjust for above change. Handle ia64
archives.
(_bfd_vms_lib_mkarchive): Adjusted for changes in struct lib_tdata.
(_bfd_vms_lib_find_symbol): Ditto.
(vms_lib_bopen): Fix two typos: return FALSE in case of error,
check MHD id.
* vms-alpha.c (alpha_vms_link_add_archive_symbols): Adjust for
changes of _bfd_vms_lib_find_symbol.
include/vms
2010-04-30 Tristan Gingold <gingold@adacore.com>
* lbr.h (LBR__C_TYP_ISHSTB): Added.
(LHD_SANEID4): Renamed to ...
(LHD_SANEID6): ... this.
(LBR_MAJORID, LBR_ELFMAJORID): New macros.
(struct vms_rfa): New structure.
(struct vms_idxdef): Renamed to ...
(struct vms_idx): ... this.
(struct vms_idxdef2): Renamed to ...
(struct vms_elfidx): ... this.
(ELFIDX__WEAK, ELFIDX__GROUP, ELFIDX__LISTRFA, ELFIDX__SYMESC): New
macros.
(struct vms_lhs, struct vms_lns): New structures.
(struct vms_mhd): Add missing fields.
(MHD__C_MHDLEN): New macro.
Diffstat (limited to 'bfd/vms-alpha.c')
| -rw-r--r-- | bfd/vms-alpha.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index 3013192ef4..294bd90bed 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -8040,7 +8040,7 @@ alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) for (pundef = &info->hash->undefs; *pundef != NULL; pundef = next_pundef) { struct bfd_link_hash_entry *h; - file_ptr file_offset; + symindex symidx; bfd *element; bfd *orig_element; @@ -8066,14 +8066,14 @@ alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) } /* Look for this symbol in the archive hash table. */ - file_offset = _bfd_vms_lib_find_symbol (abfd, h->root.string); - if (file_offset == 0) + symidx = _bfd_vms_lib_find_symbol (abfd, h->root.string); + if (symidx == BFD_NO_MORE_SYMBOLS) { /* Nothing in this slot. */ continue; } - element = bfd_get_elt_at_index (abfd, file_offset); + element = bfd_get_elt_at_index (abfd, symidx); if (element == NULL) return FALSE; |