am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"

* commit '2decc778': [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6

am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"
* commit '2decc778': [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
8d8580c2 · Keun-young Park · Android Git Automerger · 6792cf63 · 2decc778 · 8d8580c2
Commit 8d8580c2 authored Aug 14, 2014 by Keun-young Park Committed by Android Git Automerger Aug 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

libFDK/include/cplx_mul.h libFDK/include/cplx_mul.h +1 -1

libFDK/include/mips/cplx_mul.h libFDK/include/mips/cplx_mul.h +1 -1

No files found.
--- 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. */

--- 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