vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

arm: implement additional relocations generated by gcc 4.9 at -O3

Browse source 
GCC 4.9 also generates R_ARM_THM_MOVW_ABS_NC and R_ARM_THM_MOVT_ABS,
as an alternative to ABS32.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Leif Lindholm 2015-02-03 21:16:36 +00:00
parent 016875dd52
commit c0f529ea67
3 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
grub-core/kern/arm/dl.c
View file

@ -205,6 +205,21 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
*/
case R_ARM_V4BX:
break;
case R_ARM_THM_MOVW_ABS_NC:
case R_ARM_THM_MOVT_ABS:
{
grub_uint32_t offset;
offset = grub_arm_thm_movw_movt_get_value((grub_uint16_t *) target);
offset += sym_addr;
if (ELF_R_TYPE (rel->r_info) == R_ARM_THM_MOVT_ABS)
offset >>= 16;
else
offset &= 0xffff;
grub_arm_thm_movw_movt_set_value((grub_uint16_t *) target, offset);
}
break;
case R_ARM_THM_JUMP19:
{
/* Thumb instructions can be 16-bit aligned */