4 files changed, 25 insertions, 22 deletions

diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
index 97a87a8b59..90eb5031c7 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
@@ -43,8 +43,8 @@
     ldrsh  r7, [r0, #12]          /* d2 */
     ldrsh  r8, [r0, #14]          /* d3 */
     orrs   r9, r2, r3
-    orreqs r9, r4, r5
-    orreqs r9, r6, r7
+    orrseq r9, r4, r5
+    orrseq r9, r6, r7
     cmpeq  r8, #0
     bne    2f
     mov    r1, r1, asl #15
@@ -320,7 +320,7 @@ mpeg2_idct_copy:
 mpeg2_idct_add:
     cmp    r0, #129
     mov    r0, r1
-    ldreqsh r1, [r0, #0]
+    ldrsheq r1, [r0, #0]
     bne    1f
     and    r1, r1, #0x70
     cmp    r1, #0x40
diff --git a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
index dc53cbd7bd..a259721410 100644
--- a/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
@@ -19,6 +19,7 @@
  *
  ****************************************************************************/
 
+#include "config.h"
 
     .global     mpeg2_idct_copy
     .type       mpeg2_idct_copy, %function
@@ -228,7 +229,7 @@ mpeg2_idct_copy:
 mpeg2_idct_add:
     cmp    r0, #129
     mov    r0, r1
-    ldreqsh r1, [r0, #0]
+    ldrsheq r1, [r0, #0]
     bne    1f
     and    r1, r1, #0x70
     cmp    r1, #0x40
@@ -260,7 +261,7 @@ mpeg2_idct_add:
     strd   r4, [r1]             @ r4, r5
     add    r1, r1, r2
     cmp    r0, r3
-    ldrlod r8, [r1]             @ r8, r9
+    ldrdlo r8, [r1]             @ r8, r9
     blo    2b
 
     ldmfd  sp!, {r4-r11, pc}
@@ -291,7 +292,7 @@ mpeg2_idct_add:
     strd   r0, [r2]             @ r0, r1
     add    r2, r2, r3
     cmp    r2, r12
-    ldrlod r0, [r2]             @ r0, r1
+    ldrdlo r0, [r2]             @ r0, r1
     blo    4b
 
     ldmfd  sp!, {r4, pc}
diff --git a/apps/plugins/mpegplayer/mpeg_misc.h b/apps/plugins/mpegplayer/mpeg_misc.h
index e04db0e19d..68ee8cac3c 100644
--- a/apps/plugins/mpegplayer/mpeg_misc.h
+++ b/apps/plugins/mpegplayer/mpeg_misc.h
@@ -53,12 +53,13 @@ enum state_enum
 #define CMP_3_CONST(_a, _b) \
     ({  int _x;                             \
         asm volatile (                      \
+            ".syntax unified          \n"   \
             "ldrb   %[x], [%[a], #0]  \n"   \
             "eors   %[x], %[x], %[b0] \n"   \
-            "ldreqb %[x], [%[a], #1]  \n"   \
-            "eoreqs %[x], %[x], %[b1] \n"   \
-            "ldreqb %[x], [%[a], #2]  \n"   \
-            "eoreqs %[x], %[x], %[b2] \n"   \
+            "ldrbeq %[x], [%[a], #1]  \n"   \
+            "eorseq %[x], %[x], %[b1] \n"   \
+            "ldrbeq %[x], [%[a], #2]  \n"   \
+            "eorseq %[x], %[x], %[b2] \n"   \
             : [x]"=&r"(_x)                  \
             : [a]"r"(_a),                   \
               [b0]"i"(((_b) >> 24) & 0xff), \
@@ -70,14 +71,15 @@ enum state_enum
 #define CMP_4_CONST(_a, _b) \
     ({  int _x;                             \
         asm volatile (                      \
+            ".syntax unified          \n"   \
             "ldrb   %[x], [%[a], #0]  \n"   \
             "eors   %[x], %[x], %[b0] \n"   \
-            "ldreqb %[x], [%[a], #1]  \n"   \
-            "eoreqs %[x], %[x], %[b1] \n"   \
-            "ldreqb %[x], [%[a], #2]  \n"   \
-            "eoreqs %[x], %[x], %[b2] \n"   \
-            "ldreqb %[x], [%[a], #3]  \n"   \
-            "eoreqs %[x], %[x], %[b3] \n"   \
+            "ldrbeq %[x], [%[a], #1]  \n"   \
+            "eorseq %[x], %[x], %[b1] \n"   \
+            "ldrbeq %[x], [%[a], #2]  \n"   \
+            "eorseq %[x], %[x], %[b2] \n"   \
+            "ldrbeq %[x], [%[a], #3]  \n"   \
+            "eorseq %[x], %[x], %[b3] \n"   \
             : [x]"=&r"(_x)                  \
             : [a]"r"(_a),                   \
               [b0]"i"(((_b) >> 24) & 0xff), \
diff --git a/apps/recorder/jpeg_idct_arm.S b/apps/recorder/jpeg_idct_arm.S
index e7eb4b87f1..1f2603da1b 100644
--- a/apps/recorder/jpeg_idct_arm.S
+++ b/apps/recorder/jpeg_idct_arm.S
@@ -410,7 +410,7 @@ jpeg_idct8v:
 #if ARM_ARCH < 5
     mov    r8,  r4,  lsl #16
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4, lsr #16
+    orrseq r9,  r5,  r4, lsr #16
     bne    2f
     mov    r8,  r8,  asr #14
     strh   r8,  [r2]
@@ -505,7 +505,7 @@ jpeg_idct8v:
 #else /* ARMv5+ */
     mov    r12, r4,  lsl #16
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4,  lsr #16
+    orrseq r9,  r5,  r4,  lsr #16
     bne    2f
     mov    r12, r12, asr #14
     strh   r12, [r2]
@@ -615,7 +615,7 @@ jpeg_idct8h:
 #if ARM_ARCH < 5
     add    r8,  r14, r4,  lsl #16
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4, lsr #16
+    orrseq r9,  r5,  r4, lsr #16
     bne    2f
     mov    r8,  r8,  asr #21
     cmp    r8,  #255
@@ -727,7 +727,7 @@ jpeg_idct8h:
 #else /* ARMv5+ */
     add    r12, r14, r4,  lsl #16
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4,  lsr #16
+    orrseq r9,  r5,  r4,  lsr #16
     bne    2f
     mov    r12, r12, asr #21
     cmp    r12, #255
@@ -835,7 +835,7 @@ jpeg_idct8v:
 1:
     ldmia  r0!, { r4-r7 }
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4,  lsr #16
+    orrseq r9,  r5,  r4,  lsr #16
     bne    2f
     mov    r4,  r4,  lsl #2
     strh   r4,  [r2]
@@ -939,7 +939,7 @@ jpeg_idct8h:
     ldmia  r0!, { r4-r7 }
     sadd16 r4,  r4,  r14
     orrs   r9,  r6,  r7
-    orreqs r9,  r5,  r4,  lsr #16
+    orrseq r9,  r5,  r4,  lsr #16
     bne    2f
     sxth   r4,  r4
     usat   r4,  #8,  r4,  asr #5