From 9ddffba5847080e0d77d9e6059d05dc4b1d89ba5 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:23:34 -0600
Subject: [PATCH 01/19] Fix MinGW build failure

Fixes https://github.com/flame/blis/issues/278
---
 frame/include/bli_system.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frame/include/bli_system.h b/frame/include/bli_system.h
index 689b36303..4b199a702 100644
--- a/frame/include/bli_system.h
+++ b/frame/include/bli_system.h
@@ -83,11 +83,13 @@
   #define VC_EXTRALEAN
   #include <windows.h>
 
-  // Undefine attribute specifiers in Windows.
-  #define __attribute__(x)
+  #if !defined(__clang__) && !defined(__GNUC__)
+     // Undefine attribute specifiers in Windows.
+     #define __attribute__(x)
 
-  // Undefine restrict.
-  #define restrict
+     // Undefine restrict.
+     #define restrict
+  #endif
 
 #endif
 

From 65b0565c0ad9162d4474bd84eabde491fa971538 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 20 Nov 2018 23:19:38 -0600
Subject: [PATCH 02/19] Check MinGW-w64

---
 .appveyor.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f1a36d8a0..5efca4a34 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,9 +1,20 @@
 environment:
   matrix:
-    - LIB_TYPE: shared
-      CONFIG: x86_64
     - LIB_TYPE: static
       CONFIG: auto
+      CC: gcc
+
+    - LIB_TYPE: shared
+      CONFIG: x86_64
+      CC: clang
+      AR: llvm-ar
+      AS: llvm-as
+
+    - LIB_TYPE: static
+      CONFIG: auto
+      CC: clang
+      AR: llvm-ar
+      AS: llvm-as
 
 install:
 - set "CONDA_INSTALL_LOCN=C:\\Miniconda36-x64"
@@ -14,14 +25,12 @@ install:
 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 - set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
 - set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
+- if [%CC%]==[gcc] set "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1;%PATH%"
 
 build_script:
 - if [%LIB_TYPE%]==[shared] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-shared --disable-static"
 - if [%LIB_TYPE%]==[static] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --disable-shared --enable-static"
-- set CC=clang
 - set RANLIB=echo
-- set AR=llvm-ar
-- set AS=llvm-as
 - set LIBPTHREAD=
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"

From 707a5e7f9b07f554e1e9289dd0ce3b7dc4fded6e Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 20 Nov 2018 23:39:31 -0600
Subject: [PATCH 03/19] No conda for mingw build

---
 .appveyor.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 5efca4a34..ca5c4290a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,15 +17,15 @@ environment:
       AS: llvm-as
 
 install:
-- set "CONDA_INSTALL_LOCN=C:\\Miniconda36-x64"
-- call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-- conda update --yes --quiet conda
-- conda config --add channels conda-forge
-- conda install --yes clangdev posix m2-make
-- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-- set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
-- set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
-- if [%CC%]==[gcc] set "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1;%PATH%"
+- if [%CC%]==[clang] set "CONDA_INSTALL_LOCN=C:\\Miniconda36-x64"
+- if [%CC%]==[clang] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+- if [%CC%]==[clang] conda update --yes --quiet conda
+- if [%CC%]==[clang] conda config --add channels conda-forge
+- if [%CC%]==[clang] conda install --yes clangdev posix m2-make
+- if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+- if [%CC%]==[clang] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
+- if [%CC%]==[clang] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
+- if [%CC%]==[gcc] set "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1;C:\msys64\bin;%PATH%"
 
 build_script:
 - if [%LIB_TYPE%]==[shared] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-shared --disable-static"

From 368274bcbd0c9232521d14fa28304f35ced0e6d7 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 20 Nov 2018 23:40:26 -0600
Subject: [PATCH 04/19] enable rdp

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ca5c4290a..5e267cc8e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -48,5 +48,5 @@ test_script:
 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below
 # prints into the log.
-#on_finish:
-#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+on_finish:
+- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From 4c1dedd6a90087807f16353a5d0bcaaade35a7a5 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:28:20 -0600
Subject: [PATCH 05/19] No activate on gcc

---
 .appveyor.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 5e267cc8e..920335cc3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,7 +25,8 @@ install:
 - if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 - if [%CC%]==[clang] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
 - if [%CC%]==[clang] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
-- if [%CC%]==[gcc] set "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1;C:\msys64\bin;%PATH%"
+- if [%CC%]==[gcc] set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
+- if [%CC%]==[clang] set "ACTIVATE=source activate &&"
 
 build_script:
 - if [%LIB_TYPE%]==[shared] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-shared --disable-static"
