* grub-core/kern/arm/misc.S: Make thumb2-compatible.

diff --git a/ChangeLog b/ChangeLog
index 99cf14a..80145fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
+
+       * grub-core/kern/arm/misc.S: Make thumb2-compatible.
+
 2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
 
        * .gitignore: fix rules for .dep* and add *.a post git migration

diff --git a/grub-core/kern/arm/misc.S b/grub-core/kern/arm/misc.S
index 8420a2a..8943cc3 100644 (file)
--- a/grub-core/kern/arm/misc.S
+++ b/grub-core/kern/arm/misc.S
@@ -41,10 +41,10 @@ FUNCTION(__aeabi_lmul)
         str     r3, [fp, #-16]
         ldr     r3, [fp, #-8]
         ldr     r2, [fp, #-20]
-        .long   0xe0020293   @ mul     r2, r3, r2
+        mul     r2, r3, r2
         ldr     r3, [fp, #-16]
         ldr     r1, [fp, #-12]
-        .long   0xe0030391   @ mul     r3, r1, r3
+        mul     r3, r1, r3
         add     r2, r2, r3
         ldr     r0, [fp, #-12]
         ldr     r1, [fp, #-20]
@@ -53,7 +53,8 @@ FUNCTION(__aeabi_lmul)
         mov     r4, r2
         mov     r0, r3
         mov     r1, r4
-        sub     sp, fp, #4
+       mov     sp, fp
+       sub     sp, sp, #4
         ldmfd   sp!, {r4, fp}
         bx      lr