Skip to content

Commit b80ada1

Browse files
committed
Change LLVM version to 3.9.1
update checksums and CI Use new download_cmake script
1 parent 387e964 commit b80ada1

File tree

27 files changed

+20
-34
lines changed

27 files changed

+20
-34
lines changed

.travis.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ matrix:
99
apt:
1010
sources:
1111
- ubuntu-toolchain-r-test
12-
- kalakris-cmake
1312
packages:
14-
- cmake
1513
- bar
1614
- time
1715
- binutils
@@ -30,9 +28,7 @@ matrix:
3028
apt:
3129
sources:
3230
- ubuntu-toolchain-r-test
33-
- kalakris-cmake
3431
packages:
35-
- cmake
3632
- bar
3733
- time
3834
- g++-5
@@ -82,9 +78,9 @@ before_install:
8278
contrib/travis_fastfail.sh || exit 1;
8379
brew tap staticfloat/julia;
8480
brew rm --force $(brew deps --HEAD julia);
85-
brew install -v cmake staticfloat/juliadeps/libgfortran;
81+
brew install -v staticfloat/juliadeps/libgfortran;
8682
brew install -v --only-dependencies --HEAD julia;
87-
BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm37-julia)/bin/llvm-config-3.7 LLVM_SIZE=$(brew --prefix llvm37-julia)/bin/llvm-size-3.7";
83+
BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm39-julia)/bin/llvm-config-3.9 LLVM_SIZE=$(brew --prefix llvm39-julia)/bin/llvm-size-3.9";
8884
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
8985
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
9086
for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND; do
@@ -100,6 +96,7 @@ before_install:
10096
- git clone -q git://git.kitenet.net/moreutils
10197
script:
10298
- echo $BUILDOPTS
99+
- contrib/download_cmake.sh
103100
- make -C moreutils mispipe
104101
- make $BUILDOPTS -C base version_git.jl.phony
105102
# capture the log, but only print it if `make deps` fails
@@ -133,6 +130,7 @@ script:
133130
/tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&
134131
/tmp/julia/bin/julia --check-bounds=yes runtests.jl libgit2-online pkg
135132
- cd `dirname $TRAVIS_BUILD_DIR` && mv julia2 julia &&
136-
rm -f julia/deps/scratch/libgit2-*/CMakeFiles/CMakeOutput.log
133+
rm -f julia/deps/scratch/libgit2-*/CMakeFiles/CMakeOutput.log &&
134+
rm -f julia/deps/scratch/libssh2-*/CMakeFiles/Makefile2
137135
# uncomment the following if failures are suspected to be due to the out-of-memory killer
138136
# - dmesg

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Julia includes code from the following projects, which have their own licenses:
3131

3232
- [crc32c.c](http://stackoverflow.com/questions/17645167/implementing-sse-4-2s-crc32c-in-software) (CRC-32c checksum code by Mark Adler) [[ZLib](https://opensource.org/licenses/Zlib)].
3333
- [LDC](https://github.com/ldc-developers/ldc/blob/master/LICENSE) (for ccall/cfunction ABI definitions) [BSD-3]. The portion of code that Julia uses from LDC is [BSD-3] licensed.
34-
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
34+
- [LLVM](http://releases.llvm.org/3.9.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
3535
- [MUSL](http://git.musl-libc.org/cgit/musl/tree/COPYRIGHT) (for getopt implementation on Windows) [MIT]
3636
- [MINGW](https://sourceforge.net/p/mingw/mingw-org-wsl/ci/legacy/tree/mingwrt/mingwex/dirname.c) (for dirname implementation on Windows) [MIT]
3737
- [NetBSD](http://www.netbsd.org/about/redistribution.html) (for setjmp, longjmp, and strptime implementations on Windows) [BSD-3]
@@ -43,7 +43,7 @@ own licenses:
4343
- [FEMTOLISP](https://github.com/JeffBezanson/femtolisp) [BSD-3]
4444
- [LIBUNWIND](http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob_plain;f=LICENSE;hb=master) [MIT]
4545
- [LIBUV](https://github.com/joyent/libuv/blob/master/LICENSE) [MIT]
46-
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) [BSD-3, effectively]
46+
- [LLVM](http://releases.llvm.org/3.9.0/LICENSE.TXT) [BSD-3, effectively]
4747
- [UTF8PROC](https://github.com/JuliaLang/utf8proc) [MIT]
4848

4949

Make.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@ endif
640640
# If we are running on powerpc64le or ppc64le, set certain options automatically
641641
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
642642
JCFLAGS += -fsigned-char
643-
LLVM_VER:=3.9.0
644643
OPENBLAS_DYNAMIC_ARCH:=0
645644
OPENBLAS_TARGET_ARCH:=POWER8
646645
# GCC doesn't do -march= on ppc64le
@@ -655,8 +654,6 @@ endif
655654
# If we are running on ARM, set certain options automatically
656655
ifneq (,$(findstring arm,$(ARCH)))
657656
JCFLAGS += -fsigned-char
658-
659-
LLVM_VER:=3.9.0
660657
USE_BLAS64:=0
661658
OPENBLAS_DYNAMIC_ARCH:=0
662659
OPENBLAS_TARGET_ARCH:=ARMV7
@@ -665,7 +662,6 @@ endif
665662

666663
# If we are running on aarch64 (e.g. ARMv8 or ARM64), set certain options automatically
667664
ifneq (,$(findstring aarch64,$(ARCH)))
668-
LLVM_VER:=3.9.0
669665
OPENBLAS_DYNAMIC_ARCH:=0
670666
OPENBLAS_TARGET_ARCH:=ARMV8
671667
endif

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Building Julia requires that the following software be installed:
274274

275275
Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`:
276276

277-
- **[LLVM]** (3.7) — compiler infrastructure.
277+
- **[LLVM]** (3.9) — compiler infrastructure.
278278
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
279279
- **[libuv]** — portable, high-performance event-based I/O library
280280
- **[OpenLibm]** — portable libm library containing elementary math functions.

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ cache:
3333
# Cache large downloads to avoid network unreliability
3434
- i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
3535
- x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
36-
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
37-
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
36+
- llvm-3.9.1-i686-w64-mingw32-juliadeps-r01.7z
37+
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r01.7z
3838
- usr/bin/busybox.exe
3939

4040
build_script:

contrib/windows/msys_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if [ -z "$USEMSVC" ]; then
123123
fi
124124
export AR=${CROSS_COMPILE}ar
125125

126-
f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r09.7z
126+
f=llvm-3.9.1-$ARCH-w64-mingw32-juliadeps-r01.7z
127127
else
128128
echo "override USEMSVC = 1" >> Make.user
129129
echo "override ARCH = $ARCH" >> Make.user
@@ -143,8 +143,8 @@ checksum_download \
143143
"$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
144144
echo "Extracting $f"
145145
$SEVENZIP x -y $f >> get-deps.log
146-
echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user
147-
echo 'override LLVM_SIZE := $(JULIAHOME)/usr/bin/llvm-size.exe' >> Make.user
146+
echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user
147+
echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user
148148

149149
if [ -z "`which make 2>/dev/null`" ]; then
150150
if [ -n "`uname | grep CYGWIN`" ]; then

deps/Versions.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LLVM_VER = 3.7.1
1+
LLVM_VER = 3.9.1
22
PCRE_VER = 10.22
33
DSFMT_VER = 2.2.3
44
LAPACK_VER = 3.5.0

deps/checksums/llvm-3.7.0.src.tar.xz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/llvm-3.7.0.src.tar.xz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)