diff options
author | Treehugger Robot | 2016-07-13 16:08:49 -0500 |
---|---|---|
committer | Gerrit Code Review | 2016-07-13 16:08:49 -0500 |
commit | 78ea54f735926c94ed19e1d2f7c5aacbda4ba7bf (patch) | |
tree | 192b417b2f79e271483b9507af673404564281d0 | |
parent | dc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff) | |
parent | 1109f115bd016e82a4d8304b17fdaa4d3e577ba4 (diff) | |
download | platform-system-core-android-wear-n-preview-2.tar.gz platform-system-core-android-wear-n-preview-2.tar.xz platform-system-core-android-wear-n-preview-2.zip |
Merge "Replace .align with .balign to avoid ambiguity"android-wear-n-preview-2
-rw-r--r-- | libpixelflinger/arch-arm64/col32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/arch-arm64/t32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/arch-mips/col32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/arch-mips/t32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/arch-mips64/col32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/arch-mips64/t32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/col32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/col32cb16blend_neon.S | 2 | ||||
-rw-r--r-- | libpixelflinger/rotate90CW_4x4_16v6.S | 2 | ||||
-rw-r--r-- | libpixelflinger/t32cb16blend.S | 2 | ||||
-rw-r--r-- | libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S | 2 | ||||
-rw-r--r-- | libpixelflinger/tests/arch-mips64/assembler/asm_mips_test_jacket.S | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/libpixelflinger/arch-arm64/col32cb16blend.S b/libpixelflinger/arch-arm64/col32cb16blend.S index 8d9c7c419..84596f90b 100644 --- a/libpixelflinger/arch-arm64/col32cb16blend.S +++ b/libpixelflinger/arch-arm64/col32cb16blend.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * SUCH DAMAGE. | 26 | * SUCH DAMAGE. |
27 | */ | 27 | */ |
28 | .text | 28 | .text |
29 | .align 0 | 29 | .balign 0 |
30 | 30 | ||
31 | .global scanline_col32cb16blend_arm64 | 31 | .global scanline_col32cb16blend_arm64 |
32 | 32 | ||
diff --git a/libpixelflinger/arch-arm64/t32cb16blend.S b/libpixelflinger/arch-arm64/t32cb16blend.S index 230f47bb4..b1a950dbb 100644 --- a/libpixelflinger/arch-arm64/t32cb16blend.S +++ b/libpixelflinger/arch-arm64/t32cb16blend.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * SUCH DAMAGE. | 26 | * SUCH DAMAGE. |
27 | */ | 27 | */ |
28 | .text | 28 | .text |
29 | .align 0 | 29 | .balign 0 |
30 | 30 | ||
31 | .global scanline_t32cb16blend_arm64 | 31 | .global scanline_t32cb16blend_arm64 |
32 | 32 | ||
diff --git a/libpixelflinger/arch-mips/col32cb16blend.S b/libpixelflinger/arch-mips/col32cb16blend.S index 57a611547..810294c3a 100644 --- a/libpixelflinger/arch-mips/col32cb16blend.S +++ b/libpixelflinger/arch-mips/col32cb16blend.S | |||
@@ -59,7 +59,7 @@ | |||
59 | .endm | 59 | .endm |
60 | 60 | ||
61 | .text | 61 | .text |
62 | .align 4 | 62 | .balign 4 |
63 | 63 | ||
64 | .global scanline_col32cb16blend_mips | 64 | .global scanline_col32cb16blend_mips |
65 | .ent scanline_col32cb16blend_mips | 65 | .ent scanline_col32cb16blend_mips |
diff --git a/libpixelflinger/arch-mips/t32cb16blend.S b/libpixelflinger/arch-mips/t32cb16blend.S index b365fd861..1d2fb8f39 100644 --- a/libpixelflinger/arch-mips/t32cb16blend.S +++ b/libpixelflinger/arch-mips/t32cb16blend.S | |||
@@ -178,7 +178,7 @@ DBG .set pop | |||
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | .text | 180 | .text |
181 | .align 4 | 181 | .balign 4 |
182 | 182 | ||
183 | .global scanline_t32cb16blend_mips | 183 | .global scanline_t32cb16blend_mips |
184 | .ent scanline_t32cb16blend_mips | 184 | .ent scanline_t32cb16blend_mips |
diff --git a/libpixelflinger/arch-mips64/col32cb16blend.S b/libpixelflinger/arch-mips64/col32cb16blend.S index fea44911d..5baffb183 100644 --- a/libpixelflinger/arch-mips64/col32cb16blend.S +++ b/libpixelflinger/arch-mips64/col32cb16blend.S | |||
@@ -53,7 +53,7 @@ | |||
53 | .endm | 53 | .endm |
54 | 54 | ||
55 | .text | 55 | .text |
56 | .align | 56 | .balign 4 |
57 | 57 | ||
58 | .global scanline_col32cb16blend_mips64 | 58 | .global scanline_col32cb16blend_mips64 |
59 | .ent scanline_col32cb16blend_mips64 | 59 | .ent scanline_col32cb16blend_mips64 |
diff --git a/libpixelflinger/arch-mips64/t32cb16blend.S b/libpixelflinger/arch-mips64/t32cb16blend.S index d2f4d4905..3cb5f93e2 100644 --- a/libpixelflinger/arch-mips64/t32cb16blend.S +++ b/libpixelflinger/arch-mips64/t32cb16blend.S | |||
@@ -75,7 +75,7 @@ | |||
75 | .endm | 75 | .endm |
76 | 76 | ||
77 | .text | 77 | .text |
78 | .align | 78 | .balign 4 |
79 | 79 | ||
80 | .global scanline_t32cb16blend_mips64 | 80 | .global scanline_t32cb16blend_mips64 |
81 | .ent scanline_t32cb16blend_mips64 | 81 | .ent scanline_t32cb16blend_mips64 |
diff --git a/libpixelflinger/col32cb16blend.S b/libpixelflinger/col32cb16blend.S index 721fd7d21..39f94e164 100644 --- a/libpixelflinger/col32cb16blend.S +++ b/libpixelflinger/col32cb16blend.S | |||
@@ -16,7 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | .text | 18 | .text |
19 | .align 4 | 19 | .balign 4 |
20 | 20 | ||
21 | .global scanline_col32cb16blend_arm | 21 | .global scanline_col32cb16blend_arm |
22 | 22 | ||
diff --git a/libpixelflinger/col32cb16blend_neon.S b/libpixelflinger/col32cb16blend_neon.S index f0009201c..7ad34b051 100644 --- a/libpixelflinger/col32cb16blend_neon.S +++ b/libpixelflinger/col32cb16blend_neon.S | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | 18 | ||
19 | .text | 19 | .text |
20 | .align 4 | 20 | .balign 4 |
21 | 21 | ||
22 | .global scanline_col32cb16blend_neon | 22 | .global scanline_col32cb16blend_neon |
23 | 23 | ||
diff --git a/libpixelflinger/rotate90CW_4x4_16v6.S b/libpixelflinger/rotate90CW_4x4_16v6.S index de18c5431..78d13c31e 100644 --- a/libpixelflinger/rotate90CW_4x4_16v6.S +++ b/libpixelflinger/rotate90CW_4x4_16v6.S | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | 18 | ||
19 | .text | 19 | .text |
20 | .align 4 | 20 | .balign 4 |
21 | 21 | ||
22 | .global rotate90CW_4x4_16v6 | 22 | .global rotate90CW_4x4_16v6 |
23 | 23 | ||
diff --git a/libpixelflinger/t32cb16blend.S b/libpixelflinger/t32cb16blend.S index 6ba6136e5..5e4995a20 100644 --- a/libpixelflinger/t32cb16blend.S +++ b/libpixelflinger/t32cb16blend.S | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | .text | 19 | .text |
20 | .syntax unified | 20 | .syntax unified |
21 | .align 4 | 21 | .balign 4 |
22 | 22 | ||
23 | .global scanline_t32cb16blend_arm | 23 | .global scanline_t32cb16blend_arm |
24 | 24 | ||
diff --git a/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S b/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S index f44859f62..3f900f854 100644 --- a/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S +++ b/libpixelflinger/tests/arch-arm64/assembler/asm_test_jacket.S | |||
@@ -27,7 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | .text | 29 | .text |
30 | .align 0 | 30 | .balign 0 |
31 | 31 | ||
32 | .global asm_test_jacket | 32 | .global asm_test_jacket |
33 | 33 | ||
diff --git a/libpixelflinger/tests/arch-mips64/assembler/asm_mips_test_jacket.S b/libpixelflinger/tests/arch-mips64/assembler/asm_mips_test_jacket.S index 8a7f74202..705ee9bcf 100644 --- 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 @@ | |||
27 | # */ | 27 | # */ |
28 | 28 | ||
29 | .text | 29 | .text |
30 | .align 8 | 30 | .balign 8 |
31 | 31 | ||
32 | .global asm_mips_test_jacket | 32 | .global asm_mips_test_jacket |
33 | 33 | ||