diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 10 | ||||
| -rw-r--r-- | gold/x86_64.cc | 16 |
2 files changed, 18 insertions, 8 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 8dcb05f..d19a5be 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,13 @@ +2010-08-04 Ian Lance Taylor <iant@google.com> + + * x86_64.cc (Target_x86_64::Scan::local): Use + R_X86_64_GNU_VTINHERIT instead of R_386_GNU_VTINHERIT and + R_X86_64_GNU_VTENTRY instead of R_386_GNU_VTENTRY. + (Target_x86_64::Scan::global): Likewise. + (Target_x86_64::Relocate::relocate): Likewise. + (Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc): + Likewise. + 2010-08-03 Cary Coutant <ccoutant@google.com> * merge.cc (Output_merge_string::do_add_input_section): Count strings diff --git a/gold/x86_64.cc b/gold/x86_64.cc index abeff04..bfa494c 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -1150,8 +1150,8 @@ Target_x86_64::Scan::local(Symbol_table* symtab, switch (r_type) { case elfcpp::R_X86_64_NONE: - case elfcpp::R_386_GNU_VTINHERIT: - case elfcpp::R_386_GNU_VTENTRY: + case elfcpp::R_X86_64_GNU_VTINHERIT: + case elfcpp::R_X86_64_GNU_VTENTRY: break; case elfcpp::R_X86_64_64: @@ -1508,8 +1508,8 @@ Target_x86_64::Scan::global(Symbol_table* symtab, switch (r_type) { case elfcpp::R_X86_64_NONE: - case elfcpp::R_386_GNU_VTINHERIT: - case elfcpp::R_386_GNU_VTENTRY: + case elfcpp::R_X86_64_GNU_VTINHERIT: + case elfcpp::R_X86_64_GNU_VTENTRY: break; case elfcpp::R_X86_64_64: @@ -1992,8 +1992,8 @@ Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo, switch (r_type) { case elfcpp::R_X86_64_NONE: - case elfcpp::R_386_GNU_VTINHERIT: - case elfcpp::R_386_GNU_VTENTRY: + case elfcpp::R_X86_64_GNU_VTINHERIT: + case elfcpp::R_X86_64_GNU_VTENTRY: break; case elfcpp::R_X86_64_64: @@ -2680,8 +2680,8 @@ Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc( switch (r_type) { case elfcpp::R_X86_64_NONE: - case elfcpp::R_386_GNU_VTINHERIT: - case elfcpp::R_386_GNU_VTENTRY: + case elfcpp::R_X86_64_GNU_VTINHERIT: + case elfcpp::R_X86_64_GNU_VTENTRY: case elfcpp::R_X86_64_TLSGD: // Global-dynamic case elfcpp::R_X86_64_GOTPC32_TLSDESC: // Global-dynamic (from ~oliva url) case elfcpp::R_X86_64_TLSDESC_CALL: |