Merge pull request #18 from xianyi/develop

rebase

Author: martin-frbg

appveyor.yml

@@ -31,7 +31,6 @@ environment:
   matrix:
     - COMPILER: clang-cl
       WITH_FORTRAN: ON
-      USE_OPENMP: ON
     - COMPILER: clang-cl
       DYNAMIC_ARCH: ON
       WITH_FORTRAN: OFF

driver/others/dynamic_power.c

@@ -40,7 +40,14 @@ char *gotoblas_corename(void) {
 	return corename[0];
 }
 
-#ifdef C_PGI
+#if defined(__clang__)
+static int __builtin_cpu_supports(char* arg) 
+{
+	return 0;
+}
+#endif
+
+#if defined(C_PGI) || defined(__clang__)
 /*
  * NV HPC compilers do not yet implement __builtin_cpu_is().
  * Fake a version here for use in the CPU detection code below.

getarch_2nd.c

@@ -4,7 +4,7 @@
 #else
 #include "config_kernel.h"
 #endif
-#include "param.h"
+#include "common.h"
 
 int main(int argc, char **argv) {
 

param.h

@@ -72,8 +72,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef PARAM_H
 #define PARAM_H
 
-#include "common.h"
-
 #define SBGEMM_DEFAULT_UNROLL_N 4
 #define SBGEMM_DEFAULT_UNROLL_M 8
 #define SBGEMM_DEFAULT_UNROLL_MN 32