Merge \\"Replace .align with .balign to avoid ambiguity\\" am: 78ea54f735

am: b36ebd0593 Change-Id: Ia4bb3224180a00680a24cf66738d7fde115d524b
2016-07-14 00:47:27 +00:00 · 2016-07-14 00:47:27 +00:00 · 3d43ef9135
commit 3d43ef9135
parent 3531da94c8 b36ebd0593
12 changed files with 12 additions and 12 deletions
--- a/libpixelflinger/arch-arm64/col32cb16blend.S
+++ b/libpixelflinger/arch-arm64/col32cb16blend.S
@ -26,7 +26,7 @@
 * SUCH DAMAGE.
 */
    .text
-    .align 0
+    .balign 0

    .global scanline_col32cb16blend_arm64

--- a/libpixelflinger/arch-arm64/t32cb16blend.S
+++ b/libpixelflinger/arch-arm64/t32cb16blend.S
@ -26,7 +26,7 @@
 * SUCH DAMAGE.
 */
    .text
-    .align 0
+    .balign 0

    .global scanline_t32cb16blend_arm64

--- a/libpixelflinger/arch-mips/col32cb16blend.S
+++ b/libpixelflinger/arch-mips/col32cb16blend.S
@ -59,7 +59,7 @@
       .endm

       .text
-       .align 4
+       .balign 4

       .global scanline_col32cb16blend_mips
       .ent    scanline_col32cb16blend_mips
--- a/libpixelflinger/arch-mips/t32cb16blend.S
+++ b/libpixelflinger/arch-mips/t32cb16blend.S
@ -178,7 +178,7 @@ DBG .set    pop
 #endif

    .text
-    .align 4
+    .balign 4

    .global scanline_t32cb16blend_mips
    .ent    scanline_t32cb16blend_mips
--- a/libpixelflinger/arch-mips64/col32cb16blend.S
+++ b/libpixelflinger/arch-mips64/col32cb16blend.S
@ -53,7 +53,7 @@
    .endm

    .text
-    .align
+    .balign 4

    .global scanline_col32cb16blend_mips64
    .ent    scanline_col32cb16blend_mips64
--- a/libpixelflinger/arch-mips64/t32cb16blend.S
+++ b/libpixelflinger/arch-mips64/t32cb16blend.S
@ -75,7 +75,7 @@
    .endm

    .text
-    .align
+    .balign 4

    .global scanline_t32cb16blend_mips64
    .ent    scanline_t32cb16blend_mips64
--- a/libpixelflinger/col32cb16blend.S
+++ b/libpixelflinger/col32cb16blend.S
@ -16,7 +16,7 @@
 */

    .text
-    .align 4
+    .balign 4

    .global scanline_col32cb16blend_arm

--- a/libpixelflinger/col32cb16blend_neon.S
+++ b/libpixelflinger/col32cb16blend_neon.S
@ -17,7 +17,7 @@


    .text
-    .align 4
+    .balign 4

    .global scanline_col32cb16blend_neon

--- a/libpixelflinger/rotate90CW_4x4_16v6.S
+++ b/libpixelflinger/rotate90CW_4x4_16v6.S
@ -17,7 +17,7 @@


    .text
-    .align 4
+    .balign 4
    
    .global rotate90CW_4x4_16v6

--- a/libpixelflinger/t32cb16blend.S
+++ b/libpixelflinger/t32cb16blend.S
@ -18,7 +18,7 @@

 	.text
 	.syntax unified
-	.align 4
+	.balign 4
 	
 	.global scanline_t32cb16blend_arm

--- a/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S
+++ b/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S
@ -27,7 +27,7 @@
 */

    .text
-    .align 0
+    .balign 0

    .global asm_test_jacket

--- a/libpixelflinger/tests/arch-mips64/assembler/asm_mips_test_jacket.S
+++ b/libpixelflinger/tests/arch-mips64/assembler/asm_mips_test_jacket.S
@ -27,7 +27,7 @@
 #  */

    .text
-    .align 8
+    .balign 8

    .global asm_mips_test_jacket