commit 171f312440245bf24ac1ff244987be9634b26462
author Pirama Arumuga Nainar <pirama@google.com> Fri Feb 15 12:22:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 15 12:22:41 2019 -0800
tree 294345fdbdc10832d1b578e851cb3866827cf2dd
parent d930e50a48f40a4d820b93f39894d28a01d94eb5
parent 1648058de27a0f8080866efe38cd78dabd067de2

Merge "Mark gglMulx and gglMulAddx as always_inline" am: e479b47e0e
am: cc464855e6

Change-Id: Ic6388998fb2a4acf4f1abf54056ed820f4b48f3c

libpixelflinger/include/private/pixelflinger/ggl_fixed.h

diff --git a/libpixelflinger/include/private/pixelflinger/ggl_fixed.h b/libpixelflinger/include/private/pixelflinger/ggl_fixed.h
index 7f39e9b..4217a89 100644
--- a/libpixelflinger/include/private/pixelflinger/ggl_fixed.h
+++ b/libpixelflinger/include/private/pixelflinger/ggl_fixed.h
@@ -107,7 +107,7 @@
 
 // inline ARM implementations
 inline GGLfixed gglMulx(GGLfixed x, GGLfixed y, int shift) CONST;
-inline GGLfixed gglMulx(GGLfixed x, GGLfixed y, int shift) {
+__attribute__((always_inline)) inline GGLfixed gglMulx(GGLfixed x, GGLfixed y, int shift) {
     GGLfixed result, t;
     if (__builtin_constant_p(shift)) {
     asm("smull  %[lo], %[hi], %[x], %[y]            \n"
@@ -130,7 +130,8 @@
 }
 
 inline GGLfixed gglMulAddx(GGLfixed x, GGLfixed y, GGLfixed a, int shift) CONST;
-inline GGLfixed gglMulAddx(GGLfixed x, GGLfixed y, GGLfixed a, int shift) {
+__attribute__((always_inline)) inline GGLfixed gglMulAddx(GGLfixed x, GGLfixed y, GGLfixed a,
+                                                          int shift) {
     GGLfixed result, t;
     if (__builtin_constant_p(shift)) {
     asm("smull  %[lo], %[hi], %[x], %[y]            \n"