This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
flaginfo?
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Wed, 16 May 2012 23:44:16 +0930
- Subject: flaginfo?
"flaginfo" isn't really a correct contraction of "final link
information", and the recent bfd_elf_lookup_section_flags change
reversed Nick's renaming. Fix that, and tidy
bfd_elf_lookup_section_flags.
* elflink.c: Rename flaginfo to flinfo throughout, except..
(bfd_elf_lookup_section_flags): ..here, rename finfo to flaginfo.
Formatting, style. Simplify flag match.
Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.440
diff -u -p -r1.440 elflink.c
--- bfd/elflink.c 14 May 2012 19:45:18 -0000 1.440
+++ bfd/elflink.c 16 May 2012 11:45:56 -0000
@@ -7408,7 +7408,7 @@ struct elf_outext_info
{
bfd_boolean failed;
bfd_boolean localsyms;
- struct elf_final_link_info *flaginfo;
+ struct elf_final_link_info *flinfo;
};
@@ -7485,7 +7485,7 @@ set_symbol_value (bfd *bfd_with_globals,
static bfd_boolean
resolve_symbol (const char *name,
bfd *input_bfd,
- struct elf_final_link_info *flaginfo,
+ struct elf_final_link_info *flinfo,
bfd_vma *result,
Elf_Internal_Sym *isymbuf,
size_t locsymcount)
@@ -7514,7 +7514,7 @@ resolve_symbol (const char *name,
#endif
if (candidate && strcmp (candidate, name) == 0)
{
- asection *sec = flaginfo->sections [i];
+ asection *sec = flinfo->sections [i];
*result = _bfd_elf_rel_local_sym (input_bfd, sym, &sec, 0);
*result += sec->output_offset + sec->output_section->vma;
@@ -7527,7 +7527,7 @@ resolve_symbol (const char *name,
}
/* Hmm, haven't found it yet. perhaps it is a global. */
- global_entry = bfd_link_hash_lookup (flaginfo->info->hash, name,
+ global_entry = bfd_link_hash_lookup (flinfo->info->hash, name,
FALSE, FALSE, TRUE);
if (!global_entry)
return FALSE;
@@ -7596,7 +7596,7 @@ static bfd_boolean
eval_symbol (bfd_vma *result,
const char **symp,
bfd *input_bfd,
- struct elf_final_link_info *flaginfo,
+ struct elf_final_link_info *flinfo,
bfd_vma dot,
Elf_Internal_Sym *isymbuf,
size_t locsymcount,
@@ -7656,8 +7656,8 @@ eval_symbol (bfd_vma *result,
if (symbol_is_section)
{
- if (!resolve_section (symbuf, flaginfo->output_bfd->sections, result)
- && !resolve_symbol (symbuf, input_bfd, flaginfo, result,
+ if (!resolve_section (symbuf, flinfo->output_bfd->sections, result)
+ && !resolve_symbol (symbuf, input_bfd, flinfo, result,
isymbuf, locsymcount))
{
undefined_reference ("section", symbuf);
@@ -7666,9 +7666,9 @@ eval_symbol (bfd_vma *result,
}
else
{
- if (!resolve_symbol (symbuf, input_bfd, flaginfo, result,
+ if (!resolve_symbol (symbuf, input_bfd, flinfo, result,
isymbuf, locsymcount)
- && !resolve_section (symbuf, flaginfo->output_bfd->sections,
+ && !resolve_section (symbuf, flinfo->output_bfd->sections,
result))
{
undefined_reference ("symbol", symbuf);
@@ -7687,7 +7687,7 @@ eval_symbol (bfd_vma *result,
if (*sym == ':') \
++sym; \
*symp = sym; \
- if (!eval_symbol (&a, symp, input_bfd, flaginfo, dot, \
+ if (!eval_symbol (&a, symp, input_bfd, flinfo, dot, \
isymbuf, locsymcount, signed_p)) \
return FALSE; \
if (signed_p) \
@@ -7704,11 +7704,11 @@ eval_symbol (bfd_vma *result,
if (*sym == ':') \
++sym; \
*symp = sym; \
- if (!eval_symbol (&a, symp, input_bfd, flaginfo, dot, \
+ if (!eval_symbol (&a, symp, input_bfd, flinfo, dot, \
isymbuf, locsymcount, signed_p)) \
return FALSE; \
++*symp; \
- if (!eval_symbol (&b, symp, input_bfd, flaginfo, dot, \
+ if (!eval_symbol (&b, symp, input_bfd, flinfo, dot, \
isymbuf, locsymcount, signed_p)) \
return FALSE; \
if (signed_p) \
@@ -8306,24 +8306,24 @@ elf_link_sort_relocs (bfd *abfd, struct
/* Flush the output symbols to the file. */
static bfd_boolean
-elf_link_flush_output_syms (struct elf_final_link_info *flaginfo,
+elf_link_flush_output_syms (struct elf_final_link_info *flinfo,
const struct elf_backend_data *bed)
{
- if (flaginfo->symbuf_count > 0)
+ if (flinfo->symbuf_count > 0)
{
Elf_Internal_Shdr *hdr;
file_ptr pos;
bfd_size_type amt;
- hdr = &elf_tdata (flaginfo->output_bfd)->symtab_hdr;
+ hdr = &elf_tdata (flinfo->output_bfd)->symtab_hdr;
pos = hdr->sh_offset + hdr->sh_size;
- amt = flaginfo->symbuf_count * bed->s->sizeof_sym;
- if (bfd_seek (flaginfo->output_bfd, pos, SEEK_SET) != 0
- || bfd_bwrite (flaginfo->symbuf, amt, flaginfo->output_bfd) != amt)
+ amt = flinfo->symbuf_count * bed->s->sizeof_sym;
+ if (bfd_seek (flinfo->output_bfd, pos, SEEK_SET) != 0
+ || bfd_bwrite (flinfo->symbuf, amt, flinfo->output_bfd) != amt)
return FALSE;
hdr->sh_size += amt;
- flaginfo->symbuf_count = 0;
+ flinfo->symbuf_count = 0;
}
return TRUE;
@@ -8332,7 +8332,7 @@ elf_link_flush_output_syms (struct elf_f
/* Add a symbol to the output symbol table. */
static int
-elf_link_output_sym (struct elf_final_link_info *flaginfo,
+elf_link_output_sym (struct elf_final_link_info *flinfo,
const char *name,
Elf_Internal_Sym *elfsym,
asection *input_sec,
@@ -8345,11 +8345,11 @@ elf_link_output_sym (struct elf_final_li
struct elf_link_hash_entry *);
const struct elf_backend_data *bed;
- bed = get_elf_backend_data (flaginfo->output_bfd);
+ bed = get_elf_backend_data (flinfo->output_bfd);
output_symbol_hook = bed->elf_backend_link_output_symbol_hook;
if (output_symbol_hook != NULL)
{
- int ret = (*output_symbol_hook) (flaginfo->info, name, elfsym, input_sec, h);
+ int ret = (*output_symbol_hook) (flinfo->info, name, elfsym, input_sec, h);
if (ret != 1)
return ret;
}
@@ -8360,41 +8360,41 @@ elf_link_output_sym (struct elf_final_li
elfsym->st_name = 0;
else
{
- elfsym->st_name = (unsigned long) _bfd_stringtab_add (flaginfo->symstrtab,
+ elfsym->st_name = (unsigned long) _bfd_stringtab_add (flinfo->symstrtab,
name, TRUE, FALSE);
if (elfsym->st_name == (unsigned long) -1)
return 0;
}
- if (flaginfo->symbuf_count >= flaginfo->symbuf_size)
+ if (flinfo->symbuf_count >= flinfo->symbuf_size)
{
- if (! elf_link_flush_output_syms (flaginfo, bed))
+ if (! elf_link_flush_output_syms (flinfo, bed))
return 0;
}
- dest = flaginfo->symbuf + flaginfo->symbuf_count * bed->s->sizeof_sym;
- destshndx = flaginfo->symshndxbuf;
+ dest = flinfo->symbuf + flinfo->symbuf_count * bed->s->sizeof_sym;
+ destshndx = flinfo->symshndxbuf;
if (destshndx != NULL)
{
- if (bfd_get_symcount (flaginfo->output_bfd) >= flaginfo->shndxbuf_size)
+ if (bfd_get_symcount (flinfo->output_bfd) >= flinfo->shndxbuf_size)
{
bfd_size_type amt;
- amt = flaginfo->shndxbuf_size * sizeof (Elf_External_Sym_Shndx);
+ amt = flinfo->shndxbuf_size * sizeof (Elf_External_Sym_Shndx);
destshndx = (Elf_External_Sym_Shndx *) bfd_realloc (destshndx,
amt * 2);
if (destshndx == NULL)
return 0;
- flaginfo->symshndxbuf = destshndx;
+ flinfo->symshndxbuf = destshndx;
memset ((char *) destshndx + amt, 0, amt);
- flaginfo->shndxbuf_size *= 2;
+ flinfo->shndxbuf_size *= 2;
}
- destshndx += bfd_get_symcount (flaginfo->output_bfd);
+ destshndx += bfd_get_symcount (flinfo->output_bfd);
}
- bed->s->swap_symbol_out (flaginfo->output_bfd, elfsym, dest, destshndx);
- flaginfo->symbuf_count += 1;
- bfd_get_symcount (flaginfo->output_bfd) += 1;
+ bed->s->swap_symbol_out (flinfo->output_bfd, elfsym, dest, destshndx);
+ flinfo->symbuf_count += 1;
+ bfd_get_symcount (flinfo->output_bfd) += 1;
return 1;
}
@@ -8582,7 +8582,7 @@ elf_link_output_extsym (struct bfd_hash_
{
struct elf_link_hash_entry *h = (struct elf_link_hash_entry *) bh;
struct elf_outext_info *eoinfo = (struct elf_outext_info *) data;
- struct elf_final_link_info *flaginfo = eoinfo->flaginfo;
+ struct elf_final_link_info *flinfo = eoinfo->flinfo;
bfd_boolean strip;
Elf_Internal_Sym sym;
asection *input_sec;
@@ -8609,7 +8609,7 @@ elf_link_output_extsym (struct bfd_hash_
return TRUE;
}
- bed = get_elf_backend_data (flaginfo->output_bfd);
+ bed = get_elf_backend_data (flinfo->output_bfd);
if (h->root.type == bfd_link_hash_undefined)
{
@@ -8628,14 +8628,16 @@ elf_link_output_extsym (struct bfd_hash_
/* If we are reporting errors for this situation then do so now. */
if (!ignore_undef
&& h->ref_dynamic
- && (!h->ref_regular || flaginfo->info->gc_sections)
- && ! elf_link_check_versioned_symbol (flaginfo->info, bed, h)
- && flaginfo->info->unresolved_syms_in_shared_libs != RM_IGNORE)
- {
- if (! (flaginfo->info->callbacks->undefined_symbol
- (flaginfo->info, h->root.root.string,
- h->ref_regular ? NULL : h->root.u.undef.abfd,
- NULL, 0, flaginfo->info->unresolved_syms_in_shared_libs == RM_GENERATE_ERROR)))
+ && (!h->ref_regular || flinfo->info->gc_sections)
+ && !elf_link_check_versioned_symbol (flinfo->info, bed, h)
+ && flinfo->info->unresolved_syms_in_shared_libs != RM_IGNORE)
+ {
+ if (!(flinfo->info->callbacks->undefined_symbol
+ (flinfo->info, h->root.root.string,
+ h->ref_regular ? NULL : h->root.u.undef.abfd,
+ NULL, 0,
+ (flinfo->info->unresolved_syms_in_shared_libs
+ == RM_GENERATE_ERROR))))
{
bfd_set_error (bfd_error_bad_value);
eoinfo->failed = TRUE;
@@ -8646,14 +8648,14 @@ elf_link_output_extsym (struct bfd_hash_
/* We should also warn if a forced local symbol is referenced from
shared libraries. */
- if (!flaginfo->info->relocatable
- && flaginfo->info->executable
+ if (!flinfo->info->relocatable
+ && flinfo->info->executable
&& h->forced_local
&& h->ref_dynamic
&& h->def_regular
&& !h->dynamic_def
&& !h->dynamic_weak
- && ! elf_link_check_versioned_symbol (flaginfo->info, bed, h))
+ && !elf_link_check_versioned_symbol (flinfo->info, bed, h))
{
bfd *def_bfd;
const char *msg;
@@ -8664,10 +8666,10 @@ elf_link_output_extsym (struct bfd_hash_
msg = _("%B: hidden symbol `%s' in %B is referenced by DSO");
else
msg = _("%B: local symbol `%s' in %B is referenced by DSO");
- def_bfd = flaginfo->output_bfd;
+ def_bfd = flinfo->output_bfd;
if (h->root.u.def.section != bfd_abs_section_ptr)
def_bfd = h->root.u.def.section->owner;
- (*_bfd_error_handler) (msg, flaginfo->output_bfd, def_bfd,
+ (*_bfd_error_handler) (msg, flinfo->output_bfd, def_bfd,
h->root.root.string);
bfd_set_error (bfd_error_bad_value);
eoinfo->failed = TRUE;
@@ -8686,15 +8688,15 @@ elf_link_output_extsym (struct bfd_hash_
&& !h->def_regular
&& !h->ref_regular)
strip = TRUE;
- else if (flaginfo->info->strip == strip_all)
+ else if (flinfo->info->strip == strip_all)
strip = TRUE;
- else if (flaginfo->info->strip == strip_some
- && bfd_hash_lookup (flaginfo->info->keep_hash,
+ else if (flinfo->info->strip == strip_some
+ && bfd_hash_lookup (flinfo->info->keep_hash,
h->root.root.string, FALSE, FALSE) == NULL)
strip = TRUE;
else if ((h->root.type == bfd_link_hash_defined
|| h->root.type == bfd_link_hash_defweak)
- && ((flaginfo->info->strip_discarded
+ && ((flinfo->info->strip_discarded
&& discarded_section (h->root.u.def.section))
|| (h->root.u.def.section->owner != NULL
&& (h->root.u.def.section->owner->flags & BFD_PLUGIN) != 0)))
@@ -8755,13 +8757,13 @@ elf_link_output_extsym (struct bfd_hash_
if (input_sec->output_section != NULL)
{
sym.st_shndx =
- _bfd_elf_section_from_bfd_section (flaginfo->output_bfd,
+ _bfd_elf_section_from_bfd_section (flinfo->output_bfd,
input_sec->output_section);
if (sym.st_shndx == SHN_BAD)
{
(*_bfd_error_handler)
(_("%B: could not find output section %A for input section %A"),
- flaginfo->output_bfd, input_sec->output_section, input_sec);
+ flinfo->output_bfd, input_sec->output_section, input_sec);
bfd_set_error (bfd_error_nonrepresentable_section);
eoinfo->failed = TRUE;
return FALSE;
@@ -8771,18 +8773,18 @@ elf_link_output_extsym (struct bfd_hash_
but in nonrelocatable files they are virtual
addresses. */
sym.st_value = h->root.u.def.value + input_sec->output_offset;
- if (! flaginfo->info->relocatable)
+ if (!flinfo->info->relocatable)
{
sym.st_value += input_sec->output_section->vma;
if (h->type == STT_TLS)
{
- asection *tls_sec = elf_hash_table (flaginfo->info)->tls_sec;
+ asection *tls_sec = elf_hash_table (flinfo->info)->tls_sec;
if (tls_sec != NULL)
sym.st_value -= tls_sec->vma;
else
{
/* The TLS section may have been garbage collected. */
- BFD_ASSERT (flaginfo->info->gc_sections
+ BFD_ASSERT (flinfo->info->gc_sections
&& !input_sec->gc_mark);
}
}
@@ -8821,17 +8823,17 @@ elf_link_output_extsym (struct bfd_hash_
STT_GNU_IFUNC symbol must go through PLT. */
if ((h->type == STT_GNU_IFUNC
&& h->def_regular
- && !flaginfo->info->relocatable)
+ && !flinfo->info->relocatable)
|| ((h->dynindx != -1
|| h->forced_local)
- && ((flaginfo->info->shared
+ && ((flinfo->info->shared
&& (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|| h->root.type != bfd_link_hash_undefweak))
|| !h->forced_local)
- && elf_hash_table (flaginfo->info)->dynamic_sections_created))
+ && elf_hash_table (flinfo->info)->dynamic_sections_created))
{
if (! ((*bed->elf_backend_finish_dynamic_symbol)
- (flaginfo->output_bfd, flaginfo->info, h, &sym)))
+ (flinfo->output_bfd, flinfo->info, h, &sym)))
{
eoinfo->failed = TRUE;
return FALSE;
@@ -8874,7 +8876,7 @@ elf_link_output_extsym (struct bfd_hash_
/* If a non-weak symbol with non-default visibility is not defined
locally, it is a fatal error. */
- if (! flaginfo->info->relocatable
+ if (!flinfo->info->relocatable
&& ELF_ST_VISIBILITY (sym.st_other) != STV_DEFAULT
&& ELF_ST_BIND (sym.st_info) != STB_WEAK
&& h->root.type == bfd_link_hash_undefined
@@ -8888,7 +8890,7 @@ elf_link_output_extsym (struct bfd_hash_
msg = _("%B: internal symbol `%s' isn't defined");
else
msg = _("%B: hidden symbol `%s' isn't defined");
- (*_bfd_error_handler) (msg, flaginfo->output_bfd, h->root.root.string);
+ (*_bfd_error_handler) (msg, flinfo->output_bfd, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
eoinfo->failed = TRUE;
return FALSE;
@@ -8897,22 +8899,22 @@ elf_link_output_extsym (struct bfd_hash_
/* If this symbol should be put in the .dynsym section, then put it
there now. We already know the symbol index. We also fill in
the entry in the .hash section. */
- if (flaginfo->dynsym_sec != NULL
+ if (flinfo->dynsym_sec != NULL
&& h->dynindx != -1
- && elf_hash_table (flaginfo->info)->dynamic_sections_created)
+ && elf_hash_table (flinfo->info)->dynamic_sections_created)
{
bfd_byte *esym;
sym.st_name = h->dynstr_index;
- esym = flaginfo->dynsym_sec->contents + h->dynindx * bed->s->sizeof_sym;
- if (! check_dynsym (flaginfo->output_bfd, &sym))
+ esym = flinfo->dynsym_sec->contents + h->dynindx * bed->s->sizeof_sym;
+ if (!check_dynsym (flinfo->output_bfd, &sym))
{
eoinfo->failed = TRUE;
return FALSE;
}
- bed->s->swap_symbol_out (flaginfo->output_bfd, &sym, esym, 0);
+ bed->s->swap_symbol_out (flinfo->output_bfd, &sym, esym, 0);
- if (flaginfo->hash_sec != NULL)
+ if (flinfo->hash_sec != NULL)
{
size_t hash_entry_size;
bfd_byte *bucketpos;
@@ -8920,21 +8922,22 @@ elf_link_output_extsym (struct bfd_hash_
size_t bucketcount;
size_t bucket;
- bucketcount = elf_hash_table (flaginfo->info)->bucketcount;
+ bucketcount = elf_hash_table (flinfo->info)->bucketcount;
bucket = h->u.elf_hash_value % bucketcount;
hash_entry_size
- = elf_section_data (flaginfo->hash_sec)->this_hdr.sh_entsize;
- bucketpos = ((bfd_byte *) flaginfo->hash_sec->contents
+ = elf_section_data (flinfo->hash_sec)->this_hdr.sh_entsize;
+ bucketpos = ((bfd_byte *) flinfo->hash_sec->contents
+ (bucket + 2) * hash_entry_size);
- chain = bfd_get (8 * hash_entry_size, flaginfo->output_bfd, bucketpos);
- bfd_put (8 * hash_entry_size, flaginfo->output_bfd, h->dynindx, bucketpos);
- bfd_put (8 * hash_entry_size, flaginfo->output_bfd, chain,
- ((bfd_byte *) flaginfo->hash_sec->contents
+ chain = bfd_get (8 * hash_entry_size, flinfo->output_bfd, bucketpos);
+ bfd_put (8 * hash_entry_size, flinfo->output_bfd, h->dynindx,
+ bucketpos);
+ bfd_put (8 * hash_entry_size, flinfo->output_bfd, chain,
+ ((bfd_byte *) flinfo->hash_sec->contents
+ (bucketcount + 2 + h->dynindx) * hash_entry_size));
}
- if (flaginfo->symver_sec != NULL && flaginfo->symver_sec->contents != NULL)
+ if (flinfo->symver_sec != NULL && flinfo->symver_sec->contents != NULL)
{
Elf_Internal_Versym iversym;
Elf_External_Versym *eversym;
@@ -8952,16 +8955,16 @@ elf_link_output_extsym (struct bfd_hash_
iversym.vs_vers = 1;
else
iversym.vs_vers = h->verinfo.vertree->vernum + 1;
- if (flaginfo->info->create_default_symver)
+ if (flinfo->info->create_default_symver)
iversym.vs_vers++;
}
if (h->hidden)
iversym.vs_vers |= VERSYM_HIDDEN;
- eversym = (Elf_External_Versym *) flaginfo->symver_sec->contents;
+ eversym = (Elf_External_Versym *) flinfo->symver_sec->contents;
eversym += h->dynindx;
- _bfd_elf_swap_versym_out (flaginfo->output_bfd, &iversym, eversym);
+ _bfd_elf_swap_versym_out (flinfo->output_bfd, &iversym, eversym);
}
}
@@ -8970,8 +8973,8 @@ elf_link_output_extsym (struct bfd_hash_
if (strip || (input_sec->flags & SEC_EXCLUDE) != 0)
return TRUE;
- indx = bfd_get_symcount (flaginfo->output_bfd);
- ret = elf_link_output_sym (flaginfo, h->root.root.string, &sym, input_sec, h);
+ indx = bfd_get_symcount (flinfo->output_bfd);
+ ret = elf_link_output_sym (flinfo, h->root.root.string, &sym, input_sec, h);
if (ret == 0)
{
eoinfo->failed = TRUE;
@@ -9085,7 +9088,7 @@ _bfd_elf_check_kept_section (asection *s
don't have to keep them in memory. */
static bfd_boolean
-elf_link_input_bfd (struct elf_final_link_info *flaginfo, bfd *input_bfd)
+elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
{
int (*relocate_section)
(bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
@@ -9106,7 +9109,7 @@ elf_link_input_bfd (struct elf_final_lin
bfd_vma r_type_mask;
int r_sym_shift;
- output_bfd = flaginfo->output_bfd;
+ output_bfd = flinfo->output_bfd;
bed = get_elf_backend_data (output_bfd);
relocate_section = bed->elf_backend_relocate_section;
@@ -9133,9 +9136,9 @@ elf_link_input_bfd (struct elf_final_lin
if (isymbuf == NULL && locsymcount != 0)
{
isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, locsymcount, 0,
- flaginfo->internal_syms,
- flaginfo->external_syms,
- flaginfo->locsym_shndx);
+ flinfo->internal_syms,
+ flinfo->external_syms,
+ flinfo->locsym_shndx);
if (isymbuf == NULL)
return FALSE;
}
@@ -9144,7 +9147,7 @@ elf_link_input_bfd (struct elf_final_lin
SEC_MERGE sections. Write out those local symbols we know are
going into the output file. */
isymend = isymbuf + locsymcount;
- for (isym = isymbuf, pindex = flaginfo->indices, ppsection = flaginfo->sections;
+ for (isym = isymbuf, pindex = flinfo->indices, ppsection = flinfo->sections;
isym < isymend;
isym++, pindex++, ppsection++)
{
@@ -9192,7 +9195,7 @@ elf_link_input_bfd (struct elf_final_lin
*ppsection = isec;
/* Don't output the first, undefined, symbol. */
- if (ppsection == flaginfo->sections)
+ if (ppsection == flinfo->sections)
continue;
if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
@@ -9205,7 +9208,7 @@ elf_link_input_bfd (struct elf_final_lin
/* If we are stripping all symbols, we don't want to output this
one. */
- if (flaginfo->info->strip == strip_all)
+ if (flinfo->info->strip == strip_all)
continue;
/* If we are discarding all local symbols, we don't want to
@@ -9213,7 +9216,7 @@ elf_link_input_bfd (struct elf_final_lin
file, then some of the local symbols may be required by
relocs; we output them below as we discover that they are
needed. */
- if (flaginfo->info->discard == discard_all)
+ if (flinfo->info->discard == discard_all)
continue;
/* If this symbol is defined in a section which we are
@@ -9231,12 +9234,12 @@ elf_link_input_bfd (struct elf_final_lin
return FALSE;
/* See if we are discarding symbols with this name. */
- if ((flaginfo->info->strip == strip_some
- && (bfd_hash_lookup (flaginfo->info->keep_hash, name, FALSE, FALSE)
+ if ((flinfo->info->strip == strip_some
+ && (bfd_hash_lookup (flinfo->info->keep_hash, name, FALSE, FALSE)
== NULL))
- || (((flaginfo->info->discard == discard_sec_merge
- && (isec->flags & SEC_MERGE) && ! flaginfo->info->relocatable)
- || flaginfo->info->discard == discard_l)
+ || (((flinfo->info->discard == discard_sec_merge
+ && (isec->flags & SEC_MERGE) && !flinfo->info->relocatable)
+ || flinfo->info->discard == discard_l)
&& bfd_is_local_label_name (input_bfd, name)))
continue;
@@ -9256,19 +9259,19 @@ elf_link_input_bfd (struct elf_final_lin
output_section. Any special sections must be set up to meet
these requirements. */
osym.st_value += isec->output_offset;
- if (! flaginfo->info->relocatable)
+ if (!flinfo->info->relocatable)
{
osym.st_value += isec->output_section->vma;
if (ELF_ST_TYPE (osym.st_info) == STT_TLS)
{
/* STT_TLS symbols are relative to PT_TLS segment base. */
- BFD_ASSERT (elf_hash_table (flaginfo->info)->tls_sec != NULL);
- osym.st_value -= elf_hash_table (flaginfo->info)->tls_sec->vma;
+ BFD_ASSERT (elf_hash_table (flinfo->info)->tls_sec != NULL);
+ osym.st_value -= elf_hash_table (flinfo->info)->tls_sec->vma;
}
}
indx = bfd_get_symcount (output_bfd);
- ret = elf_link_output_sym (flaginfo, name, &osym, isec, NULL);
+ ret = elf_link_output_sym (flinfo, name, &osym, isec, NULL);
if (ret == 0)
return FALSE;
else if (ret == 1)
@@ -9300,7 +9303,7 @@ elf_link_input_bfd (struct elf_final_lin
continue;
}
- if (flaginfo->info->relocatable
+ if (flinfo->info->relocatable
&& (o->flags & (SEC_LINKER_CREATED | SEC_GROUP)) == SEC_GROUP)
{
/* Deal with the group signature symbol. */
@@ -9310,7 +9313,7 @@ elf_link_input_bfd (struct elf_final_lin
if (symndx >= locsymcount
|| (elf_bad_symtab (input_bfd)
- && flaginfo->sections[symndx] == NULL))
+ && flinfo->sections[symndx] == NULL))
{
struct elf_link_hash_entry *h = sym_hashes[symndx - extsymoff];
while (h->root.type == bfd_link_hash_indirect
@@ -9323,16 +9326,16 @@ elf_link_input_bfd (struct elf_final_lin
else if (ELF_ST_TYPE (isymbuf[symndx].st_info) == STT_SECTION)
{
/* We'll use the output section target_index. */
- asection *sec = flaginfo->sections[symndx]->output_section;
+ asection *sec = flinfo->sections[symndx]->output_section;
elf_section_data (osec)->this_hdr.sh_info = sec->target_index;
}
else
{
- if (flaginfo->indices[symndx] == -1)
+ if (flinfo->indices[symndx] == -1)
{
/* Otherwise output the local symbol now. */
Elf_Internal_Sym sym = isymbuf[symndx];
- asection *sec = flaginfo->sections[symndx]->output_section;
+ asection *sec = flinfo->sections[symndx]->output_section;
const char *name;
long indx;
int ret;
@@ -9351,16 +9354,16 @@ elf_link_input_bfd (struct elf_final_lin
sym.st_value += o->output_offset;
indx = bfd_get_symcount (output_bfd);
- ret = elf_link_output_sym (flaginfo, name, &sym, o, NULL);
+ ret = elf_link_output_sym (flinfo, name, &sym, o, NULL);
if (ret == 0)
return FALSE;
else if (ret == 1)
- flaginfo->indices[symndx] = indx;
+ flinfo->indices[symndx] = indx;
else
abort ();
}
elf_section_data (osec)->this_hdr.sh_info
- = flaginfo->indices[symndx];
+ = flinfo->indices[symndx];
}
}
@@ -9383,7 +9386,7 @@ elf_link_input_bfd (struct elf_final_lin
contents = elf_section_data (o)->this_hdr.contents;
else
{
- contents = flaginfo->contents;
+ contents = flinfo->contents;
if (! bfd_get_full_section_contents (input_bfd, o, &contents))
return FALSE;
}
@@ -9397,8 +9400,8 @@ elf_link_input_bfd (struct elf_final_lin
/* Get the swapped relocs. */
internal_relocs
- = _bfd_elf_link_read_relocs (input_bfd, o, flaginfo->external_relocs,
- flaginfo->internal_relocs, FALSE);
+ = _bfd_elf_link_read_relocs (input_bfd, o, flinfo->external_relocs,
+ flinfo->internal_relocs, FALSE);
if (internal_relocs == NULL
&& o->reloc_count > 0)
return FALSE;
@@ -9451,7 +9454,7 @@ elf_link_input_bfd (struct elf_final_lin
if (r_symndx >= locsymcount
|| (elf_bad_symtab (input_bfd)
- && flaginfo->sections[r_symndx] == NULL))
+ && flinfo->sections[r_symndx] == NULL))
{
h = sym_hashes[r_symndx - extsymoff];
@@ -9489,13 +9492,13 @@ elf_link_input_bfd (struct elf_final_lin
Elf_Internal_Sym *sym = isymbuf + r_symndx;
s_type = ELF_ST_TYPE (sym->st_info);
- ps = &flaginfo->sections[r_symndx];
+ ps = &flinfo->sections[r_symndx];
sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr,
sym, *ps);
}
if ((s_type == STT_RELC || s_type == STT_SRELC)
- && !flaginfo->info->relocatable)
+ && !flinfo->info->relocatable)
{
bfd_vma val;
bfd_vma dot = (rel->r_offset
@@ -9511,7 +9514,7 @@ elf_link_input_bfd (struct elf_final_lin
(unsigned long) rel->r_info,
(unsigned long) rel->r_offset);
#endif
- if (!eval_symbol (&val, &sym_name, input_bfd, flaginfo, dot,
+ if (!eval_symbol (&val, &sym_name, input_bfd, flinfo, dot,
isymbuf, locsymcount, s_type == STT_SRELC))
return FALSE;
@@ -9529,7 +9532,7 @@ elf_link_input_bfd (struct elf_final_lin
{
BFD_ASSERT (r_symndx != STN_UNDEF);
if (action_discarded & COMPLAIN)
- (*flaginfo->info->callbacks->einfo)
+ (*flinfo->info->callbacks->einfo)
(_("%X`%s' referenced in section `%A' of %B: "
"defined in discarded section `%A' of %B\n"),
sym_name, o, input_bfd, sec, sec->owner);
@@ -9545,7 +9548,7 @@ elf_link_input_bfd (struct elf_final_lin
asection *kept;
kept = _bfd_elf_check_kept_section (sec,
- flaginfo->info);
+ flinfo->info);
if (kept != NULL)
{
*ps = kept;
@@ -9576,17 +9579,17 @@ elf_link_input_bfd (struct elf_final_lin
corresponding to the output section, which will require
the addend to be adjusted. */
- ret = (*relocate_section) (output_bfd, flaginfo->info,
+ ret = (*relocate_section) (output_bfd, flinfo->info,
input_bfd, o, contents,
internal_relocs,
isymbuf,
- flaginfo->sections);
+ flinfo->sections);
if (!ret)
return FALSE;
if (ret == 2
- || flaginfo->info->relocatable
- || flaginfo->info->emitrelocations)
+ || flinfo->info->relocatable
+ || flinfo->info->emitrelocations)
{
Elf_Internal_Rela *irela;
Elf_Internal_Rela *irelaend, *irelamid;
@@ -9616,7 +9619,7 @@ elf_link_input_bfd (struct elf_final_lin
rel_hash_list = rel_hash;
rela_hash_list = NULL;
last_offset = o->output_offset;
- if (!flaginfo->info->relocatable)
+ if (!flinfo->info->relocatable)
last_offset += o->output_section->vma;
for (next_erel = 0; irela < irelaend; irela++, next_erel++)
{
@@ -9638,7 +9641,7 @@ elf_link_input_bfd (struct elf_final_lin
}
irela->r_offset = _bfd_elf_section_offset (output_bfd,
- flaginfo->info, o,
+ flinfo->info, o,
irela->r_offset);
if (irela->r_offset >= (bfd_vma) -2)
{
@@ -9656,7 +9659,7 @@ elf_link_input_bfd (struct elf_final_lin
irela->r_offset += o->output_offset;
/* Relocs in an executable have to be virtual addresses. */
- if (!flaginfo->info->relocatable)
+ if (!flinfo->info->relocatable)
irela->r_offset += o->output_section->vma;
last_offset = irela->r_offset;
@@ -9667,7 +9670,7 @@ elf_link_input_bfd (struct elf_final_lin
if (r_symndx >= locsymcount
|| (elf_bad_symtab (input_bfd)
- && flaginfo->sections[r_symndx] == NULL))
+ && flinfo->sections[r_symndx] == NULL))
{
struct elf_link_hash_entry *rh;
unsigned long indx;
@@ -9700,7 +9703,7 @@ elf_link_input_bfd (struct elf_final_lin
*rel_hash = NULL;
sym = isymbuf[r_symndx];
- sec = flaginfo->sections[r_symndx];
+ sec = flinfo->sections[r_symndx];
if (ELF_ST_TYPE (sym.st_info) == STT_SECTION)
{
/* I suppose the backend ought to fill in the
@@ -9753,14 +9756,14 @@ elf_link_input_bfd (struct elf_final_lin
}
else
{
- if (flaginfo->indices[r_symndx] == -1)
+ if (flinfo->indices[r_symndx] == -1)
{
unsigned long shlink;
const char *name;
asection *osec;
long indx;
- if (flaginfo->info->strip == strip_all)
+ if (flinfo->info->strip == strip_all)
{
/* You can't do ld -r -s. */
bfd_set_error (bfd_error_invalid_operation);
@@ -9784,32 +9787,32 @@ elf_link_input_bfd (struct elf_final_lin
return FALSE;
sym.st_value += sec->output_offset;
- if (! flaginfo->info->relocatable)
+ if (!flinfo->info->relocatable)
{
sym.st_value += osec->vma;
if (ELF_ST_TYPE (sym.st_info) == STT_TLS)
{
/* STT_TLS symbols are relative to PT_TLS
segment base. */
- BFD_ASSERT (elf_hash_table (flaginfo->info)
+ BFD_ASSERT (elf_hash_table (flinfo->info)
->tls_sec != NULL);
- sym.st_value -= (elf_hash_table (flaginfo->info)
+ sym.st_value -= (elf_hash_table (flinfo->info)
->tls_sec->vma);
}
}
indx = bfd_get_symcount (output_bfd);
- ret = elf_link_output_sym (flaginfo, name, &sym, sec,
+ ret = elf_link_output_sym (flinfo, name, &sym, sec,
NULL);
if (ret == 0)
return FALSE;
else if (ret == 1)
- flaginfo->indices[r_symndx] = indx;
+ flinfo->indices[r_symndx] = indx;
else
abort ();
}
- r_symndx = flaginfo->indices[r_symndx];
+ r_symndx = flinfo->indices[r_symndx];
}
irela->r_info = ((bfd_vma) r_symndx << r_sym_shift
@@ -9844,7 +9847,7 @@ elf_link_input_bfd (struct elf_final_lin
/* Write out the modified section contents. */
if (bed->elf_backend_write_section
- && (*bed->elf_backend_write_section) (output_bfd, flaginfo->info, o,
+ && (*bed->elf_backend_write_section) (output_bfd, flinfo->info, o,
contents))
{
/* Section written out. */
@@ -9854,7 +9857,7 @@ elf_link_input_bfd (struct elf_final_lin
case SEC_INFO_TYPE_STABS:
if (! (_bfd_write_section_stabs
(output_bfd,
- &elf_hash_table (flaginfo->info)->stab_info,
+ &elf_hash_table (flinfo->info)->stab_info,
o, &elf_section_data (o)->sec_info, contents)))
return FALSE;
break;
@@ -9865,7 +9868,7 @@ elf_link_input_bfd (struct elf_final_lin
break;
case SEC_INFO_TYPE_EH_FRAME:
{
- if (! _bfd_elf_write_section_eh_frame (output_bfd, flaginfo->info,
+ if (! _bfd_elf_write_section_eh_frame (output_bfd, flinfo->info,
o, contents))
return FALSE;
}
@@ -10242,7 +10245,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
bfd_boolean dynamic;
bfd_boolean emit_relocs;
bfd *dynobj;
- struct elf_final_link_info flaginfo;
+ struct elf_final_link_info flinfo;
asection *o;
struct bfd_link_order *p;
bfd *sub;
@@ -10279,39 +10282,39 @@ bfd_elf_final_link (bfd *abfd, struct bf
emit_relocs = (info->relocatable
|| info->emitrelocations);
- flaginfo.info = info;
- flaginfo.output_bfd = abfd;
- flaginfo.symstrtab = _bfd_elf_stringtab_init ();
- if (flaginfo.symstrtab == NULL)
+ flinfo.info = info;
+ flinfo.output_bfd = abfd;
+ flinfo.symstrtab = _bfd_elf_stringtab_init ();
+ if (flinfo.symstrtab == NULL)
return FALSE;
if (! dynamic)
{
- flaginfo.dynsym_sec = NULL;
- flaginfo.hash_sec = NULL;
- flaginfo.symver_sec = NULL;
+ flinfo.dynsym_sec = NULL;
+ flinfo.hash_sec = NULL;
+ flinfo.symver_sec = NULL;
}
else
{
- flaginfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
- flaginfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
+ flinfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
+ flinfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
/* Note that dynsym_sec can be NULL (on VMS). */
- flaginfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
+ flinfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
/* Note that it is OK if symver_sec is NULL. */
}
- flaginfo.contents = NULL;
- flaginfo.external_relocs = NULL;
- flaginfo.internal_relocs = NULL;
- flaginfo.external_syms = NULL;
- flaginfo.locsym_shndx = NULL;
- flaginfo.internal_syms = NULL;
- flaginfo.indices = NULL;
- flaginfo.sections = NULL;
- flaginfo.symbuf = NULL;
- flaginfo.symshndxbuf = NULL;
- flaginfo.symbuf_count = 0;
- flaginfo.shndxbuf_size = 0;
+ flinfo.contents = NULL;
+ flinfo.external_relocs = NULL;
+ flinfo.internal_relocs = NULL;
+ flinfo.external_syms = NULL;
+ flinfo.locsym_shndx = NULL;
+ flinfo.internal_syms = NULL;
+ flinfo.indices = NULL;
+ flinfo.sections = NULL;
+ flinfo.symbuf = NULL;
+ flinfo.symshndxbuf = NULL;
+ flinfo.symbuf_count = 0;
+ flinfo.shndxbuf_size = 0;
/* The object attributes have been merged. Remove the input
sections from the link, and set the contents of the output
@@ -10539,22 +10542,22 @@ bfd_elf_final_link (bfd *abfd, struct bf
/* Allocate a buffer to hold swapped out symbols. This is to avoid
continuously seeking to the right position in the file. */
if (! info->keep_memory || max_sym_count < 20)
- flaginfo.symbuf_size = 20;
+ flinfo.symbuf_size = 20;
else
- flaginfo.symbuf_size = max_sym_count;
- amt = flaginfo.symbuf_size;
+ flinfo.symbuf_size = max_sym_count;
+ amt = flinfo.symbuf_size;
amt *= bed->s->sizeof_sym;
- flaginfo.symbuf = (bfd_byte *) bfd_malloc (amt);
- if (flaginfo.symbuf == NULL)
+ flinfo.symbuf = (bfd_byte *) bfd_malloc (amt);
+ if (flinfo.symbuf == NULL)
goto error_return;
if (elf_numsections (abfd) > (SHN_LORESERVE & 0xFFFF))
{
/* Wild guess at number of output symbols. realloc'd as needed. */
amt = 2 * max_sym_count + elf_numsections (abfd) + 1000;
- flaginfo.shndxbuf_size = amt;
+ flinfo.shndxbuf_size = amt;
amt *= sizeof (Elf_External_Sym_Shndx);
- flaginfo.symshndxbuf = (Elf_External_Sym_Shndx *) bfd_zmalloc (amt);
- if (flaginfo.symshndxbuf == NULL)
+ flinfo.symshndxbuf = (Elf_External_Sym_Shndx *) bfd_zmalloc (amt);
+ if (flinfo.symshndxbuf == NULL)
goto error_return;
}
@@ -10569,7 +10572,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
elfsym.st_other = 0;
elfsym.st_shndx = SHN_UNDEF;
elfsym.st_target_internal = 0;
- if (elf_link_output_sym (&flaginfo, NULL, &elfsym, bfd_und_section_ptr,
+ if (elf_link_output_sym (&flinfo, NULL, &elfsym, bfd_und_section_ptr,
NULL) != 1)
goto error_return;
}
@@ -10596,7 +10599,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
elfsym.st_shndx = i;
if (!info->relocatable)
elfsym.st_value = o->vma;
- if (elf_link_output_sym (&flaginfo, NULL, &elfsym, o, NULL) != 1)
+ if (elf_link_output_sym (&flinfo, NULL, &elfsym, o, NULL) != 1)
goto error_return;
}
}
@@ -10606,15 +10609,15 @@ bfd_elf_final_link (bfd *abfd, struct bf
files. */
if (max_contents_size != 0)
{
- flaginfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
- if (flaginfo.contents == NULL)
+ flinfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
+ if (flinfo.contents == NULL)
goto error_return;
}
if (max_external_reloc_size != 0)
{
- flaginfo.external_relocs = bfd_malloc (max_external_reloc_size);
- if (flaginfo.external_relocs == NULL)
+ flinfo.external_relocs = bfd_malloc (max_external_reloc_size);
+ if (flinfo.external_relocs == NULL)
goto error_return;
}
@@ -10622,39 +10625,39 @@ bfd_elf_final_link (bfd *abfd, struct bf
{
amt = max_internal_reloc_count * bed->s->int_rels_per_ext_rel;
amt *= sizeof (Elf_Internal_Rela);
- flaginfo.internal_relocs = (Elf_Internal_Rela *) bfd_malloc (amt);
- if (flaginfo.internal_relocs == NULL)
+ flinfo.internal_relocs = (Elf_Internal_Rela *) bfd_malloc (amt);
+ if (flinfo.internal_relocs == NULL)
goto error_return;
}
if (max_sym_count != 0)
{
amt = max_sym_count * bed->s->sizeof_sym;
- flaginfo.external_syms = (bfd_byte *) bfd_malloc (amt);
- if (flaginfo.external_syms == NULL)
+ flinfo.external_syms = (bfd_byte *) bfd_malloc (amt);
+ if (flinfo.external_syms == NULL)
goto error_return;
amt = max_sym_count * sizeof (Elf_Internal_Sym);
- flaginfo.internal_syms = (Elf_Internal_Sym *) bfd_malloc (amt);
- if (flaginfo.internal_syms == NULL)
+ flinfo.internal_syms = (Elf_Internal_Sym *) bfd_malloc (amt);
+ if (flinfo.internal_syms == NULL)
goto error_return;
amt = max_sym_count * sizeof (long);
- flaginfo.indices = (long int *) bfd_malloc (amt);
- if (flaginfo.indices == NULL)
+ flinfo.indices = (long int *) bfd_malloc (amt);
+ if (flinfo.indices == NULL)
goto error_return;
amt = max_sym_count * sizeof (asection *);
- flaginfo.sections = (asection **) bfd_malloc (amt);
- if (flaginfo.sections == NULL)
+ flinfo.sections = (asection **) bfd_malloc (amt);
+ if (flinfo.sections == NULL)
goto error_return;
}
if (max_sym_shndx_count != 0)
{
amt = max_sym_shndx_count * sizeof (Elf_External_Sym_Shndx);
- flaginfo.locsym_shndx = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
- if (flaginfo.locsym_shndx == NULL)
+ flinfo.locsym_shndx = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
+ if (flinfo.locsym_shndx == NULL)
goto error_return;
}
@@ -10728,7 +10731,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
{
if (! sub->output_has_begun)
{
- if (! elf_link_input_bfd (&flaginfo, sub))
+ if (! elf_link_input_bfd (&flinfo, sub))
goto error_return;
sub->output_has_begun = TRUE;
}
@@ -10793,7 +10796,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
some global symbols were, in fact, converted to become local.
FIXME: Will this work correctly with the Irix 5 linker? */
eoinfo.failed = FALSE;
- eoinfo.flaginfo = &flaginfo;
+ eoinfo.flinfo = &flinfo;
eoinfo.localsyms = TRUE;
bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
if (eoinfo.failed)
@@ -10808,7 +10811,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
struct elf_link_hash_entry *);
if (! ((*bed->elf_backend_output_arch_local_syms)
- (abfd, info, &flaginfo, (out_sym_func) elf_link_output_sym)))
+ (abfd, info, &flinfo, (out_sym_func) elf_link_output_sym)))
return FALSE;
}
@@ -10821,11 +10824,11 @@ bfd_elf_final_link (bfd *abfd, struct bf
symtab_hdr->sh_info = bfd_get_symcount (abfd);
if (dynamic
- && flaginfo.dynsym_sec != NULL
- && flaginfo.dynsym_sec->output_section != bfd_abs_section_ptr)
+ && flinfo.dynsym_sec != NULL
+ && flinfo.dynsym_sec->output_section != bfd_abs_section_ptr)
{
Elf_Internal_Sym sym;
- bfd_byte *dynsym = flaginfo.dynsym_sec->contents;
+ bfd_byte *dynsym = flinfo.dynsym_sec->contents;
long last_local = 0;
/* Write out the section symbols for the output sections. */
@@ -10897,14 +10900,14 @@ bfd_elf_final_link (bfd *abfd, struct bf
}
}
- elf_section_data (flaginfo.dynsym_sec->output_section)->this_hdr.sh_info =
+ elf_section_data (flinfo.dynsym_sec->output_section)->this_hdr.sh_info =
last_local + 1;
}
/* We get the global symbols from the hash table. */
eoinfo.failed = FALSE;
eoinfo.localsyms = FALSE;
- eoinfo.flaginfo = &flaginfo;
+ eoinfo.flinfo = &flinfo;
bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
if (eoinfo.failed)
return FALSE;
@@ -10918,12 +10921,12 @@ bfd_elf_final_link (bfd *abfd, struct bf
struct elf_link_hash_entry *);
if (! ((*bed->elf_backend_output_arch_syms)
- (abfd, info, &flaginfo, (out_sym_func) elf_link_output_sym)))
+ (abfd, info, &flinfo, (out_sym_func) elf_link_output_sym)))
return FALSE;
}
/* Flush all symbols to the file. */
- if (! elf_link_flush_output_syms (&flaginfo, bed))
+ if (! elf_link_flush_output_syms (&flinfo, bed))
return FALSE;
/* Now we know the size of the symtab section. */
@@ -10942,7 +10945,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
off, TRUE);
if (bfd_seek (abfd, symtab_shndx_hdr->sh_offset, SEEK_SET) != 0
- || (bfd_bwrite (flaginfo.symshndxbuf, amt, abfd) != amt))
+ || (bfd_bwrite (flinfo.symshndxbuf, amt, abfd) != amt))
return FALSE;
}
@@ -10954,7 +10957,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
symstrtab_hdr->sh_type = SHT_STRTAB;
symstrtab_hdr->sh_flags = 0;
symstrtab_hdr->sh_addr = 0;
- symstrtab_hdr->sh_size = _bfd_stringtab_size (flaginfo.symstrtab);
+ symstrtab_hdr->sh_size = _bfd_stringtab_size (flinfo.symstrtab);
symstrtab_hdr->sh_entsize = 0;
symstrtab_hdr->sh_link = 0;
symstrtab_hdr->sh_info = 0;
@@ -10967,7 +10970,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
if (bfd_get_symcount (abfd) > 0)
{
if (bfd_seek (abfd, symstrtab_hdr->sh_offset, SEEK_SET) != 0
- || ! _bfd_stringtab_emit (abfd, flaginfo.symstrtab))
+ || ! _bfd_stringtab_emit (abfd, flinfo.symstrtab))
return FALSE;
}
@@ -11261,28 +11264,28 @@ bfd_elf_final_link (bfd *abfd, struct bf
goto error_return;
}
- if (flaginfo.symstrtab != NULL)
- _bfd_stringtab_free (flaginfo.symstrtab);
- if (flaginfo.contents != NULL)
- free (flaginfo.contents);
- if (flaginfo.external_relocs != NULL)
- free (flaginfo.external_relocs);
- if (flaginfo.internal_relocs != NULL)
- free (flaginfo.internal_relocs);
- if (flaginfo.external_syms != NULL)
- free (flaginfo.external_syms);
- if (flaginfo.locsym_shndx != NULL)
- free (flaginfo.locsym_shndx);
- if (flaginfo.internal_syms != NULL)
- free (flaginfo.internal_syms);
- if (flaginfo.indices != NULL)
- free (flaginfo.indices);
- if (flaginfo.sections != NULL)
- free (flaginfo.sections);
- if (flaginfo.symbuf != NULL)
- free (flaginfo.symbuf);
- if (flaginfo.symshndxbuf != NULL)
- free (flaginfo.symshndxbuf);
+ if (flinfo.symstrtab != NULL)
+ _bfd_stringtab_free (flinfo.symstrtab);
+ if (flinfo.contents != NULL)
+ free (flinfo.contents);
+ if (flinfo.external_relocs != NULL)
+ free (flinfo.external_relocs);
+ if (flinfo.internal_relocs != NULL)
+ free (flinfo.internal_relocs);
+ if (flinfo.external_syms != NULL)
+ free (flinfo.external_syms);
+ if (flinfo.locsym_shndx != NULL)
+ free (flinfo.locsym_shndx);
+ if (flinfo.internal_syms != NULL)
+ free (flinfo.internal_syms);
+ if (flinfo.indices != NULL)
+ free (flinfo.indices);
+ if (flinfo.sections != NULL)
+ free (flinfo.sections);
+ if (flinfo.symbuf != NULL)
+ free (flinfo.symbuf);
+ if (flinfo.symshndxbuf != NULL)
+ free (flinfo.symshndxbuf);
for (o = abfd->sections; o != NULL; o = o->next)
{
struct bfd_elf_section_data *esdo = elf_section_data (o);
@@ -11307,28 +11310,28 @@ bfd_elf_final_link (bfd *abfd, struct bf
return TRUE;
error_return:
- if (flaginfo.symstrtab != NULL)
- _bfd_stringtab_free (flaginfo.symstrtab);
- if (flaginfo.contents != NULL)
- free (flaginfo.contents);
- if (flaginfo.external_relocs != NULL)
- free (flaginfo.external_relocs);
- if (flaginfo.internal_relocs != NULL)
- free (flaginfo.internal_relocs);
- if (flaginfo.external_syms != NULL)
- free (flaginfo.external_syms);
- if (flaginfo.locsym_shndx != NULL)
- free (flaginfo.locsym_shndx);
- if (flaginfo.internal_syms != NULL)
- free (flaginfo.internal_syms);
- if (flaginfo.indices != NULL)
- free (flaginfo.indices);
- if (flaginfo.sections != NULL)
- free (flaginfo.sections);
- if (flaginfo.symbuf != NULL)
- free (flaginfo.symbuf);
- if (flaginfo.symshndxbuf != NULL)
- free (flaginfo.symshndxbuf);
+ if (flinfo.symstrtab != NULL)
+ _bfd_stringtab_free (flinfo.symstrtab);
+ if (flinfo.contents != NULL)
+ free (flinfo.contents);
+ if (flinfo.external_relocs != NULL)
+ free (flinfo.external_relocs);
+ if (flinfo.internal_relocs != NULL)
+ free (flinfo.internal_relocs);
+ if (flinfo.external_syms != NULL)
+ free (flinfo.external_syms);
+ if (flinfo.locsym_shndx != NULL)
+ free (flinfo.locsym_shndx);
+ if (flinfo.internal_syms != NULL)
+ free (flinfo.internal_syms);
+ if (flinfo.indices != NULL)
+ free (flinfo.indices);
+ if (flinfo.sections != NULL)
+ free (flinfo.sections);
+ if (flinfo.symbuf != NULL)
+ free (flinfo.symbuf);
+ if (flinfo.symshndxbuf != NULL)
+ free (flinfo.symshndxbuf);
for (o = abfd->sections; o != NULL; o = o->next)
{
struct bfd_elf_section_data *esdo = elf_section_data (o);
@@ -12223,27 +12226,28 @@ static elf_flags_to_name_table elf_flags
/* Returns TRUE if the section is to be included, otherwise FALSE. */
bfd_boolean
bfd_elf_lookup_section_flags (struct bfd_link_info *info,
- struct flag_info *finfo,
+ struct flag_info *flaginfo,
asection *section)
{
- const bfd_vma sh_flags = elf_section_flags(section);
+ const bfd_vma sh_flags = elf_section_flags (section);
- if (finfo->flags_initialized == FALSE)
+ if (!flaginfo->flags_initialized)
{
- const struct elf_backend_data *bed =
- get_elf_backend_data (info->output_bfd);
- struct flag_info_list *tf = finfo->flag_list;
+ bfd *obfd = info->output_bfd;
+ const struct elf_backend_data *bed = get_elf_backend_data (obfd);
+ struct flag_info_list *tf = flaginfo->flag_list;
int with_hex = 0;
int without_hex = 0;
- for (tf = finfo->flag_list; tf != NULL; tf = tf->next)
+ for (tf = flaginfo->flag_list; tf != NULL; tf = tf->next)
{
unsigned i;
+ flagword (*lookup) (char *);
- if (bed->elf_backend_lookup_section_flags_hook)
+ lookup = bed->elf_backend_lookup_section_flags_hook;
+ if (lookup != NULL)
{
- flagword hexval =
- (*bed->elf_backend_lookup_section_flags_hook) ((char*)tf->name);
+ flagword hexval = (*lookup) ((char *) tf->name);
if (hexval != 0)
{
@@ -12255,11 +12259,9 @@ bfd_elf_lookup_section_flags (struct bfd
continue;
}
}
- for (i = 0;
- i < sizeof(elf_flags_to_names) / sizeof(elf_flags_to_name_table);
- ++i)
+ for (i = 0; i < ARRAY_SIZE (elf_flags_to_names); ++i)
{
- if (!strcmp (tf->name, elf_flags_to_names[i].flag_name))
+ if (strcmp (tf->name, elf_flags_to_names[i].flag_name) == 0)
{
if (tf->with == with_flags)
with_hex |= elf_flags_to_names[i].flag_value;
@@ -12269,32 +12271,22 @@ bfd_elf_lookup_section_flags (struct bfd
break;
}
}
- if (tf->valid == FALSE)
+ if (!tf->valid)
{
info->callbacks->einfo
- (_("Unrecognized INPUT_SECTION_FLAG %s\n"), tf->name);
+ (_("Unrecognized INPUT_SECTION_FLAG %s\n"), tf->name);
return FALSE;
}
}
- finfo->flags_initialized = TRUE;
- finfo->only_with_flags |= with_hex;
- finfo->not_with_flags |= without_hex;
+ flaginfo->flags_initialized = TRUE;
+ flaginfo->only_with_flags |= with_hex;
+ flaginfo->not_with_flags |= without_hex;
}
- if (finfo->only_with_flags != 0
- && finfo->not_with_flags != 0
- && ((finfo->not_with_flags & sh_flags) != 0
- || (finfo->only_with_flags & sh_flags)
- != finfo->only_with_flags))
+ if ((flaginfo->only_with_flags & sh_flags) != flaginfo->only_with_flags)
return FALSE;
- if (finfo->only_with_flags != 0
- && (finfo->only_with_flags & sh_flags)
- != finfo->only_with_flags)
- return FALSE;
-
- if (finfo->not_with_flags != 0
- && (finfo->not_with_flags & sh_flags) != 0)
+ if ((flaginfo->not_with_flags & sh_flags) != 0)
return FALSE;
return TRUE;
--
Alan Modra
Australia Development Lab, IBM