diff --git a/appveyor.yml b/appveyor.yml index 6197e85ab..c9b2fa3a1 100644 --- a/appveyor.yml +++ b/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 diff --git a/driver/others/dynamic_power.c b/driver/others/dynamic_power.c index b8e5840a3..d9c15b312 100644 --- a/driver/others/dynamic_power.c +++ b/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. diff --git a/getarch_2nd.c b/getarch_2nd.c index c390ef52c..53ecccf30 100644 --- a/getarch_2nd.c +++ b/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) { diff --git a/param.h b/param.h index 508cbb2a5..a37743ef4 100644 --- a/param.h +++ b/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