diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 22:40:59 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-16 22:40:59 +0000 |
| commit | f89b024fd0285654ee2e48c52e86b9aafc886710 (patch) | |
| tree | 2f68c2256017aafb732c4f137e5e5978c7a5fd55 /bfd/elf32-i386.c | |
| parent | 102e82b274eb8f9aaa4777298174227193e3f49d (diff) | |
| download | binutils-redhat-f89b024fd0285654ee2e48c52e86b9aafc886710.tar.gz | |
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/elf32-i386.c')
| -rw-r--r-- | bfd/elf32-i386.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 368c8d5866..9c061baea7 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1556,6 +1556,9 @@ elf_i386_check_relocs (bfd *abfd, h->plt.refcount += 1; break; + case R_386_SIZE32: + goto do_size; + case R_386_TLS_IE_32: case R_386_TLS_IE: case R_386_TLS_GOTIE: @@ -1686,7 +1689,6 @@ elf_i386_check_relocs (bfd *abfd, case R_386_32: case R_386_PC32: - case R_386_SIZE32: if (h != NULL && info->executable) { /* If this reloc is in a read-only section, we might @@ -1704,6 +1706,7 @@ elf_i386_check_relocs (bfd *abfd, 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 @@ -3682,20 +3685,6 @@ elf_i386_relocate_section (bfd *output_bfd, break; case R_386_SIZE32: - 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; /* Fall through. */ |