diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2003-03-29 01:26:33 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2003-03-29 01:26:33 +0000 |
| commit | 5941afc1054ede37b6d8981269b8fe4519458eac (patch) | |
| tree | 01a8d20c19b8dd0161326a942b96399e2f39b7d8 /bfd | |
| parent | 962a53d175c625b39183f6d6a2780b65434c6298 (diff) | |
| download | gdb-5941afc1054ede37b6d8981269b8fe4519458eac.zip gdb-5941afc1054ede37b6d8981269b8fe4519458eac.tar.gz gdb-5941afc1054ede37b6d8981269b8fe4519458eac.tar.bz2 | |
2003-03-28 H.J. Lu <hjl@gnu.org>
* elflink.h (elf_link_add_object_symbols): Correctly combine
visibilities.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elflink.h | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9079137..5d387c0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2003-03-28 H.J. Lu <hjl@gnu.org> + + * elflink.h (elf_link_add_object_symbols): Correctly combine + visibilities. + 2003-03-27 Jakub Jelinek <jakub@redhat.com> * elfxx-ia64.c (elfNN_ia64_relax_section): Reset self_dtpmod_offset diff --git a/bfd/elflink.h b/bfd/elflink.h index c39120d..3af34ee 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -1940,7 +1940,7 @@ elf_link_add_object_symbols (abfd, info) might be needed here. */ if (isym->st_other != 0) { - unsigned char hvis, symvis, other; + unsigned char hvis, symvis, other, nvis; /* Take the balance of OTHER from the definition. */ other = (definition ? isym->st_other : h->other); @@ -1949,8 +1949,14 @@ elf_link_add_object_symbols (abfd, info) /* 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 | (hvis > symvis ? hvis : symvis); + h->other = other | nvis; } /* Set a flag in the hash table entry indicating the type of |