Merge pull request #2873 from martin-frbg/issue2871

martin-frbg · web-flow · commit d3c0d6811b3b · 2020-10-01T06:38:22.000+02:00
Check for __linux rather than linux in cpuid code and benchmarks
diff --git a/benchmark/amax.c b/benchmark/amax.c
@@ -146,7 +146,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/amin.c b/benchmark/amin.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/asum.c b/benchmark/asum.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]){
   }
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/axpby.c b/benchmark/axpby.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/axpy.c b/benchmark/axpy.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/copy.c b/benchmark/copy.c
@@ -154,7 +154,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/dot.c b/benchmark/dot.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/geev.c b/benchmark/geev.c
@@ -214,7 +214,7 @@ int main(int argc, char *argv[]){
   }
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/gemm.c b/benchmark/gemm.c
@@ -197,7 +197,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/gemm3m.c b/benchmark/gemm3m.c
@@ -163,7 +163,7 @@ int main(int argc, char *argv[]){
 	loops = atoi(p);
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/gemv.c b/benchmark/gemv.c
@@ -181,7 +181,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/ger.c b/benchmark/ger.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/gesv.c b/benchmark/gesv.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/getri.c b/benchmark/getri.c
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]){
   }
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/hbmv.c b/benchmark/hbmv.c
@@ -158,7 +158,7 @@ int main(int argc, char *argv[]){
         exit(1);
     }
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/hemm.c b/benchmark/hemm.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/hemv.c b/benchmark/hemv.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/her.c b/benchmark/her.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/her2.c b/benchmark/her2.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]){
         fprintf(stderr,"Out of Memory!!\n");exit(1);
     }
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/her2k.c b/benchmark/her2k.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/herk.c b/benchmark/herk.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/hpmv.c b/benchmark/hpmv.c
@@ -155,7 +155,7 @@ int main(int argc, char *argv[]){
         exit(1);
     }
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/iamax.c b/benchmark/iamax.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/iamin.c b/benchmark/iamin.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/imax.c b/benchmark/imax.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/imin.c b/benchmark/imin.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/linpack.c b/benchmark/linpack.c
@@ -174,7 +174,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/max.c b/benchmark/max.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/min.c b/benchmark/min.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/nrm2.c b/benchmark/nrm2.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/rot.c b/benchmark/rot.c
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/rotm.c b/benchmark/rotm.c
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
         exit(1);
     }
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/scal.c b/benchmark/scal.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/spmv.c b/benchmark/spmv.c
@@ -163,7 +163,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/spr.c b/benchmark/spr.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/spr2.c b/benchmark/spr2.c
@@ -153,7 +153,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/swap.c b/benchmark/swap.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/symm.c b/benchmark/symm.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/symv.c b/benchmark/symv.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/syr.c b/benchmark/syr.c
@@ -144,7 +144,7 @@ int main(int argc, char *argv[]){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
   }
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/syr2.c b/benchmark/syr2.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/syr2k.c b/benchmark/syr2k.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/syrk.c b/benchmark/syrk.c
@@ -159,7 +159,7 @@ int main(int argc, char *argv[]){
 
 
 
-#ifdef linux
+#ifdef __linux
   srandom(getpid());
 #endif
 
diff --git a/benchmark/tpmv.c b/benchmark/tpmv.c
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
         fprintf(stderr,"Out of Memory!!\n");exit(1);
     }
 
-#ifdef linux
+#ifdef __linux
     srandom(getpid());
 #endif
 
diff --git a/benchmark/tpsv.c b/benchmark/tpsv.c
diff --git a/benchmark/trmm.c b/benchmark/trmm.c
diff --git a/benchmark/trmv.c b/benchmark/trmv.c
diff --git a/benchmark/trsm.c b/benchmark/trsm.c
diff --git a/benchmark/trsv.c b/benchmark/trsv.c
diff --git a/benchmark/zdot-intel.c b/benchmark/zdot-intel.c
diff --git a/benchmark/zdot.c b/benchmark/zdot.c
diff --git a/cpuid_arm.c b/cpuid_arm.c
diff --git a/cpuid_arm64.c b/cpuid_arm64.c
diff --git a/cpuid_mips.c b/cpuid_mips.c
diff --git a/cpuid_mips64.c b/cpuid_mips64.c
diff --git a/cpuid_power.c b/cpuid_power.c

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ int main(int argc, char *argv[]){`
`146`	`146`	`fprintf(stderr,"Out of Memory!!\n");exit(1);`
`147`	`147`	`}`
`148`	`148`
`149`		`-#ifdef linux`
	`149`	`+#ifdef __linux`
`150`	`150`	`srandom(getpid());`
`151`	`151`	`#endif`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ int main(int argc, char *argv[]){`
`145`	`145`	`fprintf(stderr,"Out of Memory!!\n");exit(1);`
`146`	`146`	`}`
`147`	`147`
`148`		`-#ifdef linux`
	`148`	`+#ifdef __linux`
`149`	`149`	`srandom(getpid());`
`150`	`150`	`#endif`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ int main(int argc, char *argv[]){`
`152`	`152`	`}`
`153`	`153`
`154`	`154`
`155`		`-#ifdef linux`
	`155`	`+#ifdef __linux`
`156`	`156`	`srandom(getpid());`
`157`	`157`	`#endif`
`158`	`158`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ int main(int argc, char *argv[]){`
`151`	`151`	`fprintf(stderr,"Out of Memory!!\n");exit(1);`
`152`	`152`	`}`
`153`	`153`
`154`		`-#ifdef linux`
	`154`	`+#ifdef __linux`
`155`	`155`	`srandom(getpid());`
`156`	`156`	`#endif`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ int main(int argc, char *argv[]){`
`154`	`154`	`fprintf(stderr,"Out of Memory!!\n");exit(1);`
`155`	`155`	`}`
`156`	`156`
`157`		`-#ifdef linux`
	`157`	`+#ifdef __linux`
`158`	`158`	`srandom(getpid());`
`159`	`159`	`#endif`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ int main(int argc, char *argv[]){`
`214`	`214`	`}`
`215`	`215`
`216`	`216`
`217`		`-#ifdef linux`
	`217`	`+#ifdef __linux`
`218`	`218`	`srandom(getpid());`
`219`	`219`	`#endif`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ int main(int argc, char *argv[]){`
`197`	`197`	`fprintf(stderr,"Out of Memory!!\n");exit(1);`
`198`	`198`	`}`
`199`	`199`
`200`		`-#ifdef linux`
	`200`	`+#ifdef __linux`
`201`	`201`	`srandom(getpid());`
`202`	`202`	`#endif`
`203`	`203`