diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2018-04-23 09:27:35 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2018-04-24 13:51:24 -0700 |
| commit | 890d155592e66dc01fc4a9affba806c4e9fc36ba (patch) | |
| tree | 0ccfa6f963c937ec8f5648ecb9d401ae676c0778 /gold/dynobj.cc | |
| parent | f67c0c9171508672167b6868c67211571421a1c6 (diff) | |
| download | gdb-890d155592e66dc01fc4a9affba806c4e9fc36ba.zip gdb-890d155592e66dc01fc4a9affba806c4e9fc36ba.tar.gz gdb-890d155592e66dc01fc4a9affba806c4e9fc36ba.tar.bz2 | |
Fix internal error caused by conflicting default version definitions.
gold/
PR gold/16504
* dynobj.cc (Versions::symbol_section_contents): Don't set
VERSYM_HIDDEN flag for undefined symbols.
* symtab.cc (Symbol_table::add_from_object): Don't override default
version definition with a different default version.
* symtab.h (Symbol::from_dyn): New method.
* testsuite/plugin_test.c (struct sym_info): Add ver field.
(claim_file_hook): Pass symbol version to plugin API.
(parse_readelf_line): Parse symbol version.
* testsuite/Makefile.am (ver_test_pr16504): New test case.
* testsuite/Makefile.in: Regenerate.
* testsuite/ver_test_pr16504.sh: New test script.
* testsuite/ver_test_pr16504_a.c: New source file.
* testsuite/ver_test_pr16504_a.script: New version script.
* testsuite/ver_test_pr16504_b.c: New source file.
* testsuite/ver_test_pr16504_b.script: New version script.
Diffstat (limited to 'gold/dynobj.cc')
| -rw-r--r-- | gold/dynobj.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gold/dynobj.cc b/gold/dynobj.cc index d85adbc..7012802 100644 --- a/gold/dynobj.cc +++ b/gold/dynobj.cc @@ -1776,7 +1776,10 @@ Versions::symbol_section_contents(const Symbol_table* symtab, version_index = this->version_index(symtab, dynpool, *p); // If the symbol was defined as foo@V1 instead of foo@@V1, add // the hidden bit. - if ((*p)->version() != NULL && !(*p)->is_default()) + if ((*p)->version() != NULL + && (*p)->is_defined() + && !(*p)->is_default() + && !(*p)->from_dyn()) version_index |= elfcpp::VERSYM_HIDDEN; elfcpp::Swap<16, big_endian>::writeval(pbuf + (*p)->dynsym_index() * 2, version_index); |