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

x86-64: restrict PC32 -> PLT32 conversion

Browse Source 
Neither non-64-bit code nor uses with a non-zero offset from a symbol
should be converted to PLT32, as an eventual PLT entry would not express
what was requested.
This commit is contained in:
Jan Beulich
2022-01-06 14:17:40 +01:00
parent 1f927a4a28
commit 1ef3994a37
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gas/config/tc-i386.c
View File

@ -8857,6 +8857,8 @@ output_branch (void)
off = 0; off = 0;
} }
frag_now->tc_frag_data.code64 = flag_code == CODE_64BIT;
/* 1 possible extra opcode + 4 byte displacement go in var part. /* 1 possible extra opcode + 4 byte displacement go in var part.
Pass reloc in fr_var. */ Pass reloc in fr_var. */
frag_var (rs_machine_dependent, 5, i.reloc[0], subtype, sym, off, p); frag_var (rs_machine_dependent, 5, i.reloc[0], subtype, sym, off, p);
@ -8985,8 +8987,8 @@ output_jump (void)
} }
#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
if (size == 4 if (flag_code == CODE_64BIT && size == 4
&& jump_reloc == NO_RELOC && jump_reloc == NO_RELOC && i.op[0].disps->X_add_number == 0
&& need_plt32_p (i.op[0].disps->X_add_symbol)) && need_plt32_p (i.op[0].disps->X_add_symbol))
jump_reloc = BFD_RELOC_X86_64_PLT32; jump_reloc = BFD_RELOC_X86_64_PLT32;
#endif #endif
@ -12294,7 +12296,8 @@ md_estimate_size_before_relax (fragS *fragP, segT segment)
else if (size == 2) else if (size == 2)
reloc_type = BFD_RELOC_16_PCREL; reloc_type = BFD_RELOC_16_PCREL;
#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
else if (need_plt32_p (fragP->fr_symbol)) else if (fragP->tc_frag_data.code64 && fragP->fr_offset == 0
&& need_plt32_p (fragP->fr_symbol))
reloc_type = BFD_RELOC_X86_64_PLT32; reloc_type = BFD_RELOC_X86_64_PLT32;
#endif #endif
else else

1
gas/config/tc-i386.h
View File

@ -283,6 +283,7 @@ struct i386_tc_frag_data
unsigned int mf_type : 3; unsigned int mf_type : 3;
unsigned int classified : 1; unsigned int classified : 1;
unsigned int branch_type : 3; unsigned int branch_type : 3;
unsigned int code64 : 1; /* Only set by output_branch for now. */
}; };
/* We need to emit the right NOP pattern in .align frags. This is /* We need to emit the right NOP pattern in .align frags. This is