summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-04-02 16:15:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-02 16:15:59 +0000
commit17b5ca1e665a1bbe17387b36fcce8f6b52513d5e (patch)
treed966ca1c9a5a66a43e01d696d39a655339bf9b90
parent3ebb877e52a2661de56c3f44827f33824e735730 (diff)
parentdd46c864c12f592896e4da14758accbcd54afd10 (diff)
downloadnative-17b5ca1e665a1bbe17387b36fcce8f6b52513d5e.tar.gz
Merge "opengl: fix UAL conformity"
-rw-r--r--opengl/libagl/fixed_asm.S2
-rw-r--r--opengl/libagl/iterators.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/fixed_asm.S b/opengl/libagl/fixed_asm.S
index 05044f2cd0..5e08856d0a 100644
--- a/opengl/libagl/fixed_asm.S
+++ b/opengl/libagl/fixed_asm.S
@@ -17,7 +17,7 @@
.text
- .align
+ .align 2
.global gglFloatToFixed
.type gglFloatToFixed, %function
diff --git a/opengl/libagl/iterators.S b/opengl/libagl/iterators.S
index 8c8648212f..8fe9039088 100644
--- a/opengl/libagl/iterators.S
+++ b/opengl/libagl/iterators.S
@@ -17,7 +17,7 @@
.text
- .align
+ .align 2
.arm
.global iterators0032