mirror of
https://git.proxmox.com/git/grub2
synced 2025-05-21 12:39:57 +00:00
* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore
R_ARM_V4BX.
This commit is contained in:
parent
d71b45ae8e
commit
c7c177f07f
@ -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>
|
||||
|
||||
* grub-core/tests/video_checksum.c: Increase robustness to out of memory
|
||||
|
@ -90,6 +90,11 @@ do_relocations (Elf_Shdr * relhdr, Elf_Ehdr * e, grub_dl_t mod)
|
||||
return retval;
|
||||
}
|
||||
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:
|
||||
{
|
||||
/* Thumb instructions can be 16-bit aligned */
|
||||
|
Loading…
Reference in New Issue
Block a user