diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2024-07-23 23:39:50 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2024-07-25 12:40:19 -0700 |
| commit | 1d68a49ac5d71b648304f69af978fce0f4413800 (patch) | |
| tree | 48fe590375bece624859bcb6b6ca436d514120f4 /bfd/elfxx-x86.h | |
| parent | f026d7063ecec8b64af5d67247129514d57e6e87 (diff) | |
| download | fsf-binutils-gdb-1d68a49ac5d71b648304f69af978fce0f4413800.zip fsf-binutils-gdb-1d68a49ac5d71b648304f69af978fce0f4413800.tar.gz fsf-binutils-gdb-1d68a49ac5d71b648304f69af978fce0f4413800.tar.bz2 | |
x86: Improve TLS transition error check
Provide detailed TLS transition errors when unsupported instructions are
used. Treat R_X86_64_CODE_4_GOTTPOFF and R_X86_64_CODE_6_GOTTPOFF as
R_X86_64_GOTTPOFF when performing TLS transition.
bfd/
PR ld/32017
* elf32-i386.c (elf_i386_check_tls_transition): Return different
enums for different errors.
(elf_i386_tls_transition): Change argument from r_symndx to sym.
Call _bfd_x86_elf_link_report_tls_transition_error to report TLS
transition errors.
(elf_i386_scan_relocs): Pass isym instead of r_symndx to
elf_i386_tls_transition.
(elf_i386_relocate_section): Pass sym instead of r_symndx to
elf_i386_tls_transition.
* elf64-x86-64.c (elf_x86_64_check_tls_transition): Return
different enums for different errors.
(elf_x86_64_tls_transition): Change argument from r_symndx to sym.
Treat R_X86_64_CODE_4_GOTTPOFF and R_X86_64_CODE_6_GOTTPOFF as
R_X86_64_GOTTPOFF. Call
_bfd_x86_elf_link_report_tls_transition_error to report TLS
transition errors.
(elf_x86_64_scan_relocs): Pass isym instead of r_symndx to
elf_x86_64_tls_transition.
(elf_x86_64_relocate_section): Pass sym instead of r_symndx to
elf_x86_64_tls_transition.
* elfxx-x86.c (_bfd_x86_elf_link_report_tls_transition_error): New.
* elfxx-x86.h (elf_x86_tls_error_type): Likewise.
(_bfd_x86_elf_link_report_tls_transition_error): Likewise.
ld/
PR ld/32017
* testsuite/ld-i386/i386.exp: Run tlsgdesc1 and tlsgdesc2.
* testsuite/ld-i386/tlsie2.d: Updated.
* testsuite/ld-i386/tlsie3.d: Likewise.
* testsuite/ld-i386/tlsie4.d: Likewise.
* testsuite/ld-i386/tlsie5.d: Likewise.
* testsuite/ld-x86-64/tlsie2.d: Likewise.
* testsuite/ld-x86-64/tlsie3.d: Likewise.
* testsuite/ld-i386/tlsgdesc1.d: New file.
* testsuite/ld-i386/tlsgdesc1.s: Likewise.
* testsuite/ld-i386/tlsgdesc2.d: Likewise.
* testsuite/ld-i386/tlsgdesc2.s: Likewise.
* testsuite/ld-x86-64/tlsdesc3.d: Likewise.
* testsuite/ld-x86-64/tlsdesc3.s: Likewise.
* testsuite/ld-x86-64/tlsdesc4.d: Likewise.
* testsuite/ld-x86-64/tlsdesc4.s: Likewise.
* testsuite/ld-x86-64/tlsie5.d: Likewise.
* testsuite/ld-x86-64/tlsie5.s: Likewise.
* testsuite/ld-x86-64/x86-64.exp: Run tlsie5, tlsdesc3 and
tlsdesc4.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Diffstat (limited to 'bfd/elfxx-x86.h')
| -rw-r--r-- | bfd/elfxx-x86.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index 0f79d83..5eef7b0 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -767,6 +767,17 @@ struct elf_x86_plt long count; }; +enum elf_x86_tls_error_type +{ + elf_x86_tls_error_none, + elf_x86_tls_error_add, + elf_x86_tls_error_add_mov, + elf_x86_tls_error_add_sub_mov, + elf_x86_tls_error_indirect_call, + elf_x86_tls_error_lea, + elf_x86_tls_error_yes +}; + /* Set if a relocation is converted from a GOTPCREL relocation. */ #define R_X86_64_converted_reloc_bit (1 << 7) @@ -915,6 +926,12 @@ extern void _bfd_x86_elf_link_report_relative_reloc (struct bfd_link_info *, asection *, struct elf_link_hash_entry *, Elf_Internal_Sym *, const char *, const void *) ATTRIBUTE_HIDDEN; +extern void _bfd_x86_elf_link_report_tls_transition_error + (struct bfd_link_info *, bfd *, asection *, Elf_Internal_Shdr *, + struct elf_link_hash_entry *, Elf_Internal_Sym *, + const Elf_Internal_Rela *, const char *, const char *, + enum elf_x86_tls_error_type); + #define bfd_elf64_mkobject \ _bfd_x86_elf_mkobject #define bfd_elf32_mkobject \ |