diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-05 21:43:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-05 21:43:16 +0000 |
| commit | a613844e137d93c7c6dc8efb8f2ca314764f0aae (patch) | |
| tree | 8c572d543f66fd089c10e336a3f059805e617627 /include/private | |
| parent | 4a96142c455af4bc78aca1d152995c36bc75a9e9 (diff) | |
| parent | e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd (diff) | |
| download | system_core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.zip system_core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.tar.gz system_core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.tar.bz2 | |
am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/pixelflinger/ggl_fixed.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/pixelflinger/ggl_fixed.h b/include/private/pixelflinger/ggl_fixed.h index d0493f3..787f620 100644 --- a/include/private/pixelflinger/ggl_fixed.h +++ b/include/private/pixelflinger/ggl_fixed.h @@ -190,7 +190,7 @@ inline int64_t gglMulii(int32_t x, int32_t y) ); return res; } -#elif defined(__mips__) +#elif defined(__mips__) && __mips_isa_rev < 6 /*inline MIPS implementations*/ inline GGLfixed gglMulx(GGLfixed a, GGLfixed b, int shift) CONST; |