diff options
| author | Keun-young Park <keunyoung@google.com> | 2014-08-14 18:37:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-14 16:10:21 +0000 |
| commit | 2decc77814e729df47464a504123f9b398ac7077 (patch) | |
| tree | 336200395c6ccae12209ae9cd023cc22002c4b95 | |
| parent | 35f30c5ab8089f38681d2fdd416c00aebef5a7ff (diff) | |
| parent | 5c51a5898e4a97c19b83c2e366355c41718c5e10 (diff) | |
| download | fdk-aac-2decc77814e729df47464a504123f9b398ac7077.tar.gz fdk-aac-2decc77814e729df47464a504123f9b398ac7077.tar.bz2 fdk-aac-2decc77814e729df47464a504123f9b398ac7077.zip | |
Merge "[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 |