@@ -34,9 +35,9 @@ build_script:
 - set LIBPTHREAD=
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
-- bash -lc "source activate && cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
-- bash -lc "source activate && cd /c/projects/blis && make -j4 V=1"
-- bash -lc "source activate && cd /c/projects/blis && make install"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && make -j4 V=1"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip
 - ps: Push-AppveyorArtifact C:\blis.zip
 

From 7a9838983ba8dd32ac9f87712255721542ff561f Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:35:27 -0600
Subject: [PATCH 06/19] Use m2w64-make

---
 .appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 920335cc3..ef6d7dc8e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -21,7 +21,7 @@ install:
 - if [%CC%]==[clang] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
 - if [%CC%]==[clang] conda update --yes --quiet conda
 - if [%CC%]==[clang] conda config --add channels conda-forge
-- if [%CC%]==[clang] conda install --yes clangdev posix m2-make
+- if [%CC%]==[clang] conda install --yes clangdev posix m2w64-make
 - if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 - if [%CC%]==[clang] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
 - if [%CC%]==[clang] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
@@ -36,8 +36,8 @@ build_script:
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
 - bash -lc "%ACTIVATE% cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && make -j4 V=1"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && make install"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && m2w64-make -j4 V=1"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && m2w64-make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip
 - ps: Push-AppveyorArtifact C:\blis.zip
 

From 0b1b344447b8a2fcd635a48f0ce7ce89b2107dc4 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:42:39 -0600
Subject: [PATCH 07/19] Fix make name

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ef6d7dc8e..606789a33 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -36,8 +36,8 @@ build_script:
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
 - bash -lc "%ACTIVATE% cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && m2w64-make -j4 V=1"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && m2w64-make install"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && mingw32-make -j4 V=1"
+- bash -lc "%ACTIVATE% cd /c/projects/blis && mingw32-make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip
 - ps: Push-AppveyorArtifact C:\blis.zip
 

From 6209b2e6060b89e65f3405c31333af8952dd63c0 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:50:22 -0600
Subject: [PATCH 08/19] Remove conda

---
 .appveyor.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 606789a33..87a526c82 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,16 +17,9 @@ environment:
       AS: llvm-as
 
 install:
-- if [%CC%]==[clang] set "CONDA_INSTALL_LOCN=C:\\Miniconda36-x64"
-- if [%CC%]==[clang] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-- if [%CC%]==[clang] conda update --yes --quiet conda
-- if [%CC%]==[clang] conda config --add channels conda-forge
-- if [%CC%]==[clang] conda install --yes clangdev posix m2w64-make
-- if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-- if [%CC%]==[clang] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
-- if [%CC%]==[clang] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
 - if [%CC%]==[gcc] set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
-- if [%CC%]==[clang] set "ACTIVATE=source activate &&"
+- if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;C:\msys64\bin;%CPATH%"
+- if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
 build_script:
 - if [%LIB_TYPE%]==[shared] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-shared --disable-static"
@@ -35,16 +28,16 @@ build_script:
 - set LIBPTHREAD=
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && mingw32-make -j4 V=1"
-- bash -lc "%ACTIVATE% cd /c/projects/blis && mingw32-make install"
+- bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
+- bash -lc "cd /c/projects/blis && mingw32-make -j4 V=1"
+- bash -lc "cd /c/projects/blis && mingw32-make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip
 - ps: Push-AppveyorArtifact C:\blis.zip
 
 test_script:
 - if [%LIB_TYPE%]==[shared] set "TEST_TARGET=checkblis-fast"
 - if [%LIB_TYPE%]==[static] set "TEST_TARGET=check"
-- bash -lc "source activate && cd /c/projects/blis && make %TEST_TARGET% -j4 V=1"
+- bash -lc "cd /c/projects/blis && mingw32-make %TEST_TARGET% -j4 V=1"
 
 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below

From c73e7601e58239e2dedec6c9f1b752e949254a42 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 00:50:33 -0600
Subject: [PATCH 09/19] Revert "enable rdp"

This reverts commit 368274bcbd0c9232521d14fa28304f35ced0e6d7.
---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 87a526c82..0fe0439c5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -42,5 +42,5 @@ test_script:
 # Enable this to be able to login to the build worker. You can use the
 # `remmina` program in Ubuntu, use the login information that the line below
 # prints into the log.
-on_finish:
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#on_finish:
+#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

From d424470b1f2fa8717fa54c0245b21341504665f6 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:04:26 -0600
Subject: [PATCH 10/19] Check openmp and pthreads threading

