Skip to content

Commit 9a36c83

Browse files
committed
bump LLVM BB version and use assertion builds on CI
Adds patches for: - #27055 - #27080 - #27032
1 parent a465d33 commit 9a36c83

File tree

9 files changed

+3704
-3
lines changed

9 files changed

+3704
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ before_install:
8686
brew rm --force $(brew deps --HEAD julia);
8787
brew install -v --only-dependencies --HEAD julia;
8888
brew install -v staticfloat/juliadeps/libgfortran;
89-
BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 BINARYBUILDER_TRIPLET=x86_64-apple-darwin14";
89+
BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 BINARYBUILDER_TRIPLET=x86_64-apple-darwin14 BINARYBUILDER_LLVM_DEBUG=1";
9090
BUILDOPTS="$BUILDOPTS USE_BINARYBUILDER_LLVM=1 LLVM_CONFIG=$TRAVIS_BUILD_DIR/usr/tools/llvm-config LLVM_SIZE=$TRAVIS_BUILD_DIR/usr/tools/llvm-size";
9191
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
9292
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";

Make.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ INSTALL_M := $(JULIAHOME)/contrib/install.sh 755
223223
# BinaryBuilder options
224224
# TODO: Autodiscover triplet
225225
USE_BINARYBUILDER_LLVM := 0
226+
BINARYBUILDER_LLVM_DEBUG := 0
226227
BINARYBUILDER_TRIPLET :=
227228

228229
# LLVM Options

contrib/windows/appveyor_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ if [ -n "$USEMSVC" ]; then
204204
else
205205
# Use BinaryBuilder
206206
echo 'USE_BINARYBUILDER_LLVM = 1' >> Make.user
207+
echo 'BINARYBUILDER_LLVM_DEBUG = 1' >> Make.user
207208
echo 'override DEP_LIBS += llvm openlibm' >> Make.user
208209
make check-whitespace
209210
make VERBOSE=1 -C base version_git.jl.phony

deps/Versions.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
LLVM_VER = 6.0.0
2-
LLVM_BB_REL = 2
2+
LLVM_BB_REL = 3
33
PCRE_VER = 10.30
44
DSFMT_VER = 2.2.3
55
LAPACK_VER = 3.5.0

deps/llvm.mk

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,10 @@ $(eval $(call LLVM_PATCH,llvm-D45008)) # remove for 7.0
488488
$(eval $(call LLVM_PATCH,llvm-D45070)) # remove for 7.0
489489
$(eval $(call LLVM_PATCH,llvm-6.0.0-ifconv-D45819)) # remove for 7.0
490490
$(eval $(call LLVM_PATCH,llvm-D46460))
491+
$(eval $(call LLVM_PATCH,llvm-rL332681)) # remove for 7.0
492+
$(eval $(call LLVM_PATCH,llvm-rL332683)) # remove for 7.0
493+
$(eval $(call LLVM_PATCH,llvm-rL332303)) # remove for 7.0
494+
$(eval $(call LLVM_PATCH,llvm-rL332695)) # remove for 7.0
491495
endif # LLVM_VER
492496

493497
# Remove hardcoded OS X requirements in compilter-rt cmake build
@@ -574,7 +578,13 @@ endif
574578
endif
575579
else # USE_BINARYBUILDER_LLVM
576580
LLVM_BB_URL_BASE := https://github.com/staticfloat/LLVMBuilder/releases/download
577-
LLVM_BB_URL := $(LLVM_BB_URL_BASE)/v$(LLVM_VER)-$(LLVM_BB_REL)/LLVM.$(BINARYBUILDER_TRIPLET).tar.gz
581+
ifneq ($(BINARYBUILDER_LLVM_DEBUG), 1)
582+
LLVM_BB_NAME := LLVM
583+
else
584+
LLVM_BB_NAME := LLVM.dbg
585+
endif
586+
LLVM_BB_URL := $(LLVM_BB_URL_BASE)/v$(LLVM_VER)-$(LLVM_BB_REL)/$(LLVM_BB_NAME).$(BINARYBUILDER_TRIPLET).tar.gz
587+
578588

579589
$(BUILDDIR)/llvm-$(LLVM_VER)-$(LLVM_BB_REL):
580590
mkdir -p $@

0 commit comments

Comments
 (0)