Skip to content

Commit

Permalink
Revert "RFC: Change LLVM version to 3.9.1"
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman authored Jan 1, 2017
1 parent 35d1780 commit aabb19e
Show file tree
Hide file tree
Showing 61 changed files with 57 additions and 24 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,15 @@ 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;
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="-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";
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 @@ -101,7 +102,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 NO_GIT=1 -C deps 2> deps-err.log" "$BAR" > deps.log ||
- moreutils/mispipe "make $BUILDOPTS VERBOSE=0 -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://releases.llvm.org/3.9.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
- [LLVM](http://llvm.org/releases/3.7.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://releases.llvm.org/3.9.0/LICENSE.TXT) [BSD-3, effectively]
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) [BSD-3, effectively]
- [UTF8PROC](https://github.com/JuliaLang/utf8proc) [MIT]


Expand Down
4 changes: 4 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ 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 @@ -656,6 +657,8 @@ 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 @@ -664,6 +667,7 @@ 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.9) — compiler infrastructure.
- **[LLVM]** (3.7) — 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.9.1-i686-w64-mingw32-juliadeps-r02.7z
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r02.7z
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
- usr/bin/busybox.exe

build_script:
Expand Down
4 changes: 3 additions & 1 deletion 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.9.1-$ARCH-w64-mingw32-juliadeps-r02.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
Expand All @@ -143,6 +143,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/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.9.1
LLVM_VER = 3.7.1
PCRE_VER = 10.22
DSFMT_VER = 2.2.3
LAPACK_VER = 3.5.0
Expand Down
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.3.src.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8284891e3e311829b8e44ac813d0c9ef
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.3.src.tar.gz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.7.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8f9d27335e7331cf0a4711e952f21f01
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.7.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.7.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0acd026b5529164197563d135a8fd83e
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.7.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.8.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ff2f8844a786edb0220f490f7896080
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.8.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
72d23a410271b50f97371b13dd7a6c6c5c0a993e35df436ab716ece8521d83406aa3d4bf8fdecd8154139f39fd5e011e480d405225d8c3ff152d0a2ac4573e04
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.9.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
29e1d86bee422ab5345f5e9fb808d2dc
1 change: 1 addition & 0 deletions deps/checksums/cfe-3.9.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f405b5819fd19276b2de4da80a51171a3b1c5c00df810e1f284184c693e410775fe2933576f942b881664dd3b75e78f0f15b7e5a3eca7819ffbcfe528d9a578e
1 change: 0 additions & 1 deletion deps/checksums/cfe-3.9.1.src.tar.xz/md5

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.3.src.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9c129ce24514467cfe492cf2fed8e2c4
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.3.src.tar.gz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.7.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
383c10affd513026f08936b5525523f5
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.7.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ba6abb3d6ec7f1469cfe1d48fde2069e9a767d19144f80f05516ac63f353ace90a9df3e9d1c1f708f3c397aba0ec61b12e4f105b25a2e1cd26b25b0dd252bc9
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.7.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1c6975daf30bb3b0473b53c3a1a6ff01
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.7.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.8.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f140db073d2453f854fbe01cc46f3110
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.8.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bed3da5f8594c4bf71af406419fbeaf7ed5d8bf46adb305233a298271d34a9af1072bcb47d474ac19bb862cc7c7bc9e1d89bc1567133553f29480030cad1cf75
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.9.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b7ea34c9d744da16ffc0217b6990d095
1 change: 1 addition & 0 deletions deps/checksums/compiler-rt-3.9.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8d15c0315d7a89d9336e0ae4b72775d0815a8e7d962056645e1d0c6a23759bb2d8133c9ad2164e181f017641e8a184a062fbc876a371b81d5b1c2626405f6616
1 change: 0 additions & 1 deletion deps/checksums/compiler-rt-3.9.1.src.tar.xz/md5

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/libcxx-3.3.src.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
59006e659ffb33f5222a7b79d4cd071e
1 change: 1 addition & 0 deletions deps/checksums/libcxx-3.3.src.tar.gz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
806ee0321ceac4d0bdcdad581208e8589d13f688124dfa75f484242fe299b8d423f6bd0172d674a01daf57b4f1e1a9751f5f331e734639917aa24f427b2f5e2c
1 change: 0 additions & 1 deletion deps/checksums/libcxx-3.9.1.src.tar.xz/md5

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/lldb-3.3.src.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c583c80c25e56a41e3e5ae7c2f442929
1 change: 1 addition & 0 deletions deps/checksums/lldb-3.3.src.tar.gz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
73d24adb06a944244c2ad11f13711610fd54b5209afce7d0b7829439ec3bd0366cc2bac176b12defa5af73ab6115635022940c3eb176f448b45ea2402ecf2586
1 change: 1 addition & 0 deletions deps/checksums/lldb-3.7.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e5931740400d1dc3e7db4c7ba2ceff68
1 change: 1 addition & 0 deletions deps/checksums/lldb-3.7.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df
1 change: 0 additions & 1 deletion deps/checksums/lldb-3.9.1.src.tar.xz/md5

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/llvm-3.7.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b98b9495e5655a672d6cb83e1a180f8e
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.7.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fe3bfefd3d49423831ad12b89f944ac9f469aaaaafdea1dd94fc7fb6d5cc9fbe66b6463796aeaabfc145ae474ec3ad68da41c4a011e8aa4bc650f1835af75388
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
774a1f7cfd555c8e6a786732697efa7e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
39b2b6ae8d6a7c0e8334011b396a815fc11932a073ab312a607ac08e494baeaca77fb059cc97221924376fa74518b2e3dfafa2608a256e3d433d4f901c2615f0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
283ebe30bcb1f5b58380af1389a51912
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9dcb1496661d33c5683940040d5c4fd9382bb320b157b41a9c97e33548e9255756dc19969193841577de79dc06402191928955d42340e6c10ab3a6f496897bdd
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.7.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bf8b3a2c79e61212c5409041dfdbd319
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.7.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.8.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
07a7a74f3c6bd65de4702bf941b511a0
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.8.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.8.1.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
538467e6028bbc9259b1e6e015d25845
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.8.1.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.9.0.src.tar.xz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f2093e98060532449eb7d2fcfd0bc6c6
1 change: 1 addition & 0 deletions deps/checksums/llvm-3.9.0.src.tar.xz/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2

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.9.1.src.tar.xz/md5

This file was deleted.

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

This file was deleted.

0 comments on commit aabb19e

Please sign in to comment.