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/layout.cc | |
| parent | Extend recognized types of SDT probe's arguments (diff) | |
| download | binutils-gdb-d1bddd3c4b9c17736bf6c59aa336670a589ca844.tar.gz binutils-gdb-d1bddd3c4b9c17736bf6c59aa336670a589ca844.tar.bz2 binutils-gdb-d1bddd3c4b9c17736bf6c59aa336670a589ca844.zip | |
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/layout.cc')
| -rw-r--r-- | gold/layout.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gold/layout.cc b/gold/layout.cc index 02f691edf1e..147f7408185 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -2749,12 +2749,14 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, // If there is a load segment that contains the file and program headers, // provide a symbol __ehdr_start pointing there. // A program can use this to examine itself robustly. - if (load_seg != NULL) - symtab->define_in_output_segment("__ehdr_start", NULL, - Symbol_table::PREDEFINED, load_seg, 0, 0, - elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL, - elfcpp::STV_HIDDEN, 0, - Symbol::SEGMENT_START, true); + Symbol *ehdr_start = symtab->lookup("__ehdr_start"); + if (ehdr_start != NULL && ehdr_start->is_predefined()) + { + if (load_seg != NULL) + ehdr_start->set_output_segment(load_seg, Symbol::SEGMENT_START); + else + ehdr_start->set_undefined(); + } // Set the file offsets of all the non-data sections we've seen so // far which don't have to wait for the input sections. We need |