---
 .appveyor.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 0fe0439c5..33773502f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,18 +3,21 @@ environment:
     - LIB_TYPE: static
       CONFIG: auto
       CC: gcc
+      THREADING: pthreads
 
     - LIB_TYPE: shared
       CONFIG: x86_64
       CC: clang
       AR: llvm-ar
       AS: llvm-as
+      THREADING: pthreads
 
     - LIB_TYPE: static
       CONFIG: auto
       CC: clang
       AR: llvm-ar
       AS: llvm-as
+      THREADING: openmp
 
 install:
 - if [%CC%]==[gcc] set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
@@ -28,7 +31,7 @@ build_script:
 - set LIBPTHREAD=
 - set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
-- bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --disable-threading --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
+- bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --enable-threading=%THREADING% --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
 - bash -lc "cd /c/projects/blis && mingw32-make -j4 V=1"
 - bash -lc "cd /c/projects/blis && mingw32-make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip

From 0f753090eaf4264b743a49ce15de97514bcbe112 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:14:52 -0600
Subject: [PATCH 11/19] Fix PATH

---
 .appveyor.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 33773502f..1c9ef8a0f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,10 +1,5 @@
 environment:
   matrix:
-    - LIB_TYPE: static
-      CONFIG: auto
-      CC: gcc
-      THREADING: pthreads
-
     - LIB_TYPE: shared
       CONFIG: x86_64
       CC: clang
@@ -12,6 +7,11 @@ environment:
       AS: llvm-as
       THREADING: pthreads
 
+    - LIB_TYPE: static
+      CONFIG: auto
+      CC: gcc
+      THREADING: pthreads
+
     - LIB_TYPE: static
       CONFIG: auto
       CC: clang
@@ -21,7 +21,7 @@ environment:
 
 install:
 - if [%CC%]==[gcc] set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
-- if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;C:\msys64\bin;%CPATH%"
+- if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;C:\msys64\bin;%PATH%"
 - if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
 build_script:

From c9169b4685bfe81bc562cf9128b35a6a9884799b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:17:36 -0600
Subject: [PATCH 12/19] Add mingw64 path

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1c9ef8a0f..72077e446 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -20,8 +20,8 @@ environment:
       THREADING: openmp
 
 install:
-- if [%CC%]==[gcc] set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
-- if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;C:\msys64\bin;%PATH%"
+- set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
+- if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;%PATH%"
 - if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
 build_script:

From ce6e4eae6d5e977e6f699acc9cf239be8ac53771 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:34:56 -0600
Subject: [PATCH 13/19] test no threading

---
 .appveyor.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 72077e446..a9cf74942 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,10 +1,13 @@
 environment:
   matrix:
+    - LIB_TYPE: shared
+      CONFIG: auto
+      CC: clang
+      THREADING: no
+
     - LIB_TYPE: shared
       CONFIG: x86_64
       CC: clang
-      AR: llvm-ar
-      AS: llvm-as
       THREADING: pthreads
 
     - LIB_TYPE: static
@@ -15,13 +18,13 @@ environment:
     - LIB_TYPE: static
       CONFIG: auto
       CC: clang
-      AR: llvm-ar
-      AS: llvm-as
       THREADING: openmp
 
 install:
 - set "PATH=C:\msys64\mingw64\bin;C:\msys64\bin;%PATH%"
 - if [%CC%]==[clang] set "PATH=C:\Program Files\LLVM\bin;%PATH%"
