From 5c51a5898e4a97c19b83c2e366355c41718c5e10 Mon Sep 17 00:00:00 2001
From: Duane Sand <duane.sand@imgtec.com>
Date: Tue, 8 Jul 2014 17:48:36 -0700
Subject: [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6

Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc
---
 libFDK/include/cplx_mul.h      | 2 +-
 libFDK/include/mips/cplx_mul.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libFDK/include')

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
-- 
cgit v1.2.3