Ignore compiler support for MIPS MSA if the cpu lacks this capability

diff --git a/Makefile.system b/Makefile.system
index 16e8fcbd6b534ac24d78eec4ad01cceb2dddfa6b..3b55fb1045241f0fa59434bc57379e02af995df4 100644 (file)
--- a/Makefile.system
+++ b/Makefile.system
@@ -1664,8 +1664,10 @@ export HAVE_VFP
 export HAVE_VFPV3
 export HAVE_VFPV4
 export HAVE_NEON
-export HAVE_MSA
-export MSA_FLAGS
+ifndef NO_MSA
+  export HAVE_MSA
+  export MSA_FLAGS
+endif
 export KERNELDIR
 export FUNCTION_PROFILE
 export TARGET_CORE

diff --git a/param.h b/param.h
index 23f406d7444cc278f0d8f791e62782479ade152f..22f7b83adb830146340f28324a9f90d50412847b 100644 (file)
--- a/param.h
+++ b/param.h
@@ -2884,7 +2884,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GEMM_DEFAULT_OFFSET_B  0
 #define GEMM_DEFAULT_ALIGN (BLASLONG) 0x03fffUL
 
-#ifdef HAVE_MSA
+#if defined(HAVE_MSA) && !defined(NO_MSA)
 #define SGEMM_DEFAULT_UNROLL_M  8
 #define SGEMM_DEFAULT_UNROLL_N  8