+- if [%CC%]==[clang] set "AR=llvm-ar"
+- if [%CC%]==[clang] set "AS=llvm-as"
 - if [%CC%]==[clang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
 build_script:

From f6b924648c79c4b1c3d3c7fbf85372680aff8362 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:39:19 -0600
Subject: [PATCH 14/19] Don't use .def for gcc

---
 common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index ce5a4e81a..24a6c92f4 100644
--- a/common.mk
+++ b/common.mk
@@ -503,7 +503,7 @@ ifeq ($(IS_WIN),yes)
 ifeq ($(CC_VENDOR),clang)
 SOFLAGS    += -Wl,-def:build/libblis-symbols.def -Wl,-implib:$(BASE_LIB_PATH)/$(LIBBLIS).lib
 else
-SOFLAGS    += build/libblis-symbols.def -Wl,--out-implib,$(LIBBLIS).dll.a
+SOFLAGS    += -Wl,--export-all-symbols -Wl,--out-implib,$(LIBBLIS).dll.a
 endif
 else
 # Linux shared library link flags.

From be831879bd03edcddff8a345161f749ad92215af Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:39:32 -0600
Subject: [PATCH 15/19] test gcc shared

---
 .appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a9cf74942..d942522cf 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,10 @@
 environment:
   matrix:
+    - LIB_TYPE: shared
+      CONFIG: auto
+      CC: gcc
+      THREADING: pthreads
+
     - LIB_TYPE: shared
       CONFIG: auto
       CC: clang
@@ -10,11 +15,6 @@ environment:
       CC: clang
       THREADING: pthreads
 
-    - LIB_TYPE: static
-      CONFIG: auto
-      CC: gcc
-      THREADING: pthreads
-
     - LIB_TYPE: static
       CONFIG: auto
       CC: clang

From bafe521ed0012b7b8814404b78a6c576d8386370 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:54:36 -0600
Subject: [PATCH 16/19] Fixes for mingw

---
 common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common.mk b/common.mk
index 24a6c92f4..a21ef0c62 100644
--- a/common.mk
+++ b/common.mk
@@ -379,7 +379,11 @@ LIBBLIS            := libblis
 ifeq ($(OS_NAME),Darwin)
 SHLIB_EXT          := dylib
 else ifeq ($(IS_WIN),yes)
+ifeq ($(CC_VENDOR),gcc)
+SHLIB_EXT          := dll.a
+else
 SHLIB_EXT          := lib
+endif
 else
 SHLIB_EXT          := so
 endif

From b7b0ad22b151e89e2a6c7782cf4d8d47b4e60734 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 01:54:44 -0600
Subject: [PATCH 17/19] Test mingw

---
 .appveyor.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index d942522cf..5d46851bb 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,8 +4,9 @@ environment:
       CONFIG: auto
       CC: gcc
       THREADING: pthreads
+      CBLAS: no
 
-    - LIB_TYPE: shared
+    - LIB_TYPE: static
       CONFIG: auto
       CC: clang
       THREADING: no
@@ -30,11 +31,12 @@ install:
 build_script:
 - if [%LIB_TYPE%]==[shared] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-shared --disable-static"
 - if [%LIB_TYPE%]==[static] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --disable-shared --enable-static"
+- if not [%CBLAS%]==[no] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-cblas"
 - set RANLIB=echo
 - set LIBPTHREAD=
-- set "PATH=%PATH%;C:\projects\blis\lib\%CONFIG%"
+- set "PATH=%PATH%;C:\blis\lib\%CONFIG%"
 - set "CFLAGS=-Wno-macro-redefined"
-- bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-cblas --enable-threading=%THREADING% --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
+- bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-threading=%THREADING% --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
 - bash -lc "cd /c/projects/blis && mingw32-make -j4 V=1"
 - bash -lc "cd /c/projects/blis && mingw32-make install"
 - ps: Compress-Archive -Path C:\blis -DestinationPath C:\blis.zip

From 2acd8dcd23805203a6821358c5e3e09d521fecdf Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 02:02:18 -0600
Subject: [PATCH 18/19] Fix install path of dll.a

---
 common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index a21ef0c62..47e0f100f 100644
--- a/common.mk
+++ b/common.mk
@@ -507,7 +507,7 @@ ifeq ($(IS_WIN),yes)
 ifeq ($(CC_VENDOR),clang)
 SOFLAGS    += -Wl,-def:build/libblis-symbols.def -Wl,-implib:$(BASE_LIB_PATH)/$(LIBBLIS).lib
 else
-SOFLAGS    += -Wl,--export-all-symbols -Wl,--out-implib,$(LIBBLIS).dll.a
+SOFLAGS    += -Wl,--export-all-symbols -Wl,--out-implib,$(BASE_LIB_PATH)/$(LIBBLIS).dll.a
 endif
 else
 # Linux shared library link flags.

From 7af8fa01373b7bb30fa3b1fd110fd201c87ea225 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 21 Nov 2018 02:10:05 -0600
Subject: [PATCH 19/19] Fix blis dll path

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 5d46851bb..efc98f555 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -34,7 +34,7 @@ build_script:
 - if not [%CBLAS%]==[no] set "CONFIGURE_OPTS=%CONFIGURE_OPTS% --enable-cblas"
 - set RANLIB=echo
 - set LIBPTHREAD=
-- set "PATH=%PATH%;C:\blis\lib\%CONFIG%"
+- set "PATH=%PATH%;C:\blis\lib"
 - set "CFLAGS=-Wno-macro-redefined"
 - bash -lc "cd /c/projects/blis && ./configure %CONFIGURE_OPTS% --enable-threading=%THREADING% --enable-arg-max-hack --prefix=/c/blis %CONFIG%"
 - bash -lc "cd /c/projects/blis && mingw32-make -j4 V=1"