From b0ebf843ce862f8448aad85e61cc1b3727745fd0 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 22 Apr 2015 20:10:44 -0700 Subject: Switch to in-tree mpi directory. * Makefile (CFLAGS, MPI_OBJS): Refer to mpi directory without version number. (repatch): Target removed. (distclean): Don't try to remove old unpacked tarball mpi directory. * configure (mpi_version, have_quilt, have_patch): Variables removed. (gen_config_make): Do not generate mpi_version make variable. Do not test for quilt or patch. No longer extract MPI tarball or try to apply patches. * mpi-1.8.6.tar.gz: File removed. * mpi-patches: Directory and all files under it removed. --- mpi-patches/fix-mult-bug | 58 ------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 mpi-patches/fix-mult-bug (limited to 'mpi-patches/fix-mult-bug') diff --git a/mpi-patches/fix-mult-bug b/mpi-patches/fix-mult-bug deleted file mode 100644 index 5ddb3094..00000000 --- a/mpi-patches/fix-mult-bug +++ /dev/null @@ -1,58 +0,0 @@ -Index: mpi-1.8.6/mpi.c -=================================================================== ---- mpi-1.8.6.orig/mpi.c 2015-02-07 19:32:48.892686392 -0800 -+++ mpi-1.8.6/mpi.c 2015-02-07 19:32:53.524604501 -0800 -@@ -3266,7 +3266,7 @@ - unless absolutely necessary. - */ - max = USED(a); -- w = dp[max - 1] * d; -+ w = dp[max - 1] * (mp_word) d; - if(CARRYOUT(w) != 0) { - if((res = s_mp_pad(a, max + 1)) != MP_OKAY) - return res; -@@ -3274,7 +3274,7 @@ - } - - for(ix = 0; ix < max; ix++) { -- w = (dp[ix] * d) + k; -+ w = (dp[ix] * (mp_word) d) + k; - dp[ix] = ACCUM(w); - k = CARRYOUT(w); - } -@@ -3491,7 +3491,7 @@ - pa = DIGITS(a); - for(jx = 0; jx < ua; ++jx, ++pa) { - pt = pbt + ix + jx; -- w = *pb * *pa + k + *pt; -+ w = *pb * (mp_word) *pa + k + *pt; - *pt = ACCUM(w); - k = CARRYOUT(w); - } -@@ -3573,7 +3573,7 @@ - if(*pa1 == 0) - continue; - -- w = DIGIT(&tmp, ix + ix) + (*pa1 * *pa1); -+ w = DIGIT(&tmp, ix + ix) + (*pa1 * (mp_word) *pa1); - - pbt[ix + ix] = ACCUM(w); - k = CARRYOUT(w); -@@ -3595,7 +3595,7 @@ - pt = pbt + ix + jx; - - /* Compute the multiplicative step */ -- w = *pa1 * *pa2; -+ w = *pa1 * (mp_word) *pa2; - - /* If w is more than half MP_WORD_MAX, the doubling will - overflow, and we need to record a carry out into the next -@@ -3639,7 +3639,7 @@ - */ - kx = 1; - while(k) { -- k = pbt[ix + jx + kx] + 1; -+ k = (mp_word) pbt[ix + jx + kx] + 1; - pbt[ix + jx + kx] = ACCUM(k); - k = CARRYOUT(k); - ++kx; -- cgit v1.2.3