Re: [U-Boot] [PATCH 06/12] arm: lib: Fix uldivmod.S build on Thumb2

[Tom Rini]

On Thu, May 26, 2016 at 06:01:41PM +0200, Marek Vasut wrote:

> This assembler source won't build in Thumb2 mode, so fix it adding
> the necessary Thumb2 conditional macros from unified.h .
> 
> This patch also defines CONFIG_THUMB2_KERNEL and CONFIG_ARM_ASM_UNIFIED
> which is necessary for correct build of these files both in ARM and
> Thumb mode, just like Linux does.
> 
> Signed-off-by: Marek Vasut 
> Cc: Albert Aribaud 
> Cc: Masahiro Yamada 
> Cc: Simon Glass 
> Cc: Tom Rini 

Reviewed-by: Tom Rini 

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 06/12] arm: lib: Fix uldivmod.S build on Thumb2

[Marek Vasut]

This assembler source won't build in Thumb2 mode, so fix it adding
the necessary Thumb2 conditional macros from unified.h .

This patch also defines CONFIG_THUMB2_KERNEL and CONFIG_ARM_ASM_UNIFIED
which is necessary for correct build of these files both in ARM and
Thumb mode, just like Linux does.

Signed-off-by: Marek Vasut 
Cc: Albert Aribaud 
Cc: Masahiro Yamada 
Cc: Simon Glass 
Cc: Tom Rini 
---
 arch/arm/lib/uldivmod.S | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/arm/lib/uldivmod.S b/arch/arm/lib/uldivmod.S
index 426c2f2..2efcd73 100644
--- a/arch/arm/lib/uldivmod.S
+++ b/arch/arm/lib/uldivmod.S
@@ -9,10 +9,6 @@
 #include 
 #include 
 
-/* We don't use Thumb instructions for now */
-#define ARM(x...)  x
-#define THUMB(x...)
-
 /*
  * A, Q = r0 + (r1 << 32)
  * B, R = r2 + (r3 << 32)
@@ -226,7 +222,9 @@ THUMB(  orrpl   A_0, A_0, TMP   )
@ Shift A to the right by the appropriate amount.
rsb D_1, D_0, #32
mov Q_0, A_0, lsr D_0
-   orr Q_0, A_1, lsl D_1
+ ARM(   orr Q_0, Q_0, A_1, lsl D_1 )
+ THUMB(lsl A_1, D_1)
+ THUMB(orr Q_0, A_1)
mov Q_1, A_1, lsr D_0
@ Move C to R
mov R_0, C_0
-- 
2.7.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot