[x264-devel] [PATCH] Unified syntax GAS flag

[George Stephanos]

---
 common/arm/asm.S     |    2 ++
 common/arm/quant-a.S |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index 8e70403..af2fbfb 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -26,6 +26,8 @@
 
 #include "config.h"
 
+.syntax unified
+
 #ifdef PREFIX
 #   define EXTERN_ASM _
 #else
diff --git a/common/arm/quant-a.S b/common/arm/quant-a.S
index ec1aed5..3d435cf 100644
--- a/common/arm/quant-a.S
+++ b/common/arm/quant-a.S
@@ -272,7 +272,7 @@ dequant_4x4_dc_rshift:
 // int coeff_last( int16_t *l )
 function x264_coeff_last4_arm
     ldrd        r2,  [r0]
-    subs        r0,  r3,  #0
+    movs        r0,  r3
     movne       r0,  #2
     movne       r2,  r3
     lsrs        r2,  r2,  #16
@@ -300,7 +300,7 @@ function x264_coeff_last\size\()_neon
 
     subs        r1,  ip,  r1,  lsr #2
     addge       r0,  r1,  #\size - 8
-    sublts      r0,  r3,  r0,  lsr #2
+    subslt      r0,  r3,  r0,  lsr #2
     movlt       r0,  #0
     bx          lr
 .endfunc
@@ -349,7 +349,7 @@ function x264_coeff_last64_neon
 
     subs        r1,  ip,  r1
     addge       r0,  r1,  #32
-    sublts      r0,  ip,  r0
+    subslt      r0,  ip,  r0
     movlt       r0,  #0
     bx          lr
 .endfunc
-- 
1.7.4.1