From d82d78569ee7377421d0697b50a0ac5f52ac2608 Mon Sep 17 00:00:00 2001
From: Keno Fischer <kfischer@college.harvard.edu>
Date: Sat, 20 Aug 2016 22:32:37 -0400
Subject: [PATCH] Misc build fixes for win32 clang

---
 Make.inc                 | 4 ++++
 deps/blas.mk             | 2 ++
 deps/libgit2.mk          | 2 ++
 src/support/ENTRY.i387.h | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Make.inc b/Make.inc
index b8b04c9332313..1700797373119 100644
--- a/Make.inc
+++ b/Make.inc
@@ -445,7 +445,9 @@ export CCACHE_CPP2 := yes
 endif
 else #USECCACHE
 CC_BASE := $(shell echo $(CC) | cut -d' ' -f1)
+CC_ARG := $(shell echo $(CC) | cut -d' ' -f2-)
 CXX_BASE := $(shell echo $(CXX) | cut -d' ' -f1)
+CXX_ARG := $(shell echo $(CXX) | cut -d' ' -f2-)
 endif
 
 JFFLAGS := -O2 $(fPIC)
@@ -683,10 +685,12 @@ endif
 
 ifeq ($(OS),WINNT)
 ifneq ($(ARCH),x86_64)
+ifneq ($(USECLANG),1)
 JCFLAGS += -mincoming-stack-boundary=2
 JCXXFLAGS += -mincoming-stack-boundary=2
 endif
 endif
+endif
 
 ifeq ($(USEGCC),1)
 ifeq ($(ISX86),1)
diff --git a/deps/blas.mk b/deps/blas.mk
index fcd6cd8074bb0..e6f180f7b5b2a 100644
--- a/deps/blas.mk
+++ b/deps/blas.mk
@@ -54,7 +54,9 @@ OPENBLAS_BUILD_OPTS += OSNAME=$(OS) CROSS=1 HOSTCC=$(HOSTCC)
 endif
 ifeq ($(OS),WINNT)
 ifneq ($(ARCH),x86_64)
+ifneq ($(USECLANG),1)
 OPENBLAS_BUILD_OPTS += CFLAGS="$(CFLAGS) -mincoming-stack-boundary=2"
+endif
 OPENBLAS_BUILD_OPTS += FFLAGS="$(FFLAGS) -mincoming-stack-boundary=2"
 endif
 endif
diff --git a/deps/libgit2.mk b/deps/libgit2.mk
index f17bea8ff3345..5ecd8c73c16aa 100644
--- a/deps/libgit2.mk
+++ b/deps/libgit2.mk
@@ -11,8 +11,10 @@ LIBGIT2_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release -DTHREADSAFE=ON
 ifeq ($(OS),WINNT)
 LIBGIT2_OPTS += -DWIN32=ON -DMINGW=ON
 ifneq ($(ARCH),x86_64)
+ifneq ($(USECLANG),1)
 LIBGIT2_OPTS += -DCMAKE_C_FLAGS="-mincoming-stack-boundary=2"
 endif
+endif
 ifeq ($(BUILD_OS),WINNT)
 LIBGIT2_OPTS += -G"MSYS Makefiles"
 else
diff --git a/src/support/ENTRY.i387.h b/src/support/ENTRY.i387.h
index 109ea745034d5..d80038671247a 100644
--- a/src/support/ENTRY.i387.h
+++ b/src/support/ENTRY.i387.h
@@ -59,7 +59,7 @@ EXT(CNAME):
 _START_ENTRY
 .globl EXT(CNAME)
 .section .drectve
-.ascii " -export:" XSTR(CNAME)
+.ascii " -export:", XSTR(CNAME)
 .section .text
 .def EXT(CNAME)
 .scl 2