diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/xcofflink.c | 462 |
2 files changed, 236 insertions, 231 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cc33261..5d283c9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-01-01 Joel Brobecker <brobecker@adacore.com> + + Fix -Wshadow warnings (seen on ppc-aix) + * xcofflink.c: Replace finfo by flinfo throughout. + 2009-12-31 Cary Coutant <ccoutant@google.com> * dwarf2.c (struct line_sequence): New struct. diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c index 6ad148b..58f5f44 100644 --- a/bfd/xcofflink.c +++ b/bfd/xcofflink.c @@ -4016,7 +4016,7 @@ xcoff_symbol_section (struct xcoff_link_hash_entry *h) REFERENCE_BFD is the bfd to use in error messages about the relocation. */ static bfd_boolean -xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *finfo, +xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, asection *output_section, bfd *reference_bfd, struct internal_reloc *irel, asection *hsec, struct xcoff_link_hash_entry *h) @@ -4061,7 +4061,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *finfo, ldrel.l_rtype = (irel->r_size << 8) | irel->r_type; ldrel.l_rsecnm = output_section->target_index; - if (xcoff_hash_table (finfo->info)->textro + if (xcoff_hash_table (flinfo->info)->textro && strcmp (output_section->name, ".text") == 0) { (*_bfd_error_handler) @@ -4070,8 +4070,8 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *finfo, bfd_set_error (bfd_error_invalid_operation); return FALSE; } - bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel); - finfo->ldrel += bfd_xcoff_ldrelsz (output_bfd); + bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, flinfo->ldrel); + flinfo->ldrel += bfd_xcoff_ldrelsz (output_bfd); return TRUE; } @@ -4079,7 +4079,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *finfo, handles all the sections and relocations of the input file at once. */ static bfd_boolean -xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, +xcoff_link_input_bfd (struct xcoff_final_link_info *flinfo, bfd *input_bfd) { bfd *output_bfd; @@ -4108,11 +4108,11 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, /* We can just skip DYNAMIC files, unless this is a static link. */ if ((input_bfd->flags & DYNAMIC) != 0 - && ! finfo->info->static_link) + && ! flinfo->info->static_link) return TRUE; /* Move all the symbols to the output file. */ - output_bfd = finfo->output_bfd; + output_bfd = flinfo->output_bfd; strings = NULL; syment_base = obj_raw_syment_count (output_bfd); isymesz = bfd_coff_symesz (input_bfd); @@ -4128,7 +4128,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, #define N_BTSHFT n_btshft copy = FALSE; - if (! finfo->info->keep_memory) + if (! flinfo->info->keep_memory) copy = TRUE; hash = TRUE; if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0) @@ -4145,8 +4145,8 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, sym_hash = obj_xcoff_sym_hashes (input_bfd); csectpp = xcoff_data (input_bfd)->csects; debug_index = xcoff_data (input_bfd)->debug_indices; - isymp = finfo->internal_syms; - indexp = finfo->sym_indices; + isymp = flinfo->internal_syms; + indexp = flinfo->sym_indices; output_index = syment_base; while (esym < esym_end) { @@ -4236,7 +4236,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, ldsym->l_ifile = 0; else { - BFD_ASSERT (impbfd->xvec == finfo->output_bfd->xvec); + BFD_ASSERT (impbfd->xvec == flinfo->output_bfd->xvec); ldsym->l_ifile = xcoff_data (impbfd)->import_file_id; } } @@ -4245,10 +4245,10 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, ldsym->l_parm = 0; BFD_ASSERT (h->ldindx >= 0); - bfd_xcoff_swap_ldsym_out (finfo->output_bfd, ldsym, - (finfo->ldsym + bfd_xcoff_swap_ldsym_out (flinfo->output_bfd, ldsym, + (flinfo->ldsym + ((h->ldindx - 3) - * bfd_xcoff_ldsymsz (finfo->output_bfd)))); + * bfd_xcoff_ldsymsz (flinfo->output_bfd)))); h->ldsym = NULL; /* Fill in snentry now that we know the target_index. */ @@ -4307,12 +4307,12 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, esym = (bfd_byte *) obj_coff_external_syms (input_bfd); esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz; sym_hash = obj_xcoff_sym_hashes (input_bfd); - isymp = finfo->internal_syms; - indexp = finfo->sym_indices; + isymp = flinfo->internal_syms; + indexp = flinfo->sym_indices; csectpp = xcoff_data (input_bfd)->csects; lineno_counts = xcoff_data (input_bfd)->lineno_counts; debug_index = xcoff_data (input_bfd)->debug_indices; - outsym = finfo->outsyms; + outsym = flinfo->outsyms; incls = 0; oline = NULL; while (esym < esym_end) @@ -4347,7 +4347,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, if (name == NULL) return FALSE; - indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy); + indx = _bfd_stringtab_add (flinfo->strtab, name, hash, copy); if (indx == (bfd_size_type) -1) return FALSE; isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx; @@ -4371,18 +4371,18 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, have to write the symbol out twice. */ if (isym.n_sclass == C_FILE) { - if (finfo->last_file_index != -1 - && finfo->last_file.n_value != (bfd_vma) *indexp) + if (flinfo->last_file_index != -1 + && flinfo->last_file.n_value != (bfd_vma) *indexp) { /* We must correct the value of the last C_FILE entry. */ - finfo->last_file.n_value = *indexp; - if ((bfd_size_type) finfo->last_file_index >= syment_base) + flinfo->last_file.n_value = *indexp; + if ((bfd_size_type) flinfo->last_file_index >= syment_base) { /* The last C_FILE symbol is in this input file. */ bfd_coff_swap_sym_out (output_bfd, - (void *) &finfo->last_file, - (void *) (finfo->outsyms - + ((finfo->last_file_index + (void *) &flinfo->last_file, + (void *) (flinfo->outsyms + + ((flinfo->last_file_index - syment_base) * osymesz))); } @@ -4394,11 +4394,11 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, file_ptr pos; bfd_coff_swap_sym_out (output_bfd, - (void *) &finfo->last_file, + (void *) &flinfo->last_file, (void *) outsym); pos = obj_sym_filepos (output_bfd); - pos += finfo->last_file_index * osymesz; + pos += flinfo->last_file_index * osymesz; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 || (bfd_bwrite (outsym, osymesz, output_bfd) != osymesz)) @@ -4406,8 +4406,8 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, } } - finfo->last_file_index = *indexp; - finfo->last_file = isym; + flinfo->last_file_index = *indexp; + flinfo->last_file = isym; } /* The value of a C_BINCL or C_EINCL symbol is a file offset @@ -4416,7 +4416,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, if (isym.n_sclass == C_BINCL || isym.n_sclass == C_EINCL) { - isym.n_value = finfo->line_filepos; + isym.n_value = flinfo->line_filepos; ++incls; } /* The value of a C_BSTAT symbol is the symbol table @@ -4430,7 +4430,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, { long symindx; - symindx = finfo->sym_indices[indx]; + symindx = flinfo->sym_indices[indx]; if (symindx < 0) isym.n_value = 0; else @@ -4481,7 +4481,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, return FALSE; } filename = strings + aux.x_file.x_n.x_offset; - indx = _bfd_stringtab_add (finfo->strtab, filename, + indx = _bfd_stringtab_add (flinfo->strtab, filename, hash, copy); if (indx == (bfd_size_type) -1) return FALSE; @@ -4509,7 +4509,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, { long symindx; - symindx = finfo->sym_indices[indx]; + symindx = flinfo->sym_indices[indx]; if (symindx < 0) { aux.x_csect.x_scnlen.l = 0; @@ -4538,13 +4538,13 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, the index of the next symbol we are going to include. I don't know if this is entirely right. */ - while (finfo->sym_indices[indx] < 0 + while (flinfo->sym_indices[indx] < 0 && indx < obj_raw_syment_count (input_bfd)) ++indx; if (indx >= obj_raw_syment_count (input_bfd)) indx = output_index; else - indx = finfo->sym_indices[indx]; + indx = flinfo->sym_indices[indx]; aux.x_sym.x_fcnary.x_fcn.x_endndx.l = indx; } @@ -4555,7 +4555,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, { long symindx; - symindx = finfo->sym_indices[indx]; + symindx = flinfo->sym_indices[indx]; if (symindx < 0) aux.x_sym.x_tagndx.l = 0; else @@ -4597,7 +4597,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, pos = enclosing->line_filepos; amt = linesz * enc_count; if (bfd_seek (input_bfd, pos, SEEK_SET) != 0 - || (bfd_bread (finfo->linenos, amt, input_bfd) + || (bfd_bread (flinfo->linenos, amt, input_bfd) != amt)) return FALSE; oline = enclosing; @@ -4607,7 +4607,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, symbol index. */ linoff = (aux.x_sym.x_fcnary.x_fcn.x_lnnoptr - enclosing->line_filepos); - linp = finfo->linenos + linoff; + linp = flinfo->linenos + linoff; bfd_coff_swap_lineno_in (input_bfd, linp, &lin); lin.l_addr.l_symndx = *indexp; bfd_coff_swap_lineno_out (output_bfd, &lin, linp); @@ -4629,7 +4629,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, + o->output_section->lineno_count * linesz); amt = linesz * *lineno_counts; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo->linenos + linoff, + || bfd_bwrite (flinfo->linenos + linoff, amt, output_bfd) != amt) return FALSE; o->output_section->lineno_count += *lineno_counts; @@ -4649,10 +4649,10 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, /* Update any C_BINCL or C_EINCL symbols that refer to a line number in the range we just output. */ - iisp = finfo->internal_syms; + iisp = flinfo->internal_syms; iispend = iisp + obj_raw_syment_count (input_bfd); - iindp = finfo->sym_indices; - oos = finfo->outsyms; + iindp = flinfo->sym_indices; + oos = flinfo->outsyms; range_start = enclosing->line_filepos + linoff; range_end = range_start + *lineno_counts * linesz; while (iisp < iispend) @@ -4704,27 +4704,27 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, symbol will be the first symbol in the next input file. In the normal case, this will save us from writing out the C_FILE symbol again. */ - if (finfo->last_file_index != -1 - && (bfd_size_type) finfo->last_file_index >= syment_base) + if (flinfo->last_file_index != -1 + && (bfd_size_type) flinfo->last_file_index >= syment_base) { - finfo->last_file.n_value = output_index; - bfd_coff_swap_sym_out (output_bfd, (void *) &finfo->last_file, - (void *) (finfo->outsyms - + ((finfo->last_file_index - syment_base) + flinfo->last_file.n_value = output_index; + bfd_coff_swap_sym_out (output_bfd, (void *) &flinfo->last_file, + (void *) (flinfo->outsyms + + ((flinfo->last_file_index - syment_base) * osymesz))); } /* Write the modified symbols to the output file. */ - if (outsym > finfo->outsyms) + if (outsym > flinfo->outsyms) { file_ptr pos = obj_sym_filepos (output_bfd) + syment_base * osymesz; - bfd_size_type amt = outsym - finfo->outsyms; + bfd_size_type amt = outsym - flinfo->outsyms; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt) + || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt) return FALSE; BFD_ASSERT ((obj_raw_syment_count (output_bfd) - + (outsym - finfo->outsyms) / osymesz) + + (outsym - flinfo->outsyms) / osymesz) == output_index); obj_raw_syment_count (output_bfd) = output_index; @@ -4756,9 +4756,9 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, else { bfd_size_type sz = o->rawsize ? o->rawsize : o->size; - if (!bfd_get_section_contents (input_bfd, o, finfo->contents, 0, sz)) + if (!bfd_get_section_contents (input_bfd, o, flinfo->contents, 0, sz)) return FALSE; - contents = finfo->contents; + contents = flinfo->contents; } if ((o->flags & SEC_RELOC) != 0) @@ -4774,27 +4774,27 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, /* Read in the relocs. */ target_index = o->output_section->target_index; internal_relocs = (xcoff_read_internal_relocs - (input_bfd, o, FALSE, finfo->external_relocs, + (input_bfd, o, FALSE, flinfo->external_relocs, TRUE, - (finfo->section_info[target_index].relocs + (flinfo->section_info[target_index].relocs + o->output_section->reloc_count))); if (internal_relocs == NULL) return FALSE; /* Call processor specific code to relocate the section contents. */ - if (! bfd_coff_relocate_section (output_bfd, finfo->info, + if (! bfd_coff_relocate_section (output_bfd, flinfo->info, input_bfd, o, contents, internal_relocs, - finfo->internal_syms, + flinfo->internal_syms, xcoff_data (input_bfd)->csects)) return FALSE; offset = o->output_section->vma + o->output_offset - o->vma; irel = internal_relocs; irelend = irel + o->reloc_count; - rel_hash = (finfo->section_info[target_index].rel_hashes + rel_hash = (flinfo->section_info[target_index].rel_hashes + o->output_section->reloc_count); for (; irel < irelend; irel++, rel_hash++) { @@ -4813,7 +4813,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, else h = obj_xcoff_sym_hashes (input_bfd)[r_symndx]; - if (r_symndx != -1 && finfo->info->strip != strip_all) + if (r_symndx != -1 && flinfo->info->strip != strip_all) { if (h != NULL && h->smclas != XMC_TD @@ -4839,10 +4839,10 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, bfd_size_type amt; amt = sizeof (* n); - n = bfd_alloc (finfo->output_bfd, amt); + n = bfd_alloc (flinfo->output_bfd, amt); if (n == NULL) return FALSE; - si = finfo->section_info + target_index; + si = flinfo->section_info + target_index; n->next = si->toc_rel_hashes; n->h = h; n->rel = irel; @@ -4870,7 +4870,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, { long indx; - indx = finfo->sym_indices[r_symndx]; + indx = flinfo->sym_indices[r_symndx]; if (indx == -1) { @@ -4879,7 +4879,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, /* Relocations against a TC0 TOC anchor are automatically transformed to be against the TOC anchor in the output file. */ - is = finfo->internal_syms + r_symndx; + is = flinfo->internal_syms + r_symndx; if (is->n_sclass == C_HIDEXT && is->n_numaux > 0) { @@ -4898,7 +4898,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, (void *) &aux); if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD && aux.x_csect.x_smclas == XMC_TC0) - indx = finfo->toc_symindx; + indx = flinfo->toc_symindx; } } @@ -4915,7 +4915,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, /* This reloc is against a symbol we are stripping. It would be possible to handle this case, but I don't think it's worth it. */ - is = finfo->internal_syms + r_symndx; + is = flinfo->internal_syms + r_symndx; name = (_bfd_coff_internal_syment_name (input_bfd, is, buf)); @@ -4923,15 +4923,15 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, if (name == NULL) return FALSE; - if (! ((*finfo->info->callbacks->unattached_reloc) - (finfo->info, name, input_bfd, o, + if (! ((*flinfo->info->callbacks->unattached_reloc) + (flinfo->info, name, input_bfd, o, irel->r_vaddr))) return FALSE; } } } - if (xcoff_need_ldrel_p (finfo->info, irel, h)) + if (xcoff_need_ldrel_p (flinfo->info, irel, h)) { asection *sec; @@ -4941,7 +4941,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, sec = xcoff_data (input_bfd)->csects[r_symndx]; else sec = xcoff_symbol_section (h); - if (!xcoff_create_ldrel (output_bfd, finfo, + if (!xcoff_create_ldrel (output_bfd, flinfo, o->output_section, input_bfd, irel, sec, h)) return FALSE; @@ -4960,7 +4960,7 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, obj_coff_keep_syms (input_bfd) = keep_syms; - if (! finfo->info->keep_memory) + if (! flinfo->info->keep_memory) { if (! _bfd_coff_free_symbols (input_bfd)) return FALSE; @@ -5016,7 +5016,7 @@ xcoff_toc_section_p (asection *sec) symbol. */ static bfd_boolean -xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) +xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *flinfo) { bfd_vma toc_start, toc_end, start, end, best_address; asection *sec; @@ -5032,7 +5032,7 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) toc_start = ~(bfd_vma) 0; toc_end = 0; section_index = -1; - for (input_bfd = finfo->info->input_bfds; + for (input_bfd = flinfo->info->input_bfds; input_bfd != NULL; input_bfd = input_bfd->link_next) for (sec = input_bfd->sections; sec != NULL; sec = sec->next) @@ -5064,7 +5064,7 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) { /* Find the lowest TOC csect that is still within range of TOC_END. */ best_address = toc_end; - for (input_bfd = finfo->info->input_bfds; + for (input_bfd = flinfo->info->input_bfds; input_bfd != NULL; input_bfd = input_bfd->link_next) for (sec = input_bfd->sections; sec != NULL; sec = sec->next) @@ -5092,19 +5092,19 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) } /* Record the chosen TOC value. */ - finfo->toc_symindx = obj_raw_syment_count (output_bfd); + flinfo->toc_symindx = obj_raw_syment_count (output_bfd); xcoff_data (output_bfd)->toc = best_address; xcoff_data (output_bfd)->sntoc = section_index; /* Fill out the TC0 symbol. */ - if (!bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &irsym, "TOC")) + if (!bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab, &irsym, "TOC")) return FALSE; irsym.n_value = best_address; irsym.n_scnum = section_index; irsym.n_sclass = C_HIDEXT; irsym.n_type = T_NULL; irsym.n_numaux = 1; - bfd_coff_swap_sym_out (output_bfd, &irsym, finfo->outsyms); + bfd_coff_swap_sym_out (output_bfd, &irsym, flinfo->outsyms); /* Fill out the auxillary csect information. */ memset (&iraux, 0, sizeof iraux); @@ -5112,14 +5112,14 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) iraux.x_csect.x_smclas = XMC_TC0; iraux.x_csect.x_scnlen.l = 0; bfd_coff_swap_aux_out (output_bfd, &iraux, T_NULL, C_HIDEXT, 0, 1, - finfo->outsyms + bfd_coff_symesz (output_bfd)); + flinfo->outsyms + bfd_coff_symesz (output_bfd)); /* Write the contents to the file. */ pos = obj_sym_filepos (output_bfd); pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd); size = 2 * bfd_coff_symesz (output_bfd); if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo->outsyms, size, output_bfd) != size) + || bfd_bwrite (flinfo->outsyms, size, output_bfd) != size) return FALSE; obj_raw_syment_count (output_bfd) += 2; @@ -5131,7 +5131,7 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo) static bfd_boolean xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) { - struct xcoff_final_link_info *finfo = (struct xcoff_final_link_info *) inf; + struct xcoff_final_link_info *flinfo = (struct xcoff_final_link_info *) inf; bfd *output_bfd; bfd_byte *outsym; struct internal_syment isym; @@ -5140,8 +5140,8 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) file_ptr pos; bfd_size_type amt; - output_bfd = finfo->output_bfd; - outsym = finfo->outsyms; + output_bfd = flinfo->output_bfd; + outsym = flinfo->outsyms; if (h->root.type == bfd_link_hash_warning) { @@ -5151,7 +5151,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) } /* If this symbol was garbage collected, just skip it. */ - if (xcoff_hash_table (finfo->info)->gc + if (xcoff_hash_table (flinfo->info)->gc && (h->flags & XCOFF_MARK) == 0) return TRUE; @@ -5252,16 +5252,16 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) BFD_ASSERT (h->ldindx >= 0); bfd_xcoff_swap_ldsym_out (output_bfd, ldsym, - (finfo->ldsym + + (flinfo->ldsym + (h->ldindx - 3) - * bfd_xcoff_ldsymsz(finfo->output_bfd))); + * bfd_xcoff_ldsymsz(flinfo->output_bfd))); h->ldsym = NULL; } /* If this symbol needs global linkage code, write it out. */ if (h->root.type == bfd_link_hash_defined && (h->root.u.def.section - == xcoff_hash_table (finfo->info)->linkage_section)) + == xcoff_hash_table (flinfo->info)->linkage_section)) { bfd_byte *p; bfd_vma tocoff; @@ -5307,7 +5307,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) tocsec = h->toc_section; osec = tocsec->output_section; oindx = osec->target_index; - irel = finfo->section_info[oindx].relocs + osec->reloc_count; + irel = flinfo->section_info[oindx].relocs + osec->reloc_count; irel->r_vaddr = (osec->vma + tocsec->output_offset + h->u.toc_offset); @@ -5350,18 +5350,18 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) return FALSE; irel->r_type = R_POS; - finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; + flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; ++osec->reloc_count; - if (!xcoff_create_ldrel (output_bfd, finfo, osec, + if (!xcoff_create_ldrel (output_bfd, flinfo, osec, output_bfd, irel, NULL, h)) return FALSE; /* We need to emit a symbol to define a csect which holds the reloc. */ - if (finfo->info->strip != strip_all) + if (flinfo->info->strip != strip_all) { - result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, + result = bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab, &irsym, h->root.root.string); if (!result) return FALSE; @@ -5387,14 +5387,14 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) pos = obj_sym_filepos (output_bfd); pos += (obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd)); - amt = outsym - finfo->outsyms; + amt = outsym - flinfo->outsyms; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt) + || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt) return FALSE; obj_raw_syment_count (output_bfd) += - (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd); + (outsym - flinfo->outsyms) / bfd_coff_symesz (output_bfd); - outsym = finfo->outsyms; + outsym = flinfo->outsyms; } } } @@ -5412,7 +5412,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) if ((h->flags & XCOFF_DESCRIPTOR) != 0 && h->root.type == bfd_link_hash_defined && (h->root.u.def.section - == xcoff_hash_table (finfo->info)->descriptor_section)) + == xcoff_hash_table (flinfo->info)->descriptor_section)) { asection *sec; asection *osec; @@ -5448,17 +5448,17 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) || hentry->root.type == bfd_link_hash_defweak)); esec = hentry->root.u.def.section; - irel = finfo->section_info[oindx].relocs + osec->reloc_count; + irel = flinfo->section_info[oindx].relocs + osec->reloc_count; irel->r_vaddr = (osec->vma + sec->output_offset + h->root.u.def.value); irel->r_symndx = esec->output_section->target_index; irel->r_type = R_POS; irel->r_size = reloc_size; - finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; + flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; ++osec->reloc_count; - if (!xcoff_create_ldrel (output_bfd, finfo, osec, + if (!xcoff_create_ldrel (output_bfd, flinfo, osec, output_bfd, irel, esec, NULL)) return FALSE; @@ -5500,34 +5500,34 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) irel->r_symndx = tsec->output_section->target_index; irel->r_type = R_POS; irel->r_size = reloc_size; - finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; + flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; ++osec->reloc_count; - if (!xcoff_create_ldrel (output_bfd, finfo, osec, + if (!xcoff_create_ldrel (output_bfd, flinfo, osec, output_bfd, irel, tsec, NULL)) return FALSE; } - if (h->indx >= 0 || finfo->info->strip == strip_all) + if (h->indx >= 0 || flinfo->info->strip == strip_all) { - BFD_ASSERT (outsym == finfo->outsyms); + BFD_ASSERT (outsym == flinfo->outsyms); return TRUE; } if (h->indx != -2 - && (finfo->info->strip == strip_all - || (finfo->info->strip == strip_some - && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string, + && (flinfo->info->strip == strip_all + || (flinfo->info->strip == strip_some + && bfd_hash_lookup (flinfo->info->keep_hash, h->root.root.string, FALSE, FALSE) == NULL))) { - BFD_ASSERT (outsym == finfo->outsyms); + BFD_ASSERT (outsym == flinfo->outsyms); return TRUE; } if (h->indx != -2 && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0) { - BFD_ASSERT (outsym == finfo->outsyms); + BFD_ASSERT (outsym == flinfo->outsyms); return TRUE; } @@ -5535,7 +5535,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) h->indx = obj_raw_syment_count (output_bfd); - result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &isym, + result = bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab, &isym, h->root.root.string); if (!result) return FALSE; @@ -5583,7 +5583,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) if ((h->flags & XCOFF_HAS_SIZE) != 0) { - for (l = xcoff_hash_table (finfo->info)->size_list; + for (l = xcoff_hash_table (flinfo->info)->size_list; l != NULL; l = l->next) { @@ -5642,12 +5642,12 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) pos = obj_sym_filepos (output_bfd); pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd); - amt = outsym - finfo->outsyms; + amt = outsym - flinfo->outsyms; if (bfd_seek (output_bfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt) + || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt) return FALSE; obj_raw_syment_count (output_bfd) += - (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd); + (outsym - flinfo->outsyms) / bfd_coff_symesz (output_bfd); return TRUE; } @@ -5656,7 +5656,7 @@ xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) static bfd_boolean xcoff_reloc_link_order (bfd *output_bfd, - struct xcoff_final_link_info *finfo, + struct xcoff_final_link_info *flinfo, asection *output_section, struct bfd_link_order *link_order) { @@ -5683,13 +5683,13 @@ xcoff_reloc_link_order (bfd *output_bfd, } h = ((struct xcoff_link_hash_entry *) - bfd_wrapped_link_hash_lookup (output_bfd, finfo->info, + bfd_wrapped_link_hash_lookup (output_bfd, flinfo->info, link_order->u.reloc.p->u.name, FALSE, FALSE, TRUE)); if (h == NULL) { - if (! ((*finfo->info->callbacks->unattached_reloc) - (finfo->info, link_order->u.reloc.p->u.name, NULL, NULL, (bfd_vma) 0))) + if (! ((*flinfo->info->callbacks->unattached_reloc) + (flinfo->info, link_order->u.reloc.p->u.name, NULL, NULL, (bfd_vma) 0))) return FALSE; return TRUE; } @@ -5728,8 +5728,8 @@ xcoff_reloc_link_order (bfd *output_bfd, case bfd_reloc_outofrange: abort (); case bfd_reloc_overflow: - if (! ((*finfo->info->callbacks->reloc_overflow) - (finfo->info, NULL, link_order->u.reloc.p->u.name, + if (! ((*flinfo->info->callbacks->reloc_overflow) + (flinfo->info, NULL, link_order->u.reloc.p->u.name, howto->name, addend, NULL, NULL, (bfd_vma) 0))) { free (buf); @@ -5746,9 +5746,9 @@ xcoff_reloc_link_order (bfd *output_bfd, /* Store the reloc information in the right place. It will get swapped and written out at the end of the final_link routine. */ - irel = (finfo->section_info[output_section->target_index].relocs + irel = (flinfo->section_info[output_section->target_index].relocs + output_section->reloc_count); - rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes + rel_hash_ptr = (flinfo->section_info[output_section->target_index].rel_hashes + output_section->reloc_count); memset (irel, 0, sizeof (struct internal_reloc)); @@ -5774,9 +5774,9 @@ xcoff_reloc_link_order (bfd *output_bfd, ++output_section->reloc_count; /* Now output the reloc to the .loader section. */ - if (xcoff_hash_table (finfo->info)->loader_section) + if (xcoff_hash_table (flinfo->info)->loader_section) { - if (!xcoff_create_ldrel (output_bfd, finfo, output_section, + if (!xcoff_create_ldrel (output_bfd, flinfo, output_section, output_bfd, irel, hsec, h)) return FALSE; } @@ -5790,7 +5790,7 @@ bfd_boolean _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) { bfd_size_type symesz; - struct xcoff_final_link_info finfo; + struct xcoff_final_link_info flinfo; asection *o; struct bfd_link_order *p; bfd_size_type max_contents_size; @@ -5813,38 +5813,38 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) symesz = bfd_coff_symesz (abfd); - finfo.info = info; - finfo.output_bfd = abfd; - finfo.strtab = NULL; - finfo.section_info = NULL; - finfo.last_file_index = -1; - finfo.toc_symindx = -1; - finfo.internal_syms = NULL; - finfo.sym_indices = NULL; - finfo.outsyms = NULL; - finfo.linenos = NULL; - finfo.contents = NULL; - finfo.external_relocs = NULL; + flinfo.info = info; + flinfo.output_bfd = abfd; + flinfo.strtab = NULL; + flinfo.section_info = NULL; + flinfo.last_file_index = -1; + flinfo.toc_symindx = -1; + flinfo.internal_syms = NULL; + flinfo.sym_indices = NULL; + flinfo.outsyms = NULL; + flinfo.linenos = NULL; + flinfo.contents = NULL; + flinfo.external_relocs = NULL; if (xcoff_hash_table (info)->loader_section) { - finfo.ldsym = (xcoff_hash_table (info)->loader_section->contents + flinfo.ldsym = (xcoff_hash_table (info)->loader_section->contents + bfd_xcoff_ldhdrsz (abfd)); - finfo.ldrel = (xcoff_hash_table (info)->loader_section->contents + flinfo.ldrel = (xcoff_hash_table (info)->loader_section->contents + bfd_xcoff_ldhdrsz (abfd) + (xcoff_hash_table (info)->ldhdr.l_nsyms * bfd_xcoff_ldsymsz (abfd))); } else { - finfo.ldsym = NULL; - finfo.ldrel = NULL; + flinfo.ldsym = NULL; + flinfo.ldrel = NULL; } xcoff_data (abfd)->coff.link_info = info; - finfo.strtab = _bfd_stringtab_init (); - if (finfo.strtab == NULL) + flinfo.strtab = _bfd_stringtab_init (); + if (flinfo.strtab == NULL) goto error_return; /* Count the relocation entries required for the output file. @@ -6001,14 +6001,14 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) the target_index fields are 1 based. */ amt = abfd->section_count + 1; amt *= sizeof (struct xcoff_link_section_info); - finfo.section_info = bfd_malloc (amt); - if (finfo.section_info == NULL) + flinfo.section_info = bfd_malloc (amt); + if (flinfo.section_info == NULL) goto error_return; for (i = 0; i <= abfd->section_count; i++) { - finfo.section_info[i].relocs = NULL; - finfo.section_info[i].rel_hashes = NULL; - finfo.section_info[i].toc_rel_hashes = NULL; + flinfo.section_info[i].relocs = NULL; + flinfo.section_info[i].rel_hashes = NULL; + flinfo.section_info[i].toc_rel_hashes = NULL; } } @@ -6049,14 +6049,14 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) would be slow. */ amt = o->reloc_count; amt *= sizeof (struct internal_reloc); - finfo.section_info[o->target_index].relocs = bfd_malloc (amt); + flinfo.section_info[o->target_index].relocs = bfd_malloc (amt); amt = o->reloc_count; amt *= sizeof (struct xcoff_link_hash_entry *); - finfo.section_info[o->target_index].rel_hashes = bfd_malloc (amt); + flinfo.section_info[o->target_index].rel_hashes = bfd_malloc (amt); - if (finfo.section_info[o->target_index].relocs == NULL - || finfo.section_info[o->target_index].rel_hashes == NULL) + if (flinfo.section_info[o->target_index].relocs == NULL + || flinfo.section_info[o->target_index].rel_hashes == NULL) goto error_return; if (o->reloc_count > max_output_reloc_count) @@ -6067,7 +6067,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) /* We now know the size of the relocs, so we can determine the file positions of the line numbers. */ line_filepos = rel_filepos; - finfo.line_filepos = line_filepos; + flinfo.line_filepos = line_filepos; linesz = bfd_coff_linesz (abfd); for (o = abfd->sections; o != NULL; o = o->next) { @@ -6104,35 +6104,35 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) /* Allocate some buffers used while linking. */ amt = max_sym_count * sizeof (struct internal_syment); - finfo.internal_syms = bfd_malloc (amt); + flinfo.internal_syms = bfd_malloc (amt); amt = max_sym_count * sizeof (long); - finfo.sym_indices = bfd_malloc (amt); + flinfo.sym_indices = bfd_malloc (amt); amt = (max_sym_count + 1) * symesz; - finfo.outsyms = bfd_malloc (amt); + flinfo.outsyms = bfd_malloc (amt); amt = max_lineno_count * bfd_coff_linesz (abfd); - finfo.linenos = bfd_malloc (amt); + flinfo.linenos = bfd_malloc (amt); amt = max_contents_size; - finfo.contents = bfd_malloc (amt); + flinfo.contents = bfd_malloc (amt); amt = max_reloc_count * relsz; - finfo.external_relocs = bfd_malloc (amt); - - if ((finfo.internal_syms == NULL && max_sym_count > 0) - || (finfo.sym_indices == NULL && max_sym_count > 0) - || finfo.outsyms == NULL - || (finfo.linenos == NULL && max_lineno_count > 0) - || (finfo.contents == NULL && max_contents_size > 0) - || (finfo.external_relocs == NULL && max_reloc_count > 0)) + flinfo.external_relocs = bfd_malloc (amt); + + if ((flinfo.internal_syms == NULL && max_sym_count > 0) + || (flinfo.sym_indices == NULL && max_sym_count > 0) + || flinfo.outsyms == NULL + || (flinfo.linenos == NULL && max_lineno_count > 0) + || (flinfo.contents == NULL && max_contents_size > 0) + || (flinfo.external_relocs == NULL && max_reloc_count > 0)) goto error_return; obj_raw_syment_count (abfd) = 0; /* Find a TOC symbol, if we need one. */ - if (!xcoff_find_tc0 (abfd, &finfo)) + if (!xcoff_find_tc0 (abfd, &flinfo)) goto error_return; /* We now know the position of everything in the file, except that @@ -6150,7 +6150,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) sub = p->u.indirect.section->owner; if (! sub->output_has_begun) { - if (! xcoff_link_input_bfd (&finfo, sub)) + if (! xcoff_link_input_bfd (&flinfo, sub)) goto error_return; sub->output_has_begun = TRUE; } @@ -6158,7 +6158,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) else if (p->type == bfd_section_reloc_link_order || p->type == bfd_symbol_reloc_link_order) { - if (! xcoff_reloc_link_order (abfd, &finfo, o, p)) + if (! xcoff_reloc_link_order (abfd, &flinfo, o, p)) goto error_return; } else @@ -6170,42 +6170,42 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) } /* Free up the buffers used by xcoff_link_input_bfd. */ - if (finfo.internal_syms != NULL) + if (flinfo.internal_syms != NULL) { - free (finfo.internal_syms); - finfo.internal_syms = NULL; + free (flinfo.internal_syms); + flinfo.internal_syms = NULL; } - if (finfo.sym_indices != NULL) + if (flinfo.sym_indices != NULL) { - free (finfo.sym_indices); - finfo.sym_indices = NULL; + free (flinfo.sym_indices); + flinfo.sym_indices = NULL; } - if (finfo.linenos != NULL) + if (flinfo.linenos != NULL) { - free (finfo.linenos); - finfo.linenos = NULL; + free (flinfo.linenos); + flinfo.linenos = NULL; } - if (finfo.contents != NULL) + if (flinfo.contents != NULL) { - free (finfo.contents); - finfo.contents = NULL; + free (flinfo.contents); + flinfo.contents = NULL; } - if (finfo.external_relocs != NULL) + if (flinfo.external_relocs != NULL) { - free (finfo.external_relocs); - finfo.external_relocs = NULL; + free (flinfo.external_relocs); + flinfo.external_relocs = NULL; } /* The value of the last C_FILE symbol is supposed to be -1. Write it out again. */ - if (finfo.last_file_index != -1) + if (flinfo.last_file_index != -1) { - finfo.last_file.n_value = -(bfd_vma) 1; - bfd_coff_swap_sym_out (abfd, (void *) &finfo.last_file, - (void *) finfo.outsyms); - pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz; + flinfo.last_file.n_value = -(bfd_vma) 1; + bfd_coff_swap_sym_out (abfd, (void *) &flinfo.last_file, + (void *) flinfo.outsyms); + pos = obj_sym_filepos (abfd) + flinfo.last_file_index * symesz; if (bfd_seek (abfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz) + || bfd_bwrite (flinfo.outsyms, symesz, abfd) != symesz) goto error_return; } @@ -6213,12 +6213,12 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) input files. */ xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_write_global_symbol, - (void *) &finfo); + (void *) &flinfo); - if (finfo.outsyms != NULL) + if (flinfo.outsyms != NULL) { - free (finfo.outsyms); - finfo.outsyms = NULL; + free (flinfo.outsyms); + flinfo.outsyms = NULL; } /* Now that we have written out all the global symbols, we know the @@ -6248,9 +6248,9 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) if (o->reloc_count == 0) continue; - irel = finfo.section_info[o->target_index].relocs; + irel = flinfo.section_info[o->target_index].relocs; irelend = irel + o->reloc_count; - rel_hash = finfo.section_info[o->target_index].rel_hashes; + rel_hash = flinfo.section_info[o->target_index].rel_hashes; for (; irel < irelend; irel++, rel_hash++, erel += relsz) { if (*rel_hash != NULL) @@ -6267,7 +6267,7 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) } } - for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes; + for (toc_rel_hash = flinfo.section_info[o->target_index].toc_rel_hashes; toc_rel_hash != NULL; toc_rel_hash = toc_rel_hash->next) { @@ -6287,11 +6287,11 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) appear in the symbol table, which is not necessarily by address. So we sort them here. There may be a better way to do this. */ - qsort ((void *) finfo.section_info[o->target_index].relocs, + qsort ((void *) flinfo.section_info[o->target_index].relocs, o->reloc_count, sizeof (struct internal_reloc), xcoff_sort_relocs); - irel = finfo.section_info[o->target_index].relocs; + irel = flinfo.section_info[o->target_index].relocs; irelend = irel + o->reloc_count; erel = external_relocs; for (; irel < irelend; irel++, rel_hash++, erel += relsz) @@ -6310,26 +6310,26 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) } /* Free up the section information. */ - if (finfo.section_info != NULL) + if (flinfo.section_info != NULL) { unsigned int i; for (i = 0; i < abfd->section_count; i++) { - if (finfo.section_info[i].relocs != NULL) - free (finfo.section_info[i].relocs); - if (finfo.section_info[i].rel_hashes != NULL) - free (finfo.section_info[i].rel_hashes); + if (flinfo.section_info[i].relocs != NULL) + free (flinfo.section_info[i].relocs); + if (flinfo.section_info[i].rel_hashes != NULL) + free (flinfo.section_info[i].rel_hashes); } - free (finfo.section_info); - finfo.section_info = NULL; + free (flinfo.section_info); + flinfo.section_info = NULL; } /* Write out the loader section contents. */ o = xcoff_hash_table (info)->loader_section; if (o) { - BFD_ASSERT ((bfd_byte *) finfo.ldrel + BFD_ASSERT ((bfd_byte *) flinfo.ldrel == (xcoff_hash_table (info)->loader_section->contents + xcoff_hash_table (info)->ldhdr.l_impoff)); if (!bfd_set_section_contents (abfd, o->output_section, o->contents, @@ -6362,15 +6362,15 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) if (bfd_seek (abfd, pos, SEEK_SET) != 0) goto error_return; H_PUT_32 (abfd, - _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE, + _bfd_stringtab_size (flinfo.strtab) + STRING_SIZE_SIZE, strbuf); amt = STRING_SIZE_SIZE; if (bfd_bwrite (strbuf, amt, abfd) != amt) goto error_return; - if (! _bfd_stringtab_emit (abfd, finfo.strtab)) + if (! _bfd_stringtab_emit (abfd, flinfo.strtab)) goto error_return; - _bfd_stringtab_free (finfo.strtab); + _bfd_stringtab_free (flinfo.strtab); /* Write out the debugging string table. */ o = xcoff_hash_table (info)->debug_section; @@ -6395,35 +6395,35 @@ _bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) return TRUE; error_return: - if (finfo.strtab != NULL) - _bfd_stringtab_free (finfo.strtab); + if (flinfo.strtab != NULL) + _bfd_stringtab_free (flinfo.strtab); - if (finfo.section_info != NULL) + if (flinfo.section_info != NULL) { unsigned int i; for (i = 0; i < abfd->section_count; i++) { - if (finfo.section_info[i].relocs != NULL) - free (finfo.section_info[i].relocs); - if (finfo.section_info[i].rel_hashes != NULL) - free (finfo.section_info[i].rel_hashes); + if (flinfo.section_info[i].relocs != NULL) + free (flinfo.section_info[i].relocs); + if (flinfo.section_info[i].rel_hashes != NULL) + free (flinfo.section_info[i].rel_hashes); } - free (finfo.section_info); - } - - if (finfo.internal_syms != NULL) - free (finfo.internal_syms); - if (finfo.sym_indices != NULL) - free (finfo.sym_indices); - if (finfo.outsyms != NULL) - free (finfo.outsyms); - if (finfo.linenos != NULL) - free (finfo.linenos); - if (finfo.contents != NULL) - free (finfo.contents); - if (finfo.external_relocs != NULL) - free (finfo.external_relocs); + free (flinfo.section_info); + } + + if (flinfo.internal_syms != NULL) + free (flinfo.internal_syms); + if (flinfo.sym_indices != NULL) + free (flinfo.sym_indices); + if (flinfo.outsyms != NULL) + free (flinfo.outsyms); + if (flinfo.linenos != NULL) + free (flinfo.linenos); + if (flinfo.contents != NULL) + free (flinfo.contents); + if (flinfo.external_relocs != NULL) + free (flinfo.external_relocs); if (external_relocs != NULL) free (external_relocs); return FALSE; |