OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bfd/ 

* elf32-arm.c (elf32_arm_populate_plt_entry): Use int32_t for
	displacement calculation in nacl_p case.
This commit is contained in:
Roland McGrath 2012-06-28 16:57:24 +00:00
parent e5ef252af0
commit 6034aab8a1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-28 Roland McGrath <mcgrathr@google.com>
* elf32-arm.c (elf32_arm_populate_plt_entry): Use int32_t for
displacement calculation in nacl_p case.
2012-06-28 Nick Clifton <nickc@redhat.com>
* po/uk.po: New Ukranian translation.

8
bfd/elf32-arm.c
View File

@ -23,6 +23,7 @@
#include <limits.h>
#include "bfd.h"
#include "bfd_stdint.h"
#include "libiberty.h"
#include "libbfd.h"
#include "elf-bfd.h"
@ -7629,7 +7630,7 @@ elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
{
/* Calculate the displacement between the PLT slot and the
common tail that's part of the special initial PLT slot. */
bfd_vma tail_displacement
int32_t tail_displacement
= ((splt->output_section->vma + splt->output_offset
+ ARM_NACL_PLT_TAIL_OFFSET)
- (plt_address + htab->plt_entry_size + 4));
@ -7642,7 +7643,8 @@ elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
/* Calculate the displacement between the PLT slot and the entry
in the GOT. The offset accounts for the value produced by
adding to pc in the penultimate instruction of the PLT stub. */
got_displacement = got_address - (plt_address + htab->plt_entry_size);
got_displacement = (got_address
- (plt_address + htab->plt_entry_size));
/* NaCl does not support interworking at all. */
BFD_ASSERT (!elf32_arm_plt_needs_thumb_stub_p (info, arm_plt));
@ -10982,7 +10984,7 @@ bfd_arm_get_mach_from_attributes (bfd * abfd)
return bfd_mach_arm_iWMMXt2;
if (strcmp (name, "IWMMXT") == 0)
return bfd_mach_arm_iWMMXt;
return bfd_mach_arm_iWMMXt;
}
return bfd_mach_arm_5TE;