Skip to content

Commit d13a8ef

Browse files
committed
LLVM 3.7.1!
adjust appveyor accordingly
1 parent 37d0634 commit d13a8ef

File tree

17 files changed

+11
-20
lines changed

17 files changed

+11
-20
lines changed

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ for exceptions.
2929
3030
Julia includes code from the following projects, which have their own licenses:
3131
- [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.
32-
- [LLVM](http://llvm.org/releases/3.3/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
32+
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively]
3333
- [MUSL](http://git.musl-libc.org/cgit/musl/tree/COPYRIGHT) (for getopt implementations on Windows) [MIT]
3434
- [NetBSD](http://www.netbsd.org/about/redistribution.html) (for setjmp, longjmp, and strptime implementations on Windows) [BSD-3]
3535

@@ -39,7 +39,7 @@ own licenses:
3939
- [FEMTOLISP](https://github.com/JeffBezanson/femtolisp) [BSD-3]
4040
- [LIBUNWIND](http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob_plain;f=LICENSE;hb=master) [MIT]
4141
- [LIBUV](https://github.com/joyent/libuv/blob/master/LICENSE) [MIT]
42-
- [LLVM](http://llvm.org/releases/3.3/LICENSE.TXT) [BSD-3, effectively]
42+
- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) [BSD-3, effectively]
4343
- [UTF8PROC](https://github.com/JuliaLang/libmojibake) [MIT]
4444

4545

Make.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,6 @@ JCFLAGS += -fsigned-char
603603

604604
LLVM_ASSERTIONS=1
605605
#LLVM_FLAGS+="--with-float=hard --with-abi=aapcs-vfp"
606-
LLVM_VER:=3.7.1
607606

608607
override USE_BLAS64:=0
609608
override OPENBLAS_DYNAMIC_ARCH:=0

Make.powerpc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ ifeq ($(USE_SYSTEM_LLVM),1)
2424
LLVM_CONFIG=llvm-config-3.5
2525
else
2626
LLVM_ASSERTIONS=1
27-
LLVM_VER=3.7.1
28-
LLVM_ASSERTIONS=1
2927
endif
3028

3129
# On a newly allocated machine, you'll need the following dependencies:

README.md

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

268268
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`:
269269

270-
- **[LLVM]** (3.3) — compiler infrastructure. (3.4 not supported; 3.5+ mostly supported, [with caveats](https://github.com/JuliaLang/julia/issues/9336))
270+
- **[LLVM]** (3.7) — compiler infrastructure.
271271
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
272272
- **[libuv]** — portable, high-performance event-based I/O library
273273
- **[OpenLibm]** — portable libm library containing elementary math functions.

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ cache:
3131
# Cache any downloads from sourceforge because it's really unreliable
3232
- i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
3333
- x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
34-
- llvm-3.3-i686-w64-mingw32-juliadeps.7z
35-
- llvm-3.3-x86_64-w64-mingw32-juliadeps.7z
34+
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r01.7z
35+
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r01.7z
3636

3737
build_script:
3838
# If there's a newer build queued for the same PR, cancel this one

contrib/windows/msys_build.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ if [ -z "$USEMSVC" ]; then
118118
fi
119119
export AR=${CROSS_COMPILE}ar
120120

121-
f=llvm-3.3-$ARCH-w64-mingw32-juliadeps.7z
122-
# The MinGW binary version of LLVM doesn't include libgtest or libgtest_main
123-
mkdir -p usr/lib
124-
$AR cr usr/lib/libgtest.a
125-
$AR cr usr/lib/libgtest_main.a
121+
f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r01.7z
126122
else
127123
echo "override USEMSVC = 1" >> Make.user
128124
echo "override ARCH = $ARCH" >> Make.user

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.3
1+
LLVM_VER = 3.7.1
22
LLVM_LIB_SUFFIX =
33
PCRE_VER = 10.20
44
DSFMT_VER = 2.2.3

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

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

deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512

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

deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5

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

0 commit comments

Comments
 (0)