diff options
| author | Keun-young Park <keunyoung@google.com> | 2014-08-14 18:42:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-14 18:42:23 +0000 |
| commit | 8d8580c267fcf99a7938a90ee6029e2dad8a8426 (patch) | |
| tree | 004adfdea01aad68f328c0b5dc65f9b98619e7a8 | |
| parent | 6792cf6361ff339e336287affb0bfe54bf6957a9 (diff) | |
| parent | 2decc77814e729df47464a504123f9b398ac7077 (diff) | |
| download | android_external_aac-8d8580c267fcf99a7938a90ee6029e2dad8a8426.tar.gz android_external_aac-8d8580c267fcf99a7938a90ee6029e2dad8a8426.tar.bz2 android_external_aac-8d8580c267fcf99a7938a90ee6029e2dad8a8426.zip | |
am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"
* commit '2decc77814e729df47464a504123f9b398ac7077':
[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
| -rw-r--r-- | libFDK/include/cplx_mul.h | 2 | ||||
| -rw-r--r-- | libFDK/include/mips/cplx_mul.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/include/cplx_mul.h b/libFDK/include/cplx_mul.h index 093ffa6..ce5c9f7 100644 --- a/libFDK/include/cplx_mul.h +++ b/libFDK/include/cplx_mul.h @@ -96,7 +96,7 @@ amm-info@iis.fraunhofer.de #if defined(__CC_ARM) || defined(__arm__) || defined(_M_ARM) /* cppp replaced: elif */ #include "arm/cplx_mul.h" -#elif defined(__GNUC__) && defined(__mips__) /* cppp replaced: elif */ +#elif defined(__GNUC__) && defined(__mips__) && __mips_isa_rev < 6 #include "mips/cplx_mul.h" #endif /* #if defined all cores: bfin, arm, etc. */ diff --git a/libFDK/include/mips/cplx_mul.h b/libFDK/include/mips/cplx_mul.h index e05d2b6..43cdbd0 100644 --- a/libFDK/include/mips/cplx_mul.h +++ b/libFDK/include/mips/cplx_mul.h @@ -89,7 +89,7 @@ amm-info@iis.fraunhofer.de ******************************************************************************/ -#if defined(__GNUC__) && defined(__mips__) +#if defined(__GNUC__) && defined(__mips__) && __mips_isa_rev < 6 //#define FUNCTION_cplxMultDiv2_32x16 |