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

* elfxx-mips.c (_bfd_mips_elf_relocate_section): Simplify code.

Browse Source 
Fix RELA addends to get not shifted in the result. Don't do special
	handling of R_MIPS_64 for NewABI.
This commit is contained in:
Thiemo Seufer
2002-06-07 23:43:41 +00:00
parent a4672219e1
commit 5a65966349
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2002-06-08 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* elfxx-mips.c (_bfd_mips_elf_relocate_section): Simplify code.
Fix RELA addends to get not shifted in the result. Don't do special
handling of R_MIPS_64 for NewABI.
2002-06-07 Alan Modra <amodra@bigpond.net.au> 2002-06-07 Alan Modra <amodra@bigpond.net.au>
* aoutx.h (NAME(aout,slurp_symbol_table)): Use bfd_zmalloc. * aoutx.h (NAME(aout,slurp_symbol_table)): Use bfd_zmalloc.

33
bfd/elfxx-mips.c
View File

@ -5013,8 +5013,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
space. Thus, when they use an R_MIPS_64 they mean what is space. Thus, when they use an R_MIPS_64 they mean what is
usually meant by R_MIPS_32, with the exception that the usually meant by R_MIPS_32, with the exception that the
stored value is sign-extended to 64 bits. */ stored value is sign-extended to 64 bits. */
howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, R_MIPS_32, howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, R_MIPS_32, false);
NEWABI_P (input_bfd));
/* On big-endian systems, we need to lie about the position /* On big-endian systems, we need to lie about the position
of the reloc. */ of the reloc. */
@ -5049,6 +5048,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
addend = mips_elf_obtain_contents (howto, rel, input_bfd, addend = mips_elf_obtain_contents (howto, rel, input_bfd,
contents); contents);
addend &= howto->src_mask; addend &= howto->src_mask;
addend <<= howto->rightshift;
/* For some kinds of relocations, the ADDEND is a /* For some kinds of relocations, the ADDEND is a
combination of the addend stored in two different combination of the addend stored in two different
@ -5081,11 +5081,11 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
return false; return false;
/* Obtain the addend kept there. */ /* Obtain the addend kept there. */
lo16_howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, lo, lo16_howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, lo, false);
rela_relocation_p);
l = mips_elf_obtain_contents (lo16_howto, lo16_relocation, l = mips_elf_obtain_contents (lo16_howto, lo16_relocation,
input_bfd, contents); input_bfd, contents);
l &= lo16_howto->src_mask; l &= lo16_howto->src_mask;
l <<= lo16_howto->rightshift;
l = mips_elf_sign_extend (l, 16); l = mips_elf_sign_extend (l, 16);
addend <<= 16; addend <<= 16;
@ -5144,13 +5144,6 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
|| r_type == R_MIPS_LITERAL) || r_type == R_MIPS_LITERAL)
addend -= (_bfd_get_gp_value (output_bfd) addend -= (_bfd_get_gp_value (output_bfd)
- _bfd_get_gp_value (input_bfd)); - _bfd_get_gp_value (input_bfd));
else if (r_type == R_MIPS_26 || r_type == R_MIPS16_26
|| r_type == R_MIPS_GNU_REL16_S2)
/* The addend is stored without its two least
significant bits (which are always zero.) In a
non-relocateable link, calculate_relocation will do
this shift; here, we must do it ourselves. */
addend <<= 2;
r_symndx = ELF_R_SYM (output_bfd, rel->r_info); r_symndx = ELF_R_SYM (output_bfd, rel->r_info);
sym = local_syms + r_symndx; sym = local_syms + r_symndx;
@ -5158,9 +5151,12 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
/* Adjust the addend appropriately. */ /* Adjust the addend appropriately. */
addend += local_sections[r_symndx]->output_offset; addend += local_sections[r_symndx]->output_offset;
if (howto->partial_inplace)
{
/* If the relocation is for a R_MIPS_HI16 or R_MIPS_GOT16, /* If the relocation is for a R_MIPS_HI16 or R_MIPS_GOT16,
then we only want to write out the high-order 16 bits. then we only want to write out the high-order 16 bits.
The subsequent R_MIPS_LO16 will handle the low-order bits. */ The subsequent R_MIPS_LO16 will handle the low-order bits.
*/
if (r_type == R_MIPS_HI16 || r_type == R_MIPS_GOT16 if (r_type == R_MIPS_HI16 || r_type == R_MIPS_GOT16
|| r_type == R_MIPS_GNU_REL_HI16) || r_type == R_MIPS_GNU_REL_HI16)
addend = mips_elf_high (addend); addend = mips_elf_high (addend);
@ -5168,13 +5164,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
addend = mips_elf_higher (addend); addend = mips_elf_higher (addend);
else if (r_type == R_MIPS_HIGHEST) else if (r_type == R_MIPS_HIGHEST)
addend = mips_elf_highest (addend); addend = mips_elf_highest (addend);
}
/* If the relocation is for an R_MIPS_26 relocation, then
the two low-order bits are not stored in the object file;
they are implicitly zero. */
else if (r_type == R_MIPS_26 || r_type == R_MIPS16_26
|| r_type == R_MIPS_GNU_REL16_S2)
addend >>= 2;
if (rela_relocation_p) if (rela_relocation_p)
/* If this is a RELA relocation, just update the addend. /* If this is a RELA relocation, just update the addend.
@ -5187,9 +5177,10 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
destination mask because the place to which we are destination mask because the place to which we are
writing will be source of the addend in the final writing will be source of the addend in the final
link. */ link. */
addend >>= howto->rightshift;
addend &= howto->src_mask; addend &= howto->src_mask;
if (r_type == R_MIPS_64 && !ABI_64_P (output_bfd)) if (r_type == R_MIPS_64 && ! NEWABI_P (output_bfd))
/* See the comment above about using R_MIPS_64 in the 32-bit /* See the comment above about using R_MIPS_64 in the 32-bit
ABI. Here, we need to update the addend. It would be ABI. Here, we need to update the addend. It would be
possible to get away with just using the R_MIPS_32 reloc possible to get away with just using the R_MIPS_32 reloc
@ -5250,6 +5241,8 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
else else
use_saved_addend_p = false; use_saved_addend_p = false;
addend >>= howto->rightshift;
/* Figure out what value we are supposed to relocate. */ /* Figure out what value we are supposed to relocate. */
switch (mips_elf_calculate_relocation (output_bfd, input_bfd, switch (mips_elf_calculate_relocation (output_bfd, input_bfd,
input_section, info, rel, input_section, info, rel,