diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 11:10:19 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 11:10:19 +0000 |
| commit | fd885f3a4d85dc33d794ca359ea91f31e3082717 (patch) | |
| tree | 012c78d271e7eca621e78198dc5d675e62593a2d | |
| parent | 6750a3a77504bb879eb639c34a2911e704644ba4 (diff) | |
| download | gdb-fd885f3a4d85dc33d794ca359ea91f31e3082717.zip gdb-fd885f3a4d85dc33d794ca359ea91f31e3082717.tar.gz gdb-fd885f3a4d85dc33d794ca359ea91f31e3082717.tar.bz2 | |
Handle R_X86_64_64 properly for x32
elfcpp/
PR gold/14091
* x86_64.h (R_X86_64_RELATIVE64): New.
gold/
PR gold/14091
* x86_64.cc (Target_x86_64::Scan::local): For x32, generate
R_X86_64_RELATIVE64 instead of R_X86_64_RELATIVE in case of
R_X86_64_64.
| -rw-r--r-- | elfcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | elfcpp/x86_64.h | 1 | ||||
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/x86_64.cc | 4 |
4 files changed, 16 insertions, 1 deletions
diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog index 1ec14e8..4c25a87 100644 --- a/elfcpp/ChangeLog +++ b/elfcpp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-11 H.J. Lu <hongjiu.lu@intel.com> + + PR gold/14091 + * x86_64.h (R_X86_64_RELATIVE64): New. + 2012-05-01 Cary Coutant <ccoutant@google.com> * dwarf.h (enum DW_TAG, enum DW_FORM, enum DW_AT, enum DW_ENCODING) diff --git a/elfcpp/x86_64.h b/elfcpp/x86_64.h index ae7d0a8..a53beac 100644 --- a/elfcpp/x86_64.h +++ b/elfcpp/x86_64.h @@ -91,6 +91,7 @@ enum R_X86_64_TLSDESC_CALL = 35, // Relaxable call through TLS descriptor R_X86_64_TLSDESC = 36, // 2 by 64-bit TLS descriptor R_X86_64_IRELATIVE = 37, // Adjust indirectly by program base + R_X86_64_RELATIVE64 = 38, // 64-bit adjust by program base // GNU vtable garbage collection extensions. R_X86_64_GNU_VTINHERIT = 250, R_X86_64_GNU_VTENTRY = 251 diff --git a/gold/ChangeLog b/gold/ChangeLog index 9e28c62..7fffe40 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2012-05-10 H.J. Lu <hongjiu.lu@intel.com> + + PR gold/14091 + * x86_64.cc (Target_x86_64::Scan::local): For x32, generate + R_X86_64_RELATIVE64 instead of R_X86_64_RELATIVE in case of + R_X86_64_64. + 2012-05-08 Cary Coutant <ccoutant@google.com> * layout.cc (gdb_sections): Update GDB version, add .debug_addr. diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 1339e6f..2ac29bf 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -2299,7 +2299,9 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab, unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info()); Reloc_section* rela_dyn = target->rela_dyn_section(layout); rela_dyn->add_local_relative(object, r_sym, - elfcpp::R_X86_64_RELATIVE, + (size == 32 + ? elfcpp::R_X86_64_RELATIVE64 + : elfcpp::R_X86_64_RELATIVE), output_section, data_shndx, reloc.get_r_offset(), reloc.get_r_addend(), is_ifunc); |