Skip to content

Commit

Permalink
Merge pull request #19678 from JuliaLang/tk/llvm39
Browse files Browse the repository at this point in the history
RFC: Change LLVM version to 3.9.1
  • Loading branch information
tkelman authored Dec 29, 2016
2 parents 9ce0aca + dbdaae2 commit 19f81ac
Show file tree
Hide file tree
Showing 61 changed files with 24 additions and 57 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,14 @@ before_install:
contrib/travis_fastfail.sh || exit 1;
brew tap staticfloat/julia;
brew rm --force $(brew deps --HEAD julia);
brew install -v staticfloat/juliadeps/libgfortran;
brew install -v --only-dependencies --HEAD julia;
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";
brew install -v staticfloat/juliadeps/libgfortran llvm39-julia;
BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm39-julia)/bin/llvm-config LLVM_SIZE=$(brew --prefix llvm39-julia)/bin/llvm-size";
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND; do
export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1";
done;
export CXXFLAGS=-DUSE_ORCJIT;
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib";
export JULIA_MACOS_SPAWN="DYLD_FALLBACK_LIBRARY_PATH=\"$DYLD_FALLBACK_LIBRARY_PATH\" \$1";
Expand All @@ -102,7 +101,7 @@ script:
# capture the log, but only print it if `make deps` fails
# try to show the end of the log first, because this log might be very long (> 4MB)
# and thus be truncated by travis
- moreutils/mispipe "make $BUILDOPTS VERBOSE=0 -C deps 2> deps-err.log" "$BAR" > deps.log ||
- moreutils/mispipe "make $BUILDOPTS NO_GIT=1 -C deps 2> deps-err.log" "$BAR" > deps.log ||
{ echo "-- deps build log stderr tail 100 --------------------------------------";
tail -n 100 deps-err.log;
echo "-- deps build log stdout tail 100 --------------------------------------";
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Julia includes code from the following projects, which have their own licenses:

- [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)].
- [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.
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
- [LLVM](http://releases.llvm.org/3.9.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
- [MUSL](http://git.musl-libc.org/cgit/musl/tree/COPYRIGHT) (for getopt implementation on Windows) [MIT]
- [MINGW](https://sourceforge.net/p/mingw/mingw-org-wsl/ci/legacy/tree/mingwrt/mingwex/dirname.c) (for dirname implementation on Windows) [MIT]
- [NetBSD](http://www.netbsd.org/about/redistribution.html) (for setjmp, longjmp, and strptime implementations on Windows) [BSD-3]
Expand All @@ -43,7 +43,7 @@ own licenses:
- [FEMTOLISP](https://github.com/JeffBezanson/femtolisp) [BSD-3]
- [LIBUNWIND](http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob_plain;f=LICENSE;hb=master) [MIT]
- [LIBUV](https://github.com/joyent/libuv/blob/master/LICENSE) [MIT]
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) [BSD-3, effectively]
- [LLVM](http://releases.llvm.org/3.9.0/LICENSE.TXT) [BSD-3, effectively]
- [UTF8PROC](https://github.com/JuliaLang/utf8proc) [MIT]


Expand Down
4 changes: 0 additions & 4 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,6 @@ endif
# If we are running on powerpc64le or ppc64le, set certain options automatically
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
JCFLAGS += -fsigned-char
LLVM_VER:=3.9.0
OPENBLAS_DYNAMIC_ARCH:=0
OPENBLAS_TARGET_ARCH:=POWER8
# GCC doesn't do -march= on ppc64le
Expand All @@ -655,8 +654,6 @@ endif
# If we are running on ARM, set certain options automatically
ifneq (,$(findstring arm,$(ARCH)))
JCFLAGS += -fsigned-char

LLVM_VER:=3.9.0
USE_BLAS64:=0
OPENBLAS_DYNAMIC_ARCH:=0
OPENBLAS_TARGET_ARCH:=ARMV7
Expand All @@ -665,7 +662,6 @@ endif

# If we are running on aarch64 (e.g. ARMv8 or ARM64), set certain options automatically
ifneq (,$(findstring aarch64,$(ARCH)))
LLVM_VER:=3.9.0
OPENBLAS_DYNAMIC_ARCH:=0
OPENBLAS_TARGET_ARCH:=ARMV8
endif
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Building Julia requires that the following software be installed:
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`:
- **[LLVM]** (3.7) — compiler infrastructure.
- **[LLVM]** (3.9) — compiler infrastructure.
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
- **[libuv]** — portable, high-performance event-based I/O library
- **[OpenLibm]** — portable libm library containing elementary math functions.
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ cache:
# 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-r09.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
- llvm-3.9.1-i686-w64-mingw32-juliadeps-r02.7z
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r02.7z
- usr/bin/busybox.exe

build_script:
Expand Down
4 changes: 1 addition & 3 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ if [ -z "$USEMSVC" ]; then
fi
export AR=${CROSS_COMPILE}ar

f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r09.7z
f=llvm-3.9.1-$ARCH-w64-mingw32-juliadeps-r02.7z
else
echo "override USEMSVC = 1" >> Make.user
echo "override ARCH = $ARCH" >> Make.user
Expand All @@ -143,8 +143,6 @@ 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/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
Expand Down
2 changes: 1 addition & 1 deletion deps/Versions.make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LLVM_VER = 3.7.1
LLVM_VER = 3.9.1
PCRE_VER = 10.22
DSFMT_VER = 2.2.3
LAPACK_VER = 3.5.0
Expand Down
1 change: 0 additions & 1 deletion deps/checksums/cfe-3.3.src.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.3.src.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.7.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.7.0.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.7.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.7.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.8.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.8.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.9.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cfe-3.9.0.src.tar.xz/sha512

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/cfe-3.9.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
45713ec5c417ed9cad614cd283d786a1
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.9.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3f0eea194597e438bbe49ce9ef5fdced81459c21cbdd2653750b2fe02c55a0154d6a33a8cfd02e607b83314a8e35b2c300f944462120ab6de1d4139d85db56b8
1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.3.src.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.3.src.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.7.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.7.0.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.7.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.7.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.8.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.8.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.9.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.9.0.src.tar.xz/sha512

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.9.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aadc76e7e180fafb10fb729444e287a3
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.9.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
91a4c78a5e8c1cdd2d6bbcb27d2c34f49ea30a952733444ef4f4a7cc7503c880d4b6924595e87745ef6278851178f49f98d38d2068975d4fb6577fb9e9cdcdbe
1 change: 0 additions & 1 deletion deps/checksums/libcxx-3.3.src.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/libcxx-3.3.src.tar.gz/sha512

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/libcxx-3.9.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
75a3214224301fc543fa6a38bdf7efe0
1 change: 1 addition & 0 deletions deps/checksums/libcxx-3.9.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
1 change: 0 additions & 1 deletion deps/checksums/lldb-3.3.src.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/lldb-3.3.src.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/lldb-3.7.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/lldb-3.7.0.src.tar.xz/sha512

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/lldb-3.9.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
91399402f287d3f637db1207113deecb
1 change: 1 addition & 0 deletions deps/checksums/lldb-3.9.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e2957a1da60284595b21c205b07fa3db5c474bfad1935ab8e1bc832f30af497e9eb709efeb703591ef62e7dd73a28d22fc21398097a232c8a729946d72eb5df7
1 change: 0 additions & 1 deletion deps/checksums/llvm-3.7.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.7.0.src.tar.xz/sha512

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.7.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.7.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.8.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.8.0.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.8.1.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.8.1.src.tar.xz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.9.0.src.tar.xz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/llvm-3.9.0.src.tar.xz/sha512

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0ecd3c90f37864ef5d0ee57007a26827
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da174e013d0def38ad93096a07c2daf928e97ac7dfb178b13a0e442cb3d6069dcf5ba203460c6a4bdb4da53037037431963043e1b36fc63173338cb1cda45224
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5393443a86441c82831140cb82d7858b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e5c4040acfcc0106b4d4404d1590fb23bedaacad7bb4823ce951e137105a5e2505c3ddafe9defcfe179e32fd50a87add977c74feb5a8109a6b1ae0d994c62dc3
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.9.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3259018a7437e157f3642df80f1983ea
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.9.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683

0 comments on commit 19f81ac

Please sign in to comment.