diff options
| author | Cary Coutant <ccoutant@google.com> | 2011-06-08 03:50:12 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2011-06-08 03:50:12 +0000 |
| commit | 26d3c67de1d0e6434dabb908e5a6fa002f5b1db8 (patch) | |
| tree | adebe5713f81ac6e6f85f353dcc70e83ad4d8a65 /gold/gold.cc | |
| parent | b8e9bd6c6461ea6a53d5a48bad21aab75cd1e9e5 (diff) | |
| download | binutils-gdb-26d3c67de1d0e6434dabb908e5a6fa002f5b1db8.tar.gz | |
* copy-relocs.cc (Copy_relocs::copy_reloc): Call make_copy_reloc
instead of emit_copy_reloc.
(Copy_relocs::emit_copy_reloc): Refactor.
(Copy_relocs::make_copy_reloc): New function.
(Copy_relocs::add_copy_reloc): Remove.
* copy-relocs.h (Copy_relocs::emit_copy_reloc): Move to public
section.
(Copy_relocs::make_copy_reloc): New function.
(Copy_relocs::add_copy_reloc): Remove.
* gold.cc (queue_middle_tasks): Emit old COPY relocations from
unchanged input files.
* incremental-dump.cc (dump_incremental_inputs): Print "COPY" flag.
* incremental.cc (Sized_incremental_binary::do_reserve_layout):
Reserve BSS space for COPY relocations.
(Sized_incremental_binary::do_emit_copy_relocs): New function.
(Output_section_incremental_inputs::write_info_blocks): Record
whether a symbol is copied from a shared object.
(Sized_incr_dynobj::do_add_symbols): Record COPY relocations.
* incremental.h (enum Incremental_shlib_symbol_flags): New type.
(INCREMENTAL_SHLIB_SYM_FLAGS_SHIFT): New constant.
(Incremental_input_entry_reader::get_output_symbol_index): Add
is_copy parameter.
(Incremental_binary::emit_copy_relocs): New function.
(Incremental_binary::do_emit_copy_relocs): New function.
(Sized_incremental_binary::Sized_incremental_binary): Initialize
new data member.
(Sized_incremental_binary::add_copy_reloc): New function.
(Sized_incremental_binary::do_emit_copy_relocs): New function.
(Sized_incremental_binary::Copy_reloc): New struct.
(Sized_incremental_binary::Copy_relocs): New typedef.
(Sized_incremental_binary::copy_relocs_): New data member.
* symtab.cc (Symbol_table::add_from_incrobj): Change return type.
* symtab.h (Symbol_table::add_from_incrobj): Change return type.
* target.h (Sized_target::emit_copy_reloc): New function.
* x86_64.cc (Target_x86_64::emit_copy_reloc): New function.
Diffstat (limited to 'gold/gold.cc')
| -rw-r--r-- | gold/gold.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gold/gold.cc b/gold/gold.cc index fc3974edb13..0b901bb120d 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -622,11 +622,13 @@ queue_middle_tasks(const General_options& options, } } - // For incremental updates, record the existing GOT and PLT entries. + // For incremental updates, record the existing GOT and PLT entries, + // and the COPY relocations. if (parameters->incremental_update()) { Incremental_binary* ibase = layout->incremental_base(); ibase->process_got_plt(symtab, layout); + ibase->emit_copy_relocs(symtab); } if (is_debugging_enabled(DEBUG_SCRIPT)) |