LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: lib: Repair Warning: conditional infixes are deprecated in unified syntax 

Fix the following warning when building for thumb2 target by tweaking the
instruction syntax:

Warning: conditional infixes are deprecated in unified syntax

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Marek Vasut 2016-05-26 18:01:43 +02:00 committed by Tom Rini
parent 7b9f9c5d3b
commit 40d67c75e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/lib/div64.S
View File

@ -88,8 +88,8 @@ UNWIND(.fnstart)
@ Break out early if dividend reaches 0. @ Break out early if dividend reaches 0.
2: cmp xh, yl 2: cmp xh, yl
orrcs yh, yh, ip orrcs yh, yh, ip
subcss xh, xh, yl subscs xh, xh, yl
movnes ip, ip, lsr #1 movsne ip, ip, lsr #1
mov yl, yl, lsr #1 mov yl, yl, lsr #1
bne 2b bne 2b

4
arch/arm/lib/lib1funcs.S
View File

@ -84,7 +84,7 @@
subhs \dividend, \dividend, \divisor, lsr #3 subhs \dividend, \dividend, \divisor, lsr #3
orrhs \result, \result, \curbit, lsr #3 orrhs \result, \result, \curbit, lsr #3
cmp \dividend, #0 @ Early termination? cmp \dividend, #0 @ Early termination?
movnes \curbit, \curbit, lsr #4 @ No, any more bits to do? movsne \curbit, \curbit, lsr #4 @ No, any more bits to do?
movne \divisor, \divisor, lsr #4 movne \divisor, \divisor, lsr #4
bne 1b bne 1b
@ -170,7 +170,7 @@
subhs \dividend, \dividend, \divisor, lsr #3 subhs \dividend, \dividend, \divisor, lsr #3
cmp \dividend, #1 cmp \dividend, #1
mov \divisor, \divisor, lsr #4 mov \divisor, \divisor, lsr #4
subges \order, \order, #4 subsge \order, \order, #4
bge 1b bge 1b
tst \order, #3 tst \order, #3