diff options
| author | Ian Lance Taylor <ian@airs.com> | 2010-03-03 19:31:54 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2010-03-03 19:31:54 +0000 |
| commit | d3bbad62650d8da0396b2df5308271efc7fdb317 (patch) | |
| tree | f92ee0062cef565cb8575aff98486d7cd09b5a66 /gold/target-reloc.h | |
| parent | e8f781e22753a21b7d4d5afd6c4217e711b8da80 (diff) | |
| download | gdb-d3bbad62650d8da0396b2df5308271efc7fdb317.zip gdb-d3bbad62650d8da0396b2df5308271efc7fdb317.tar.gz gdb-d3bbad62650d8da0396b2df5308271efc7fdb317.tar.bz2 | |
* target-reloc.h (relocate_section): Check the symbol table index
for -1U before setting the local symbol index.
(scan_relocatable_relocs): If copying the relocation, record that
the local symbol is required.
* object.h (Symbol_value::is_output_symtab_index_set): New
function.
(Symbol_value::may_be_discarded_from_output_symtab): New
function.
(Symbol_value::has_output_symtab_entry): New function.
(Symbol_value::needs_output_symtab_entry): Remove.
(Symbol_value::output_symtab_index): Make sure the symbol index is
set.
(Symbol_value::set_output_symtab_index): Make sure the symbol
index is not set. Make sure the new index is valid.
(Symbol_value::set_must_have_output_symtab_entry): New function.
(Symbol_value::has_output_dynsym_entry): New function.
(Symbol_value::set_output_dynsym_index): Make sure the new index
is valid.
(Sized_relobj::set_must_have_output_symtab_entry): New function.
* object.cc (Sized_relobj::do_count_local_symbols): Only discard a
local symbol if permitted.
(Sized_relobj::do_finalize_local_symbols): Call
is_output_symtab_index_set rather than needs_output_symtab_entry.
(Sized_relobj::write_local_symbols): Call has_output_symtab_entry
rather than needs_output_symtab_entry. Call
has_output_dynsym_entry rather than needs_output_dynsym_entry.
* arm.cc (Arm_relobj::update_output_local_symbol_count): Call
is_output_symtab_index_set rather than needs_output_symtab_entry.
* testsuite/discard_locals_relocatable_test.c: New file.
* testsuite/discard_locals_test.sh: Test -r.
* testsuite/Makefile.am (check_DATA): Add
discard_locals_relocatable_test1.syms,
discard_local_relocatable_test2.syms.
(MOSTLYCLEANFILES): Likewise. Also add
discard_locals_relocatable_test1.lout and
discard_locals_relocatable_test2.out.
(discard_locals_relocatable_test1.syms): New target.
(discard_locals_relocatable_test.o): New target.
(discard_locals_relocatable_test1.out): New target.
(discard_locals_relocatable_test2.syms): New target.
(discard_locals_relocatable_test2.out): New target.
(various): Add missing ../ld-new dependencies.
* testsuite/Makefile.in: Rebuild.
Diffstat (limited to 'gold/target-reloc.h')
| -rw-r--r-- | gold/target-reloc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gold/target-reloc.h b/gold/target-reloc.h index 4cb3315..510eea0 100644 --- a/gold/target-reloc.h +++ b/gold/target-reloc.h @@ -279,7 +279,7 @@ relocate_section( } sym = static_cast<const Sized_symbol<size>*>(gsym); - if (sym->has_symtab_index()) + if (sym->has_symtab_index() && sym->symtab_index() != -1U) symval.set_output_symtab_index(sym->symtab_index()); else symval.set_no_output_symtab_entry(); @@ -491,6 +491,9 @@ scan_relocatable_relocs( if (strategy != Relocatable_relocs::RELOC_DISCARD) object->output_section(shndx)->set_needs_symtab_index(); } + + if (strategy == Relocatable_relocs::RELOC_COPY) + object->set_must_have_output_symtab_entry(r_sym); } } |