shithub: dav1d

Download patch

ref: 162ba33db1dafc37f142836fd58a2867012072b0
parent: 82eda83acd4b903d9a1ea03687951f3d6d8cd6b8
author: Martin Storsjö <martin@martin.st>
date: Sat Nov 30 19:09:14 EST 2019

arm: 32: ipred: Fix assembling with older binutils

--- a/src/arm/32/ipred.S
+++ b/src/arm/32/ipred.S
@@ -615,8 +615,8 @@
         vadd.s16        d0,  d0,  d1
         vshl.u16        d0,  d0,  d28
         beq             1f                  // h = 8/16
-        mov             lr,  #(0x3334/2)
-        mov             r5,  #(0x5556/2)
+        movw            lr,  #(0x3334/2)
+        movw            r5,  #(0x5556/2)
         cmp             r4,  #16
         it              ne
         movne           lr,  r5
@@ -651,8 +651,8 @@
         vshl.u16        d0,  d0,  d28
         beq             1f                  // h = 4/16/32
         cmp             r4,  #32
-        mov             lr,  #(0x3334/2)
-        mov             r5,  #(0x5556/2)
+        movw            lr,  #(0x3334/2)
+        movw            r5,  #(0x5556/2)
         it              ne
         movne           lr,  r5
         vdup.16         q12, lr
@@ -688,8 +688,8 @@
         vshl.u16        d0,  d0,  d28
         beq             1f                  // h = 4/8/32/64
         tst             r4,  #(32+16+8)     // 16 added to make a consecutive bitmask
-        mov             lr,  #(0x3334/2)
-        mov             r5,  #(0x5556/2)
+        movw            lr,  #(0x3334/2)
+        movw            r5,  #(0x5556/2)
         it              ne
         movne           lr,  r5
         vdup.16         q12, lr
@@ -732,8 +732,8 @@
         vshl.u16        d4,  d0,  d28
         beq             1f                  // h = 8/16/64
         cmp             r4,  #8
-        mov             lr,  #(0x3334/2)
-        mov             r5,  #(0x5556/2)
+        movw            lr,  #(0x3334/2)
+        movw            r5,  #(0x5556/2)
         it              ne
         movne           lr,  r5
         vdup.16         q12, lr
@@ -796,7 +796,7 @@
         vadd.s16        d0,  d0,  d3
         vshl.u16        d18, d0,  d28
         beq             1f                  // h = 16/32
-        mov             lr,  #(0x5556/2)
+        movw            lr,  #(0x5556/2)
         movt            lr,  #(0x3334/2)
         mov             r5,  r4
         and             r5,  r5,  #31