diff options
| author | Doug Kwan <dougkwan@google.com> | 2009-10-01 00:58:38 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2009-10-01 00:58:38 +0000 |
| commit | 966d4097440bd7c3e35524bebf39d8bbe2e26fd6 (patch) | |
| tree | 80a25b71ca7f2b3529c90ee004d50fb78239c298 /gold/arm.cc | |
| parent | 7cacf37ef6dca17f1e65cbfa073faac07504397f (diff) | |
| download | gdb-966d4097440bd7c3e35524bebf39d8bbe2e26fd6.zip gdb-966d4097440bd7c3e35524bebf39d8bbe2e26fd6.tar.gz gdb-966d4097440bd7c3e35524bebf39d8bbe2e26fd6.tar.bz2 | |
2009-09-30 Doug Kwan <dougkwan@google.com>
* arm.cc (Target_arm::may_need_copy_reloc): Check for THUMB function
symbol and call Symbol::may_need_copy_reloc to determine if
a copy reloc is needed.
* copy-relocs.cc (Copy_relocs::need_copy_reloc): Return false if -z
nocopyreloc is given in command line.
(Copy_relocs::emit_copy_reloc): Assert that -z nocopyreloc is not
given in command line.
* i386.cc (Target_i386::may_need_copy_reloc): Remove.
(Target_i386::Scan::global): Use Symbol::may_need_copy_reloc instead
of the removed Target_i386::may_need_copy_reloc.
* options.h (copyreloc): New option with default value false.
* powerpc.cc (Target_powerpc::may_need_copy_reloc): Remove.
(Target_powerpc::Scan::global): Use Symbol::may_need_copy_reloc
instead of the removed Target_powerpc::may_need_copy_reloc.
* sparc.cc (Target_powerpc::may_need_copy_reloc): Remove.
(Target_sparc::Scan::global): Use Symbol::may_need_copy_reloc
instead of the removed Target_sparc::may_need_copy_reloc.
* symtab.h (Symbol::may_need_copy_reloc): New method definition.
* x86_64.cc (Target_powerpc::may_need_copy_reloc): Remove.
(Target_x86_64::Scan::global): Use Symbol::may_need_copy_reloc
instead of the removed Target_x86_64::may_need_copy_reloc.
Diffstat (limited to 'gold/arm.cc')
| -rw-r--r-- | gold/arm.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gold/arm.cc b/gold/arm.cc index 6fc71a7..17028b5 100644 --- a/gold/arm.cc +++ b/gold/arm.cc @@ -405,10 +405,8 @@ class Target_arm : public Sized_target<32, big_endian> bool may_need_copy_reloc(Symbol* gsym) { - return (!parameters->options().shared() - && gsym->is_from_dynobj() - && gsym->type() != elfcpp::STT_FUNC - && gsym->type() != elfcpp::STT_ARM_TFUNC); + return (gsym->type() != elfcpp::STT_ARM_TFUNC + && gsym->may_need_copy_reloc()); } // Add a potential copy relocation. |