aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2010-08-04 09:53:38 +0000
committerIan Lance Taylor <ian@airs.com>2010-08-04 09:53:38 +0000
commit6e5710cea9c8a6dc04e7b3deb606b7234715e926 (patch)
tree3c4ae74f53d237f7bdc41448ab2f6d93587854dd /gold
parent2e09dbaeac673bf3617b76860c0fda5ba2acb306 (diff)
downloadgdb-6e5710cea9c8a6dc04e7b3deb606b7234715e926.zip
gdb-6e5710cea9c8a6dc04e7b3deb606b7234715e926.tar.gz
gdb-6e5710cea9c8a6dc04e7b3deb606b7234715e926.tar.bz2
elfcpp:/
* i386.h (R_386_IRELATIVE): Define. * powerpc.h (R_POWERPC_IRELATIVE): Define. (R_PPC_RELAX32, R_PPC_RELAX32PC): Don't define. (R_PPC_RELAX32_PLT, R_PPC_RELAX32PC_PLT): Don't define. * sparc.h (R_SPARC_IRELATIVE): Define. * x86_64.h (R_X86_64_IRELATIVE): Define. (R_X86_64_GNU_VTINHERIT): Rename from R_386_GNU_VTINHERIT. (R_X86_64_GNU_VTENTRY): Rename from R_386_GNU_VTENTRY. gold:/ * 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.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog10
-rw-r--r--gold/x86_64.cc16
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: