diff options
| author | Andrew Cagney <cagney@redhat.com> | 2003-03-30 16:35:25 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2003-03-30 16:35:25 +0000 |
| commit | 05f7ef10ba27bf1423e650c263c31443c1344f12 (patch) | |
| tree | be60050d6fca27e934892378cf67380d22655522 /bfd/elflink.h | |
| parent | d355127720dea14eef250e2e2c3db273d97f0c0c (diff) | |
| download | binutils-cagney_framebase-20030326-branch.zip binutils-cagney_framebase-20030326-branch.tar.gz binutils-cagney_framebase-20030326-branch.tar.bz2 | |
Merge with mainline.cagney_framebase-20030326-branch
Diffstat (limited to 'bfd/elflink.h')
| -rw-r--r-- | bfd/elflink.h | 10 |
1 files changed, 8 insertions, 2 deletions
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 |