From 34753eaebb8b2ddbc256e9e996c1fb315396a2a0 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 14 Mar 2021 17:28:43 +0100
Subject: [PATCH 1/4] Include common.h (and indirectly param.h) rather than
 just param.h to have BLASLONG available w/o circular dependencies

---
 getarch_2nd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {
 

From ecb4babcf45e402d6e75702446cedd7242fd2ef8 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 14 Mar 2021 17:36:51 +0100
Subject: [PATCH 2/4] remove inclusion of common.h again to avoid circular
 dependency

---
 param.h | 2 --
 1 file changed, 2 deletions(-)

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

From e9d453b623ee23005604f0526aabbc2ab4128d6d Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 14 Mar 2021 16:34:02 -0500
Subject: [PATCH 3/4] disable openmp

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

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

From 186368ddc3775540c147b6300693ccc0bcac7597 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Tue, 16 Mar 2021 16:52:57 +0100
Subject: [PATCH 4/4] Fix compilation with CLANG

---
 driver/others/dynamic_power.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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.