espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update x86 size relocation check

Browse Source 
* 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.
This commit is contained in:
H.J. Lu
2013-01-16 22:41:03 +00:00
parent 2f81ff9286
commit 6a3e1baeae
3 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bfd/ChangeLog
View File

@ -1,3 +1,14 @@
2013-01-16 H.J. Lu <hongjiu.lu@intel.com>
* 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.
2013-01-16 H.J. Lu <hongjiu.lu@intel.com> 2013-01-16 H.J. Lu <hongjiu.lu@intel.com>
* bfd-in2.h: Regenerated. * bfd-in2.h: Regenerated.

19
bfd/elf32-i386.c
View File

@ -1556,6 +1556,9 @@ elf_i386_check_relocs (bfd *abfd,
h->plt.refcount += 1; h->plt.refcount += 1;
break; break;
case R_386_SIZE32:
goto do_size;
case R_386_TLS_IE_32: case R_386_TLS_IE_32:
case R_386_TLS_IE: case R_386_TLS_IE:
case R_386_TLS_GOTIE: case R_386_TLS_GOTIE:
@ -1686,7 +1689,6 @@ elf_i386_check_relocs (bfd *abfd,
case R_386_32: case R_386_32:
case R_386_PC32: case R_386_PC32:
case R_386_SIZE32:
if (h != NULL && info->executable) if (h != NULL && info->executable)
{ {
/* If this reloc is in a read-only section, we might /* 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; h->pointer_equality_needed = 1;
} }
do_size:
/* If we are creating a shared library, and this is a reloc /* If we are creating a shared library, and this is a reloc
against a global symbol, or a non PC relative reloc against a global symbol, or a non PC relative reloc
against a local symbol, then we need to copy the reloc against a local symbol, then we need to copy the reloc
@ -3682,20 +3685,6 @@ elf_i386_relocate_section (bfd *output_bfd,
break; break;
case R_386_SIZE32: 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. */ /* Set to symbol size. */
relocation = st_size; relocation = st_size;
/* Fall through. */ /* Fall through. */

21
bfd/elf64-x86-64.c
View File

@ -1706,6 +1706,10 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
} }
goto create_got; goto create_got;
case R_X86_64_SIZE32:
case R_X86_64_SIZE64:
goto do_size;
case R_X86_64_32: case R_X86_64_32:
if (!ABI_64_P (abfd)) if (!ABI_64_P (abfd))
goto pointer; 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_PC32:
case R_X86_64_PC64: case R_X86_64_PC64:
case R_X86_64_64: case R_X86_64_64:
case R_X86_64_SIZE32:
case R_X86_64_SIZE64:
pointer: pointer:
if (h != NULL && info->executable) if (h != NULL && info->executable)
{ {
@ -1757,6 +1759,7 @@ pointer:
h->pointer_equality_needed = 1; h->pointer_equality_needed = 1;
} }
do_size:
/* If we are creating a shared library, and this is a reloc /* If we are creating a shared library, and this is a reloc
against a global symbol, or a non PC relative reloc against a global symbol, or a non PC relative reloc
against a local symbol, then we need to copy the 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_SIZE32:
case R_X86_64_SIZE64: 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. */ /* Set to symbol size. */
relocation = st_size; relocation = st_size;
goto direct; goto direct;