Skip to content

Commit aabb19e

Browse files
authored
Revert "RFC: Change LLVM version to 3.9.1"
1 parent 35d1780 commit aabb19e

File tree

61 files changed

+57
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+57
-24
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,15 @@ before_install:
7878
contrib/travis_fastfail.sh || exit 1;
7979
brew tap staticfloat/julia;
8080
brew rm --force $(brew deps --HEAD julia);
81+
brew install -v staticfloat/juliadeps/libgfortran;
8182
brew install -v --only-dependencies --HEAD julia;
82-
brew install -v staticfloat/juliadeps/libgfortran llvm39-julia;
83-
BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm39-julia)/bin/llvm-config LLVM_SIZE=$(brew --prefix llvm39-julia)/bin/llvm-size";
83+
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";
8484
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
8585
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
8686
for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND; do
8787
export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1";
8888
done;
89+
export CXXFLAGS=-DUSE_ORCJIT;
8990
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
9091
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";
9192
export JULIA_MACOS_SPAWN="DYLD_FALLBACK_LIBRARY_PATH=\"$DYLD_FALLBACK_LIBRARY_PATH\" \$1";
@@ -101,7 +102,7 @@ script:
101102
# capture the log, but only print it if `make deps` fails
102103
# try to show the end of the log first, because this log might be very long (> 4MB)
103104
# and thus be truncated by travis
104-
- moreutils/mispipe "make $BUILDOPTS NO_GIT=1 -C deps 2> deps-err.log" "$BAR" > deps.log ||
105+
- moreutils/mispipe "make $BUILDOPTS VERBOSE=0 -C deps 2> deps-err.log" "$BAR" > deps.log ||
105106
{ echo "-- deps build log stderr tail 100 --------------------------------------";
106107
tail -n 100 deps-err.log;
107108
echo "-- deps build log stdout tail 100 --------------------------------------";

LICENSE.md

Lines changed: 2 additions & 2 deletions

Make.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ endif
642642
# If we are running on powerpc64le or ppc64le, set certain options automatically
643643
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
644644
JCFLAGS += -fsigned-char
645+
LLVM_VER:=3.9.0
645646
OPENBLAS_DYNAMIC_ARCH:=0
646647
OPENBLAS_TARGET_ARCH:=POWER8
647648
# GCC doesn't do -march= on ppc64le
@@ -656,6 +657,8 @@ endif
656657
# If we are running on ARM, set certain options automatically
657658
ifneq (,$(findstring arm,$(ARCH)))
658659
JCFLAGS += -fsigned-char
660+
661+
LLVM_VER:=3.9.0
659662
USE_BLAS64:=0
660663
OPENBLAS_DYNAMIC_ARCH:=0
661664
OPENBLAS_TARGET_ARCH:=ARMV7
@@ -664,6 +667,7 @@ endif
664667

665668
# If we are running on aarch64 (e.g. ARMv8 or ARM64), set certain options automatically
666669
ifneq (,$(findstring aarch64,$(ARCH)))
670+
LLVM_VER:=3.9.0
667671
OPENBLAS_DYNAMIC_ARCH:=0
668672
OPENBLAS_TARGET_ARCH:=ARMV8
669673
endif

README.md

Lines changed: 1 addition & 1 deletion

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.9.1-i686-w64-mingw32-juliadeps-r02.7z
37-
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r02.7z
36+
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
37+
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
3838
- usr/bin/busybox.exe
3939

4040
build_script:

contrib/windows/msys_build.sh

Lines changed: 3 additions & 1 deletion
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.9.1-$ARCH-w64-mingw32-juliadeps-r02.7z
126+
f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r09.7z
127127
else
128128
echo "override USEMSVC = 1" >> Make.user
129129
echo "override ARCH = $ARCH" >> Make.user
@@ -143,6 +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
146148

147149
if [ -z "`which make 2>/dev/null`" ]; then
148150
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.9.1
1+
LLVM_VER = 3.7.1
22
PCRE_VER = 10.22
33
DSFMT_VER = 2.2.3
44
LAPACK_VER = 3.5.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8284891e3e311829b8e44ac813d0c9ef
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8f9d27335e7331cf0a4711e952f21f01

0 commit comments

Comments
 (0)