MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* elf32-mips.c (_bfd_mips_elf_relocate_section): Tweak HI16/LO16

Browse Source 
handling for REL relocations.  And only left-shift R_MIPS26
	relocation addends where necessary.
This commit is contained in:
Mark Mitchell 1999-08-04 16:32:34 +00:00
parent eecb386cd7
commit e7c4421855
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
1999-08-04 Mark Mitchell <mark@codesourcery.com>
* elf32-mips.c (_bfd_mips_elf_relocate_section): Tweak HI16/LO16
handling for REL relocations. And only left-shift R_MIPS26
relocation addends where necessary.
1999-08-03 Mark Mitchell <mark@codesourcery.com> 1999-08-03 Mark Mitchell <mark@codesourcery.com>
* elf32-mips.c (mips_elf_next_lo16_addend): Rename to ... * elf32-mips.c (mips_elf_next_lo16_addend): Rename to ...

22
bfd/elf32-mips.c
View File

@ -6528,7 +6528,13 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
const Elf_Internal_Rela *lo16_relocation; const Elf_Internal_Rela *lo16_relocation;
reloc_howto_type *lo16_howto; reloc_howto_type *lo16_howto;
/* Scan ahead to find a matching R_MIPS_LO16 /* The combined value is the sum of the HI16 addend,
left-shifted by sixteen bits, and the LO16
addend, sign extended. (Usually, the code does
a `lui' of the HI16 value, and then an `addiu' of
the LO16 value.)
Scan ahead to find a matching R_MIPS_LO16
relocation. */ relocation. */
lo16_relocation lo16_relocation
= mips_elf_next_lo16_relocation (rel, relend); = mips_elf_next_lo16_relocation (rel, relend);
@ -6541,6 +6547,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
lo16_relocation, lo16_relocation,
input_bfd, contents); input_bfd, contents);
l &= lo16_howto->src_mask; l &= lo16_howto->src_mask;
l = mips_elf_sign_extend (l, 16);
/* Save the high-order bit for later. When we /* Save the high-order bit for later. When we
encounter the R_MIPS_LO16 relocation we will need encounter the R_MIPS_LO16 relocation we will need
@ -6550,7 +6557,7 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
last_hi16_addend_valid_p = true; last_hi16_addend_valid_p = true;
/* Compute the combined addend. */ /* Compute the combined addend. */
addend |= l; addend += l;
} }
else if (r_type == R_MIPS_LO16) else if (r_type == R_MIPS_LO16)
{ {
@ -6571,11 +6578,6 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
| ((addend & 0x7e00000) >> 16) | ((addend & 0x7e00000) >> 16)
| (addend & 0x1f)); | (addend & 0x1f));
} }
else if (r_type == R_MIPS16_26
|| r_type == R_MIPS16_26)
/* The addend is stored without its two least
significant bits (which are always zero.) */
addend <<= 2;
} }
else else
addend = rel->r_addend; addend = rel->r_addend;
@ -6608,6 +6610,12 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
|| r_type == R_MIPS_GPREL32) || r_type == R_MIPS_GPREL32)
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_MIPS16_26 || r_type == R_MIPS16_26)
/* 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;
/* 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.