summaryrefslogtreecommitdiffstats
path: root/mpi-patches/use-txr-allocator
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-04-22 20:10:44 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-04-22 20:10:44 -0700
commitb0ebf843ce862f8448aad85e61cc1b3727745fd0 (patch)
tree47b934781729c5d2143de03eb8021521771c500f /mpi-patches/use-txr-allocator
parent790cbdccac0540d2af12438fc7bccef2e17bc124 (diff)
downloadtxr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.tar.gz
txr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.tar.bz2
txr-b0ebf843ce862f8448aad85e61cc1b3727745fd0.zip
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.
Diffstat (limited to 'mpi-patches/use-txr-allocator')
-rw-r--r--mpi-patches/use-txr-allocator68
1 files changed, 0 insertions, 68 deletions
diff --git a/mpi-patches/use-txr-allocator b/mpi-patches/use-txr-allocator
deleted file mode 100644
index dcc51a62..00000000
--- a/mpi-patches/use-txr-allocator
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: mpi-1.8.6/mpi.c
-===================================================================
---- mpi-1.8.6.orig/mpi.c 2015-02-03 08:18:36.625505588 -0800
-+++ mpi-1.8.6/mpi.c 2015-02-07 19:32:14.481303143 -0800
-@@ -15,6 +15,9 @@
- #include <string.h>
- #include <ctype.h>
-
-+typedef unsigned char mem_t;
-+extern mem_t *chk_calloc(size_t n, size_t size);
-+
- #if MP_DEBUG
- #include <stdio.h>
-
-@@ -154,7 +157,7 @@
- #define s_mp_copy(sp, dp, count) memcpy(dp, sp, (count) * sizeof(mp_digit))
- #endif /* MP_MEMCPY */
-
-- #define s_mp_alloc(nb, ni) calloc(nb, ni)
-+ #define s_mp_alloc(nb, ni) chk_calloc(nb, ni)
- #define s_mp_free(ptr) {if(ptr) free(ptr);}
- #endif /* MP_MACRO */
-
-@@ -282,7 +285,7 @@
- {
- ARGCHK(mp != NULL && prec > 0, MP_BADARG);
-
-- if((DIGITS(mp) = s_mp_alloc(prec, sizeof(mp_digit))) == NULL)
-+ if((DIGITS(mp) = (mp_digit *) s_mp_alloc(prec, sizeof(mp_digit))) == NULL)
- return MP_MEM;
-
- SIGN(mp) = MP_ZPOS;
-@@ -312,7 +315,7 @@
- if(mp == from)
- return MP_OKAY;
-
-- if((DIGITS(mp) = s_mp_alloc(USED(from), sizeof(mp_digit))) == NULL)
-+ if((DIGITS(mp) = (mp_digit *) s_mp_alloc(USED(from), sizeof(mp_digit))) == NULL)
- return MP_MEM;
-
- s_mp_copy(DIGITS(from), DIGITS(mp), USED(from));
-@@ -358,7 +361,7 @@
- s_mp_copy(DIGITS(from), DIGITS(to), USED(from));
-
- } else {
-- if((tmp = s_mp_alloc(USED(from), sizeof(mp_digit))) == NULL)
-+ if((tmp = (mp_digit *) s_mp_alloc(USED(from), sizeof(mp_digit))) == NULL)
- return MP_MEM;
-
- s_mp_copy(DIGITS(from), tmp, USED(from));
-@@ -2670,7 +2673,7 @@
- /* Set min to next nearest default precision block size */
- min = ((min + (s_mp_defprec - 1)) / s_mp_defprec) * s_mp_defprec;
-
-- if((tmp = s_mp_alloc(min, sizeof(mp_digit))) == NULL)
-+ if((tmp = (mp_digit *) s_mp_alloc(min, sizeof(mp_digit))) == NULL)
- return MP_MEM;
-
- s_mp_copy(DIGITS(mp), tmp, USED(mp));
-@@ -2757,7 +2760,7 @@
- /* Allocate ni records of nb bytes each, and return a pointer to that */
- void *s_mp_alloc(size_t nb, size_t ni)
- {
-- return calloc(nb, ni);
-+ return chk_calloc(nb, ni);
-
- } /* end s_mp_alloc() */
- #endif