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 /libpixelflinger/tests | |
| 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 'libpixelflinger/tests')
| -rw-r--r-- | libpixelflinger/tests/codegen/codegen.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpixelflinger/tests/codegen/codegen.cpp b/libpixelflinger/tests/codegen/codegen.cpp index 46c1ccc..148b6f4 100644 --- a/libpixelflinger/tests/codegen/codegen.cpp +++ b/libpixelflinger/tests/codegen/codegen.cpp @@ -9,16 +9,18 @@ #include "codeflinger/CodeCache.h" #include "codeflinger/GGLAssembler.h" #include "codeflinger/ARMAssembler.h" +#if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6 #include "codeflinger/MIPSAssembler.h" +#endif #include "codeflinger/Arm64Assembler.h" -#if defined(__arm__) || defined(__mips__) || defined(__aarch64__) +#if defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6) || defined(__aarch64__) # define ANDROID_ARM_CODEGEN 1 #else # define ANDROID_ARM_CODEGEN 0 #endif -#if defined (__mips__) +#if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6 #define ASSEMBLY_SCRATCH_SIZE 4096 #elif defined(__aarch64__) #define ASSEMBLY_SCRATCH_SIZE 8192 @@ -52,7 +54,7 @@ static void ggl_test_codegen(uint32_t n, uint32_t p, uint32_t t0, uint32_t t1) GGLAssembler assembler( new ARMAssembler(a) ); #endif -#if defined(__mips__) && !defined(__LP64__) +#if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6 GGLAssembler assembler( new ArmToMipsAssembler(a) ); #endif |