diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2015-07-27 15:09:08 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2015-08-18 19:24:41 -0700 |
| commit | b45e00b3ed40589af75b8a36a67905ae265a20f8 (patch) | |
| tree | b9b7e0b810d2cc3327cb743f14f3241e173b0d5c /gold/symtab.h | |
| parent | e49433d22dae92a56ae15a8b5742cbf1f31d5fd1 (diff) | |
| download | fsf-binutils-gdb-b45e00b3ed40589af75b8a36a67905ae265a20f8.zip fsf-binutils-gdb-b45e00b3ed40589af75b8a36a67905ae265a20f8.tar.gz fsf-binutils-gdb-b45e00b3ed40589af75b8a36a67905ae265a20f8.tar.bz2 | |
Fix symbol versioning problems in PR 18703.
If a symbol is defined with ".symver foo,foo@VER", the assembler
creates two symbols in the object: one unversioned, and one with
the (non-default) version "VER". If foo is listed in a version
script, gold would then make the first of those symbols the
default version, and would ignore the second symbol as a
duplicate, without making it a non-default version. While this is
arguably reasonable behavior, it doesn't match Gnu ld behavior,
so this patch fixes that by allowing the second definition to
override the first by resetting the "default version" indication.
Several test cases from the Gnu ld testsuite also exposed another
related problem, where a symbol defined with ".symver foo,foo@",
placed into a shared library, is not handled properly by gold.
This patch also fixes that case, binding the symbol to the base
version.
gold/
PR gold/18703
* dynobj.cc (Versions::record_version): Handle symbol defined with
base version.
(Versions::symbol_section_contents): Likewise.
* symtab.h (Symbol::set_is_not_default): New class method.
(Symbol_table::resolve): Add is_default_version parameter.
(Symbol_table::should_override): Likewise.
* resolve.cc (Symbol_table::resolve): Add is_default_version parameter,
and pass to should_override. Adjust all callers and explicit
instantiations.
(Symbol_table::should_override): Add is_default_value parameter;
allow default version in a dynamic object to override existing
definition from same object.
* symtab.cc (Symbol_table::add_from_object): Handle case where same
symbol is defined as unversioned and non-default version in the same
object.
* testsuite/Makefile.am (ver_test_13): New test case.
* testsuite/Makefile.in: Regenerate.
* testsuite/ver_test_4.cc: Add test for symbol with base version.
* testsuite/ver_test_4.sh: Likewise.
* testsuite/ver_test_13.c: New source file.
* testsuite/ver_test_13.script: New version script.
* testsuite/ver_test_13.sh: New test case.
Diffstat (limited to 'gold/symtab.h')
| -rw-r--r-- | gold/symtab.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gold/symtab.h b/gold/symtab.h index 2c9aa32..1a1f1c7 100644 --- a/gold/symtab.h +++ b/gold/symtab.h @@ -140,6 +140,11 @@ class Symbol set_is_default() { this->is_def_ = true; } + // Set that this version is not the default for this symbol name. + void + set_is_not_default() + { this->is_def_ = false; } + // Return the symbol's name as name@version (or name@@version). std::string versioned_name() const; @@ -1706,7 +1711,8 @@ class Symbol_table const elfcpp::Sym<size, big_endian>& sym, unsigned int st_shndx, bool is_ordinary, unsigned int orig_st_shndx, - Object*, const char* version); + Object*, const char* version, + bool is_default_version); template<int size, bool big_endian> void @@ -1725,7 +1731,7 @@ class Symbol_table // resolve.cc. static bool should_override(const Symbol*, unsigned int, elfcpp::STT, Defined, - Object*, bool*, bool*); + Object*, bool*, bool*, bool); // Report a problem in symbol resolution. static void |