Skip to content

Commit 1341082

Browse files
committedSep 1, 2014
Merge pull request #7957 from JuliaLang/sf/gmp6osx
[WIP] Update gmp to 6.0.0
2 parents eea90db + 77b2fe8 commit 1341082

File tree

7 files changed

+27
-3
lines changed

7 files changed

+27
-3
lines changed
 

‎deps/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,9 @@ gmp-$(GMP_VER).tar.bz2:
14721472
gmp-$(GMP_VER)/configure: gmp-$(GMP_VER).tar.bz2
14731473
$(JLCHECKSUM) $<
14741474
$(TAR) jxf $<
1475+
ifeq ($(OS), Darwin)
1476+
cd gmp-$(GMP_VER) && patch -p1 < ../gmp_6.0.0_osx.patch
1477+
endif
14751478
touch -c $@
14761479
gmp-$(GMP_VER)/config.status: gmp-$(GMP_VER)/configure
14771480
cd gmp-$(GMP_VER) && \

‎deps/Versions.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FFTW_VER = 3.3.3
1010
SUITESPARSE_VER = 4.2.1
1111
UNWIND_VER = 1.1
1212
OSXUNWIND_VER = 0.0.1-rc3
13-
GMP_VER=5.1.3
13+
GMP_VER=6.0.0
1414
MPFR_VER=3.1.2
1515
PATCHELF_VER = 0.8
1616
GIT_VER = 1.8.2.3

‎deps/checksums/gmp-5.1.3.tar.bz2/md5

-1
This file was deleted.

‎deps/checksums/gmp-5.1.3.tar.bz2/sha512

-1
This file was deleted.

‎deps/checksums/gmp-6.0.0.tar.bz2/md5

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6ef5869ae735db9995619135bd856b84
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
06bdd312146f77bd23d1447e60b02bfea2f1e6d00798b073879e8a50a6cf7264bdbf6f31a8347dd3a0889c7a9dee2d24051b74542fc4f9f07ba2d0f744e092ad

‎deps/gmp_6.0.0_osx.patch

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff -r db645603dcdb -r 1fab0adc5ff7 mpn/x86_64/k8/redc_1.asm
2+
--- a/mpn/x86_64/k8/redc_1.asm Mon Mar 31 23:04:32 2014 +0200
3+
+++ b/mpn/x86_64/k8/redc_1.asm Wed Apr 02 22:28:24 2014 +0200
4+
@@ -114,7 +114,7 @@
5+
6+
JUMPTABSECT
7+
ALIGN(8)
8+
-L(tab): JMPENT( L(0m4), L(tab))
9+
+L(tab): JMPENT( L(0), L(tab))
10+
JMPENT( L(1), L(tab))
11+
JMPENT( L(2), L(tab))
12+
JMPENT( L(3), L(tab))
13+
@@ -397,6 +397,7 @@
14+
15+
16+
ALIGN(16)
17+
+L(0):
18+
L(0m4):
19+
L(lo0): mov (mp,nneg,8), %rax
20+
mov nneg, i
21+

0 commit comments

Comments
 (0)
Please sign in to comment.