darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* elf32-mips.c (mips_elf_obtain_contents): Swap the 16-bit

Browse source 
subwords when handling an R_MIPS16_26 relocation.
	(mips_elf_perform_relocation): Don't be paranoid abour right-shift
	semantics.
This commit is contained in:
Mark Mitchell 1999-07-14 11:46:04 +00:00
parent b7233c24e1
commit 1e52e2ee34
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,5 +1,10 @@
1999-07-14 Mark Mitchell <mark@codesourcery.com> 1999-07-14 Mark Mitchell <mark@codesourcery.com>
* elf32-mips.c (mips_elf_obtain_contents): Swap the 16-bit
subwords when handling an R_MIPS16_26 relocation.
(mips_elf_perform_relocation): Don't be paranoid abour right-shift
semantics.
* elf32-mips.c (elf_mips16_gprel_howto): Adjust src_mask and * elf32-mips.c (elf_mips16_gprel_howto): Adjust src_mask and
dst_mask to match reality. dst_mask to match reality.
(_bfd_mips_elf_calculate_relocation): Handle R_MIPS16_GPREL. (_bfd_mips_elf_calculate_relocation): Handle R_MIPS16_GPREL.

10
bfd/elf32-mips.c
View file

@ -5884,7 +5884,7 @@ mips_elf_calculate_relocation (abfd,
case R_MIPS16_26: case R_MIPS16_26:
/* The calculation for R_MIPS_26 is just the same as for an /* The calculation for R_MIPS_26 is just the same as for an
R_MIPS_26. It's only the storage of the relocated field into R_MIPS_26. It's only the storage of the relocated field into
the output file that's different. That's handle in the output file that's different. That's handled in
mips_elf_perform_relocation. So, we just fall through to the mips_elf_perform_relocation. So, we just fall through to the
R_MIPS_26 case here. */ R_MIPS_26 case here. */
case R_MIPS_26: case R_MIPS_26:
@ -6071,6 +6071,12 @@ mips_elf_obtain_contents (howto, relocation, input_bfd, contents)
/* Obtain the bytes. */ /* Obtain the bytes. */
x = bfd_get (8 * bfd_get_reloc_size (howto), input_bfd, location); x = bfd_get (8 * bfd_get_reloc_size (howto), input_bfd, location);
if (ELF32_R_TYPE (relocation->r_info) == R_MIPS16_26
&& bfd_little_endian (input_bfd))
/* The two 16-bit words will be reversed on a little-endian
system. See mips_elf_perform_relocation for more details. */
x = (((x & 0xffff) << 16) | ((x & 0xffff0000) >> 16));
return x; return x;
} }
@ -6179,7 +6185,7 @@ mips_elf_perform_relocation (info, howto, relocation, value,
systems. */ systems. */
if (bfd_little_endian (input_bfd)) if (bfd_little_endian (input_bfd))
x = (((x & 0xffff) << 16) x = (((x & 0xffff) << 16)
| (((x & 0xffff0000) >> 16) & 0xffff)); | ((x & 0xffff0000) >> 16));
/* Store the value. */ /* Store the value. */
bfd_put_32 (input_bfd, x, location); bfd_put_32 (input_bfd, x, location);