Merge pull request #16723 from JuliaLang/tk/llvmshlib

RFC: Build LLVM as a shared library by default

Author: tkelman

Make.inc

@@ -40,7 +40,7 @@ USE_SYSTEM_LIBGIT2:=0
 USE_SYSTEM_PATCHELF:=0
 
 # Link to the LLVM shared library
-USE_LLVM_SHLIB := 0
+USE_LLVM_SHLIB := 1
 
 ## Settings for various Intel tools
 # Set to 1 to use MKL
@@ -216,7 +216,7 @@ INSTALL_M := $(JULIAHOME)/contrib/install.sh 755
 LLVMROOT := $(build_prefix)
 LLVM_ASSERTIONS := 0
 LLVM_DEBUG := 0
-#LLVM_USE_CMAKE: defined in deps/Makefile as it depends on LLVM_VER_SHORT
+#LLVM_USE_CMAKE: defined in deps/llvm-ver.mk as it depends on LLVM_VER_SHORT
 # set to 1 to get clang and compiler-rt
 BUILD_LLVM_CLANG := 0
 # set to 1 to get lldb (often does not work, no chance with llvm3.2 and earlier)

appveyor.yml

@@ -30,11 +30,11 @@ init:
   - git config --global core.autocrlf input
 
 cache:
-# Cache any downloads from sourceforge because it's really unreliable
+# Cache large downloads to avoid network unreliability
   - i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
   - x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
-  - llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z
-  - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z
+  - llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
+  - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
 
 build_script:
 # If there's a newer build queued for the same PR, cancel this one

contrib/windows/msys_build.sh

@@ -122,7 +122,7 @@ if [ -z "$USEMSVC" ]; then
   fi
   export AR=${CROSS_COMPILE}ar
 
-  f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r04.7z
+  f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r09.7z
 else
   echo "override USEMSVC = 1" >> Make.user
   echo "override ARCH = $ARCH" >> Make.user
@@ -142,8 +142,8 @@ checksum_download \
     "$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
 echo "Extracting $f"
 $SEVENZIP x -y $f >> get-deps.log
-echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user
-echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user
+echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user
+echo 'override LLVM_SIZE := $(JULIAHOME)/usr/bin/llvm-size.exe' >> Make.user
 
 if [ -z "`which make 2>/dev/null`" ]; then
   if [ -n "`uname | grep CYGWIN`" ]; then

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5

@@ -0,0 +1 @@
+774a1f7cfd555c8e6a786732697efa7e

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512

@@ -0,0 +1 @@
+39b2b6ae8d6a7c0e8334011b396a815fc11932a073ab312a607ac08e494baeaca77fb059cc97221924376fa74518b2e3dfafa2608a256e3d433d4f901c2615f0

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/md5

@@ -0,0 +1 @@
+283ebe30bcb1f5b58380af1389a51912

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/sha512

@@ -0,0 +1 @@
+9dcb1496661d33c5683940040d5c4fd9382bb320b157b41a9c97e33548e9255756dc19969193841577de79dc06402191928955d42340e6c10ab3a6f496897bdd

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5

@@ -0,0 +1,32 @@
+diff --git a/tools/llvm-c-test/Makefile b/tools/llvm-c-test/Makefile
+index 08be7c3..f56e83c 100644
+--- a/tools/llvm-c-test/Makefile
++++ b/tools/llvm-c-test/Makefile
+@@ -25,5 +25,5 @@ CFLAGS += -std=c99 -Wall -Wstrict-prototypes
+ 
+ # ...but if it is built - use it
+ ifeq ($(ENABLE_SHARED),1)
+-LIBS = -lLLVM-$(LLVMVersion)
++LIBS = -lLLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)
+ endif
+diff --git a/tools/llvm-shlib/Makefile b/tools/llvm-shlib/Makefile
+index 2bc81da..3f7652f 100644
+--- a/tools/llvm-shlib/Makefile
++++ b/tools/llvm-shlib/Makefile
+@@ -15,7 +15,6 @@ LIBRARYALIASNAME = LLVM-$(LLVMVersion)
+ NO_BUILD_ARCHIVE := 1
+ LINK_LIBS_IN_SHARED := 1
+ SHARED_LIBRARY := 1
+-SHARED_ALIAS := 1
+ 
+ include $(LEVEL)/Makefile.config
+ 
+@@ -27,6 +26,8 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+     SHLIB_FRAG_NAMES += stdc++.a.o
+   endif
+ 
++else
++  SHARED_ALIAS := 1
+ endif
+ 
+ include $(LEVEL)/Makefile.common

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512

@@ -427,11 +427,15 @@ $(eval $(call LLVM_PATCH,llvm-3.7.1))
 $(eval $(call LLVM_PATCH,llvm-3.7.1_2))
 $(eval $(call LLVM_PATCH,llvm-3.7.1_3))
 $(eval $(call LLVM_PATCH,llvm-D14260))
+$(eval $(call LLVM_PATCH,llvm-nodllalias))
 $(LLVM_SRC_DIR)/llvm-3.7.1_2.patch-applied: $(LLVM_SRC_DIR)/llvm-3.7.1.patch-applied
+$(LLVM_SRC_DIR)/llvm-nodllalias.patch-applied: $(LLVM_SRC_DIR)/llvm-3.7.1_2.patch-applied
 else ifeq ($(LLVM_VER),3.8.0)
 $(eval $(call LLVM_PATCH,llvm-3.7.1_3))
 $(eval $(call LLVM_PATCH,llvm-D14260))
 $(eval $(call LLVM_PATCH,llvm-3.8.0_winshlib))
+$(eval $(call LLVM_PATCH,llvm-nodllalias))
+$(LLVM_SRC_DIR)/llvm-nodllalias.patch-applied: $(LLVM_SRC_DIR)/llvm-3.8.0_winshlib.patch-applied
 # Cygwin and openSUSE still use win32-threads mingw, https://llvm.org/bugs/show_bug.cgi?id=26365
 $(eval $(call LLVM_PATCH,llvm-3.8.0_threads))
 # fix replutil test on unix

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/md5

@@ -63,10 +63,14 @@ else
 ifeq ($(LLVM_USE_CMAKE),1)
 LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
 else
+ifeq ($(OS),WINNT)
+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+else
 LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
-endif
+endif # OS == WINNT
+endif # LLVM_USE_CMAKE == 1
 FLAGS += -DLLVM_SHLIB
-endif
+endif # USE_LLVM_SHLIB == 1
 
 COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
 DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/sha512

@@ -26,15 +26,20 @@ OBJS := $(SRCS:%=$(BUILDDIR)/%.o)
 DOBJS := $(SRCS:%=$(BUILDDIR)/%.dbg.obj)
 DEBUGFLAGS += $(FLAGS)
 SHIPFLAGS += $(FLAGS)
+
 ifeq ($(USE_LLVM_SHLIB),1)
 ifeq ($(LLVM_USE_CMAKE),1)
 LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
 else
+ifeq ($(OS),WINNT)
+LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+else
 LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
-endif
+endif # OS == WINNT
+endif # LLVM_USE_CMAKE == 1
 else
 LLVMLINK :=
-endif
+endif # USE_LLVM_SHLIB == 1
 JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
 
 ifeq ($(USE_SYSTEM_LIBM),0)