diff options
| author | Cary Coutant <ccoutant@google.com> | 2014-04-02 14:21:14 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2014-05-02 16:33:43 -0700 |
| commit | d1bddd3c4b9c17736bf6c59aa336670a589ca844 (patch) | |
| tree | 22accc61c3d63aa3cf79facc32915548d0ad9c69 /gold/resolve.cc | |
| parent | 30a1e6cc7750ce016ea70afa795c0764d07d21ae (diff) | |
| download | binutils-d1bddd3c4b9c17736bf6c59aa336670a589ca844.zip binutils-d1bddd3c4b9c17736bf6c59aa336670a589ca844.tar.gz binutils-d1bddd3c4b9c17736bf6c59aa336670a589ca844.tar.bz2 | |
Fix handling of __ehdr_start when it cannot be defined.
2014-05-02 Cary Coutant <ccoutant@google.com>
* defstd.cc (in_segment): Define __ehdr_start here...
* layout.cc (Layout::finalize): ...Instead of here. Set the
output segment when known.
* resolve.cc (Symbol::override_base_with_special): Remember
the original binding.
* symtab.cc (Symbol::set_output_segment): New function.
(Symbol::set_undefined): New function.
* symtab.h (Symbol::is_weak_undefined): Check original undef
binding.
(Symbol::is_strong_undefined): New function.
(Symbol::set_output_segment): New function.
(Symbol::set_undefined): New function.
* target-reloc.h (is_strong_undefined): Remove.
(issue_undefined_symbol_error): Call Symbol::is_weak_undefined.
Check for hidden undefs.
(relocate_section): Call Symbol::is_strong_undefined.
* testsuite/Makefile.am (ehdr_start_test_1)
(ehdr_start_test_2, ehdr_start_test_3)
(ehdr_start_test_4, ehdr_start_test_5): New test cases.
* testsuite/Makefile.in: Regenerate.
* testsuite/ehdr_start_def.cc: New source file.
* testsuite/ehdr_start_test.cc: New source file.
* testsuite/ehdr_start_test.t: New linker script.
* testsuite/ehdr_start_test_4.sh: New shell script.
Diffstat (limited to 'gold/resolve.cc')
| -rw-r--r-- | gold/resolve.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gold/resolve.cc b/gold/resolve.cc index 9b442e2..8cc637a 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -915,6 +915,10 @@ Symbol::override_base_with_special(const Symbol* from) bool same_name = this->name_ == from->name_; gold_assert(same_name || this->has_alias()); + // If we are overriding an undef, remember the original binding. + if (this->is_undefined()) + this->set_undef_binding(this->binding_); + this->source_ = from->source_; switch (from->source_) { |