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

* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore

Browse source 
R_ARM_V4BX.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-03 23:55:06 +02:00
parent d71b45ae8e
commit c7c177f07f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore
R_ARM_V4BX.
2013-10-03 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/video_checksum.c: Increase robustness to out of memory * grub-core/tests/video_checksum.c: Increase robustness to out of memory

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

@ -90,6 +90,11 @@ do_relocations (Elf_Shdr * relhdr, Elf_Ehdr * e, grub_dl_t mod)
return retval; return retval;
} }
break; break;
/* Happens when compiled with -march=armv4. Since currently we need
at least armv5, keep bx as-is.
*/
case R_ARM_V4BX:
break;
case R_ARM_THM_JUMP19: case R_ARM_THM_JUMP19:
{ {
/* Thumb instructions can be 16-bit aligned */ /* Thumb instructions can be 16-bit aligned */