Fix compilation on mips64el

Origin: upstream, https://github.com/xianyi/OpenBLAS/commit/2db0b2e4453b0a502cf336f6288688c23246d202
Applied-Upstream: 0.3.20
Last-Update: 2022-01-10

Last-Update: 2022-01-10
Gbp-Pq: Name mips64el.patch

diff --git a/cpuid_mips.c b/cpuid_mips.c
index 1946455d83d843b5522bdd17f74387c30ebef14f..d787e7120dea110987cbe10e31a9cb69d167cdf5 100644 (file)
--- a/cpuid_mips.c
+++ b/cpuid_mips.c
@@ -165,7 +165,7 @@ void get_cpuconfig(void){
   }else{
     printf("#define UNKNOWN\n");
   }
-  if (!get_feature(msa)) printf("#define NO_MSA\n");
+  if (!get_feature("msa")) printf("#define NO_MSA\n");
 }
 
 void get_libname(void){
@@ -193,7 +193,7 @@ int get_feature(char *search)
         while (fgets(buffer, sizeof(buffer), infile))
         {
 
-                if (!strncmp("Features", buffer, 8))
+                if (!strncmp("Features", buffer, 8) || !strncmp("ASEs implemented", buffer, 16))
                 {
                         p = strchr(buffer, ':') + 2;
                         break;
@@ -207,7 +207,7 @@ int get_feature(char *search)
         t = strtok(p," ");
         while( t = strtok(NULL," "))
         {
-                if (!strcmp(t, search))   { return(1); }
+                if (strstr(t, search))   { return(1); }
         }
 
 #endif

diff --git a/cpuid_mips64.c b/cpuid_mips64.c
index 97743bc437421d5f7ce6f6cf2804c7c7ef0baaec..8753ee3f096884f2744e9f1e04363b3472a672d2 100644 (file)
--- a/cpuid_mips64.c
+++ b/cpuid_mips64.c
@@ -201,7 +201,7 @@ void get_cpuconfig(void){
     printf("#define DTB_SIZE 4096\n");
     printf("#define L2_ASSOCIATIVE 8\n");
   }
-  if (!get_feature(msa)) printf("#define NO_MSA\n");
+  if (!get_feature("msa")) printf("#define NO_MSA\n");
 }
 
 void get_libname(void){
@@ -233,7 +233,7 @@ int get_feature(char *search)
         while (fgets(buffer, sizeof(buffer), infile))
         {
 
-                if (!strncmp("Features", buffer, 8))
+                if (!strncmp("Features", buffer, 8) || !strncmp("ASEs implemented", buffer, 16))
                 {
                         p = strchr(buffer, ':') + 2;
                         break;
@@ -247,7 +247,7 @@ int get_feature(char *search)
         t = strtok(p," ");
         while( t = strtok(NULL," "))
         {
-                if (!strcmp(t, search))   { return(1); }
+                if (strstr(t, search))   { return(1); }
         }
 
 #endif