  .if \align == 0
          ADJ_ALIGN_DOUBLEWORD_D 1, r4, r5, r6, r7, r8
  .elseif \align == 1
-@@ -624,7 +631,7 @@
- put_pixels8_xy2_arm:
+@@ -593,7 +600,7 @@ function put_no_rnd_pixels8_y2_arm, expo
+ function put_pixels8_xy2_arm, export=1
          @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
          @ block = word aligned, pixles = unaligned
 -        pld [r1]
 +        PLD ( pld [r1] )
          stmfd sp!, {r4-r11,lr} @ R14 is also called LR
-         adrl r12, 5f
-         ands r4, r1, #3
-@@ -661,7 +668,7 @@
- put_no_rnd_pixels8_xy2_arm:
+         JMP_ALIGN r5, r1
+ 1:
+@@ -616,7 +623,7 @@ function put_pixels8_xy2_arm, export=1
+ function put_no_rnd_pixels8_xy2_arm, export=1
          @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
          @ block = word aligned, pixles = unaligned
 -        pld [r1]
 +        PLD ( pld [r1] )
          stmfd sp!, {r4-r11,lr} @ R14 is also called LR
-         adrl r12, 5f
-         ands r4, r1, #3
+         JMP_ALIGN r5, r1
+ 1:

         ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6
         subs r3, r3, #1
         RND_AVG32 r10, r11, r7, r8, r4, r5, r12
@@ -447,7 +454,7 @@
 put_no_rnd_pixels8_y2_arm:
         @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
         @ block = word aligned, pixles = unaligned
-        pld [r1]
+        PLD ( pld [r1] )
         stmfd sp!, {r4-r11,lr} @ R14 is also called LR
         adr r5, 5f
         ands r4, r1, #3
@@ -461,13 +468,13 @@
         add r1, r1, r2
 6:      ldmia r1, {r6-r7}
         add r1, r1, r2

         ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6
         subs r3, r3, #1
         NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12
@@ -478,18 +485,18 @@ function put_no_rnd_pixels8_y2_arm, expo
 3:
         ldmia r1, {r4-r6}
         add r1, r1, r2
