diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 22:41:03 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 22:41:03 +0000 |
| commit | 6a3e1baeae1ce25cc959d53a84925074a97deef9 (patch) | |
| tree | f107d8ef043b24823adcd0b6c953195ee928b39b /bfd/elf64-x86-64.c | |
| parent | 2f81ff928644e457e4edbff1257e663845857f6b (diff) | |
| download | gdb-6a3e1baeae1ce25cc959d53a84925074a97deef9.zip gdb-6a3e1baeae1ce25cc959d53a84925074a97deef9.tar.gz gdb-6a3e1baeae1ce25cc959d53a84925074a97deef9.tar.bz2 | |
Update x86 size relocation check
* elf32-i386.c (elf_i386_check_relocs): Update R_386_SIZE32
check.
(elf_i386_relocate_section): Don't check TLS for R_386_SIZE32.
* elf64-x86-64.c (elf_x86_64_check_relocs): Update R_X86_64_SIZE32
and R_X86_64_SIZE64 check.
(elf_x86_64_relocate_section): Don't check TLS for R_X86_64_SIZE32
nor R_X86_64_SIZE64.
Diffstat (limited to 'bfd/elf64-x86-64.c')
| -rw-r--r-- | bfd/elf64-x86-64.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 8fae5fc..c260606 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -1706,6 +1706,10 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, } goto create_got; + case R_X86_64_SIZE32: + case R_X86_64_SIZE64: + goto do_size; + case R_X86_64_32: if (!ABI_64_P (abfd)) goto pointer; @@ -1737,8 +1741,6 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_X86_64_PC32: case R_X86_64_PC64: case R_X86_64_64: - case R_X86_64_SIZE32: - case R_X86_64_SIZE64: pointer: if (h != NULL && info->executable) { @@ -1757,6 +1759,7 @@ pointer: h->pointer_equality_needed = 1; } +do_size: /* If we are creating a shared library, and this is a reloc against a global symbol, or a non PC relative reloc against a local symbol, then we need to copy the reloc @@ -3678,20 +3681,6 @@ elf_x86_64_relocate_section (bfd *output_bfd, case R_X86_64_SIZE32: case R_X86_64_SIZE64: - if (h - && h->type == STT_TLS - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - && h->root.u.def.section->output_section != NULL - && htab->elf.tls_sec == NULL) - { - (*_bfd_error_handler) - (_("%B: `%s' accessed both as normal and thread local symbol"), - input_bfd, h->root.root.string); - bfd_set_error (bfd_error_bad_value); - return FALSE; - } - /* Set to symbol size. */ relocation = st_size; goto direct; |