espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-24 20:28:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

tidy elf_merge_st_other

Browse Source 
So that we munge isym->st_other once per symbol.

	* elflink.c (elf_merge_st_other): Update comments.  Simplify
	visibility handling.  Make isym const.  Move code modifying
	isym->st_other for --exclude-libs to..
	(elf_link_add_object_symbols): ..here.
This commit is contained in:
Alan Modra
2014-07-09 14:53:00 +09:30
parent 98d4551685
commit cd3416da32
2 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2014-07-15 Alan Modra <amodra@gmail.com>
* elflink.c (elf_merge_st_other): Update comments. Simplify
visibility handling. Make isym const. Move code modifying
isym->st_other for --exclude-libs to..
(elf_link_add_object_symbols): ..here.
2014-07-11 Maks Naumov <maksqwe1@ukr.net> 2014-07-11 Maks Naumov <maksqwe1@ukr.net>
PR 17141 PR 17141

51
bfd/elflink.c
View File

@ -851,47 +851,26 @@ _bfd_elf_link_renumber_dynsyms (bfd *output_bfd,
static void static void
elf_merge_st_other (bfd *abfd, struct elf_link_hash_entry *h, elf_merge_st_other (bfd *abfd, struct elf_link_hash_entry *h,
Elf_Internal_Sym *isym, bfd_boolean definition, const Elf_Internal_Sym *isym,
bfd_boolean dynamic) bfd_boolean definition, bfd_boolean dynamic)
{ {
const struct elf_backend_data *bed = get_elf_backend_data (abfd); const struct elf_backend_data *bed = get_elf_backend_data (abfd);
/* If st_other has a processor-specific meaning, specific /* If st_other has a processor-specific meaning, specific
code might be needed here. We never merge the visibility code might be needed here. */
attribute with the one from a dynamic object. */
if (bed->elf_backend_merge_symbol_attribute) if (bed->elf_backend_merge_symbol_attribute)
(*bed->elf_backend_merge_symbol_attribute) (h, isym, definition, (*bed->elf_backend_merge_symbol_attribute) (h, isym, definition,
dynamic); dynamic);
/* If this symbol has default visibility and the user has requested if (!dynamic)
we not re-export it, then mark it as hidden. */
if (definition
&& !dynamic
&& (abfd->no_export
|| (abfd->my_archive && abfd->my_archive->no_export))
&& ELF_ST_VISIBILITY (isym->st_other) != STV_INTERNAL)
isym->st_other = (STV_HIDDEN
| (isym->st_other & ~ELF_ST_VISIBILITY (-1)));
if (!dynamic && ELF_ST_VISIBILITY (isym->st_other) != 0)
{ {
unsigned char hvis, symvis, other, nvis; unsigned symvis = ELF_ST_VISIBILITY (isym->st_other);
unsigned hvis = ELF_ST_VISIBILITY (h->other);
/* Only merge the visibility. Leave the remainder of the /* Keep the most constraining visibility. Leave the remainder
st_other field to elf_backend_merge_symbol_attribute. */ of the st_other field to elf_backend_merge_symbol_attribute. */
other = h->other & ~ELF_ST_VISIBILITY (-1); if (symvis - 1 < hvis - 1)
h->other = symvis | (h->other & ~ELF_ST_VISIBILITY (-1));
/* Combine visibilities, using the most constraining one. */
hvis = ELF_ST_VISIBILITY (h->other);
symvis = ELF_ST_VISIBILITY (isym->st_other);
if (! hvis)
nvis = symvis;
else if (! symvis)
nvis = hvis;
else
nvis = hvis < symvis ? hvis : symvis;
h->other = other | nvis;
} }
} }
@ -4095,6 +4074,16 @@ error_free_dyn:
name = newname; name = newname;
} }
/* If this symbol has default visibility and the user has
requested we not re-export it, then mark it as hidden. */
if (definition
&& !dynamic
&& (abfd->no_export
|| (abfd->my_archive && abfd->my_archive->no_export))
&& ELF_ST_VISIBILITY (isym->st_other) != STV_INTERNAL)
isym->st_other = (STV_HIDDEN
| (isym->st_other & ~ELF_ST_VISIBILITY (-1)));
if (!_bfd_elf_merge_symbol (abfd, info, name, isym, &sec, &value, if (!_bfd_elf_merge_symbol (abfd, info, name, isym, &sec, &value,
sym_hash, &old_bfd, &old_weak, sym_hash, &old_bfd, &old_weak,
&old_alignment, &skip, &override, &old_alignment, &skip, &override,