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

Add explicit thumb interwork bx in asm files.

Browse source 
Shouldn't matter for armv >= 5 but let's be safe.
This commit is contained in:
Vladimir Serbinenko 2013-12-17 14:50:44 +01:00
parent 3086175489
commit d45067a290
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/kern/arm/cache.S
View file

@ -95,7 +95,8 @@ FUNCTION(grub_arch_sync_caches_armv7)
bl clean_dcache_range
pop {r0, r1}
bl invalidate_icache_range
pop {r2, pc}
pop {r2, lr}
bx lr
#ifdef ARMV6
FUNCTION(grub_arm_disable_caches_mmu_armv6)
@ -137,5 +138,6 @@ FUNCTION(grub_arm_disable_caches_mmu_armv7)
DSB
ISB
pop {r4, pc}
pop {r4, lr}
bx lr