1 |
commit: cc744c68d18b0c91a01739f08880cc5ba89ee146 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 7 01:16:14 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 7 01:16:14 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc744c68 |
7 |
|
8 |
dev-libs/mpfr: drop old 3.1.2 version |
9 |
|
10 |
dev-libs/mpfr/Manifest | 1 - |
11 |
dev-libs/mpfr/files/3.1.2/patch01 | 45 --- |
12 |
dev-libs/mpfr/files/3.1.2/patch02 | 605 ------------------------------------ |
13 |
dev-libs/mpfr/files/3.1.2/patch03 | 129 -------- |
14 |
dev-libs/mpfr/files/3.1.2/patch04 | 84 ----- |
15 |
dev-libs/mpfr/files/3.1.2/patch05 | 42 --- |
16 |
dev-libs/mpfr/files/3.1.2/patch06 | 43 --- |
17 |
dev-libs/mpfr/files/3.1.2/patch07 | 71 ----- |
18 |
dev-libs/mpfr/files/3.1.2/patch08 | 254 --------------- |
19 |
dev-libs/mpfr/files/3.1.2/patch09 | 166 ---------- |
20 |
dev-libs/mpfr/files/3.1.2/patch10 | 138 -------- |
21 |
dev-libs/mpfr/mpfr-3.1.2_p10.ebuild | 62 ---- |
22 |
12 files changed, 1640 deletions(-) |
23 |
|
24 |
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest |
25 |
index 3e5ba8c..1b58f51 100644 |
26 |
--- a/dev-libs/mpfr/Manifest |
27 |
+++ b/dev-libs/mpfr/Manifest |
28 |
@@ -1,4 +1,3 @@ |
29 |
DIST mpfr-2.4.2.tar.bz2 1077886 SHA256 c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba SHA512 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e WHIRLPOOL d08935d1c5cda48753ddbf98b3b0e87d911279d7fea24e6b210da7e2378f769f3b20babe96859601195d6a9811cf8297d239df53ad2cfa6d0a1bb7bb02ac6a29 |
30 |
-DIST mpfr-3.1.2.tar.xz 1074388 SHA256 399d0f47ef6608cc01d29ed1b99c7faff36d9994c45f36f41ba250147100453b SHA512 8d594206afb2637ed39ad564d42c8c4d02b042b95925f5c6ec891e5cb87f7155195559c7ff477256a088ecaaa3c2b0d35a9d11a74ed526a1080d49b2950e5587 WHIRLPOOL 1e391888d9cecc71617e99eb841cafac536e703b12d46a53fdcf773cc2654c98ca6bde2358f997c8b7bfd832bdb0c395b224df8a460a8fb5b4ad6f2c2e092b17 |
31 |
DIST mpfr-3.1.3.tar.xz 1112096 SHA256 6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16 SHA512 79846fd82974269aa48152c2b6dbcb2321130dc4d0f0ba2eb94d56619b177add9b2077ebf88b4382c56db19c4215910e5a252f216715c1eee40baa299da42eb4 WHIRLPOOL fba9174551511ffa0fed80d906c5282c095697e79ab9b6fdeb915b9a81f15e20290b3ae6aa7c9ee9ef10fa9c0f973d8a75e1a169aae43f87a28ca433a93c57ce |
32 |
DIST mpfr-3.1.4.tar.xz 1122152 SHA256 761413b16d749c53e2bfd2b1dfaa3b027b0e793e404b90b5fbaeef60af6517f5 SHA512 4ef61708834efdea6b85258f46f1b25ce1c55b912f44b117d8c3d5e06d8f1177e50f627d9736f3289bd159c5bb10c80e09d1ad9f6f52c4ff43c3496034b04232 WHIRLPOOL 86021e6a60cad98ea42f8ab5bfe990a744ee21fbe89612e083dea43f7e981e84fcbc86de4a90e7a058c569b57b97359a29c9cf5252b960aa91f2247fb96c2743 |
33 |
|
34 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch01 b/dev-libs/mpfr/files/3.1.2/patch01 |
35 |
deleted file mode 100644 |
36 |
index 731ea92..0000000 |
37 |
--- a/dev-libs/mpfr/files/3.1.2/patch01 |
38 |
+++ /dev/null |
39 |
@@ -1,45 +0,0 @@ |
40 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
41 |
---- mpfr-3.1.2-a/PATCHES 2013-09-26 10:52:52.000000000 +0000 |
42 |
-+++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:52:52.000000000 +0000 |
43 |
-@@ -0,0 +1 @@ |
44 |
-+exp_2 |
45 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
46 |
---- mpfr-3.1.2-a/VERSION 2013-03-13 15:37:28.000000000 +0000 |
47 |
-+++ mpfr-3.1.2-b/VERSION 2013-09-26 10:52:52.000000000 +0000 |
48 |
-@@ -1 +1 @@ |
49 |
--3.1.2 |
50 |
-+3.1.2-p1 |
51 |
-diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c |
52 |
---- mpfr-3.1.2-a/src/exp_2.c 2013-03-13 15:37:28.000000000 +0000 |
53 |
-+++ mpfr-3.1.2-b/src/exp_2.c 2013-09-26 10:52:52.000000000 +0000 |
54 |
-@@ -204,7 +204,7 @@ |
55 |
- for (k = 0; k < K; k++) |
56 |
- { |
57 |
- mpz_mul (ss, ss, ss); |
58 |
-- exps <<= 1; |
59 |
-+ exps *= 2; |
60 |
- exps += mpz_normalize (ss, ss, q); |
61 |
- } |
62 |
- mpfr_set_z (s, ss, MPFR_RNDN); |
63 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
64 |
---- mpfr-3.1.2-a/src/mpfr.h 2013-03-13 15:37:37.000000000 +0000 |
65 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 |
66 |
-@@ -27,7 +27,7 @@ |
67 |
- #define MPFR_VERSION_MAJOR 3 |
68 |
- #define MPFR_VERSION_MINOR 1 |
69 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
70 |
--#define MPFR_VERSION_STRING "3.1.2" |
71 |
-+#define MPFR_VERSION_STRING "3.1.2-p1" |
72 |
- |
73 |
- /* Macros dealing with MPFR VERSION */ |
74 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
75 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
76 |
---- mpfr-3.1.2-a/src/version.c 2013-03-13 15:37:34.000000000 +0000 |
77 |
-+++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:52:52.000000000 +0000 |
78 |
-@@ -25,5 +25,5 @@ |
79 |
- const char * |
80 |
- mpfr_get_version (void) |
81 |
- { |
82 |
-- return "3.1.2"; |
83 |
-+ return "3.1.2-p1"; |
84 |
- } |
85 |
|
86 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch02 b/dev-libs/mpfr/files/3.1.2/patch02 |
87 |
deleted file mode 100644 |
88 |
index b229c18..0000000 |
89 |
--- a/dev-libs/mpfr/files/3.1.2/patch02 |
90 |
+++ /dev/null |
91 |
@@ -1,605 +0,0 @@ |
92 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
93 |
---- mpfr-3.1.2-a/PATCHES 2013-09-26 10:56:55.000000000 +0000 |
94 |
-+++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:56:55.000000000 +0000 |
95 |
-@@ -0,0 +1 @@ |
96 |
-+fits-smallneg |
97 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
98 |
---- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 |
99 |
-+++ mpfr-3.1.2-b/VERSION 2013-09-26 10:56:55.000000000 +0000 |
100 |
-@@ -1 +1 @@ |
101 |
--3.1.2-p1 |
102 |
-+3.1.2-p2 |
103 |
-diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h |
104 |
---- mpfr-3.1.2-a/src/fits_u.h 2013-03-13 15:37:35.000000000 +0000 |
105 |
-+++ mpfr-3.1.2-b/src/fits_u.h 2013-09-26 10:56:55.000000000 +0000 |
106 |
-@@ -32,17 +32,20 @@ |
107 |
- int res; |
108 |
- |
109 |
- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) |
110 |
-- /* Zero always fit */ |
111 |
-- return MPFR_IS_ZERO (f) ? 1 : 0; |
112 |
-- else if (MPFR_IS_NEG (f)) |
113 |
-- /* Negative numbers don't fit */ |
114 |
-- return 0; |
115 |
-- /* now it fits if |
116 |
-- (a) f <= MAXIMUM |
117 |
-- (b) round(f, prec(slong), rnd) <= MAXIMUM */ |
118 |
-+ return MPFR_IS_ZERO (f) ? 1 : 0; /* Zero always fits */ |
119 |
- |
120 |
- e = MPFR_GET_EXP (f); |
121 |
- |
122 |
-+ if (MPFR_IS_NEG (f)) |
123 |
-+ return e >= 1 ? 0 /* f <= -1 does not fit */ |
124 |
-+ : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1) /* directed mode */ |
125 |
-+ : e < 0 ? 1 /* f > -1/2 fits in MPFR_RNDN */ |
126 |
-+ : mpfr_powerof2_raw(f); /* -1/2 fits, -1 < f < -1/2 don't */ |
127 |
-+ |
128 |
-+ /* Now it fits if |
129 |
-+ (a) f <= MAXIMUM |
130 |
-+ (b) round(f, prec(slong), rnd) <= MAXIMUM */ |
131 |
-+ |
132 |
- /* first compute prec(MAXIMUM); fits in an int */ |
133 |
- for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++); |
134 |
- |
135 |
-diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c |
136 |
---- mpfr-3.1.2-a/src/fits_uintmax.c 2013-03-13 15:37:33.000000000 +0000 |
137 |
-+++ mpfr-3.1.2-b/src/fits_uintmax.c 2013-09-26 10:56:55.000000000 +0000 |
138 |
-@@ -27,51 +27,19 @@ |
139 |
- #include "mpfr-intmax.h" |
140 |
- #include "mpfr-impl.h" |
141 |
- |
142 |
--#ifdef _MPFR_H_HAVE_INTMAX_T |
143 |
-- |
144 |
--/* We can't use fits_u.h <= mpfr_cmp_ui */ |
145 |
--int |
146 |
--mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd) |
147 |
--{ |
148 |
-- mpfr_exp_t e; |
149 |
-- int prec; |
150 |
-- uintmax_t s; |
151 |
-- mpfr_t x; |
152 |
-- int res; |
153 |
-- |
154 |
-- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) |
155 |
-- /* Zero always fit */ |
156 |
-- return MPFR_IS_ZERO (f) ? 1 : 0; |
157 |
-- else if (MPFR_IS_NEG (f)) |
158 |
-- /* Negative numbers don't fit */ |
159 |
-- return 0; |
160 |
-- /* now it fits if |
161 |
-- (a) f <= MAXIMUM |
162 |
-- (b) round(f, prec(slong), rnd) <= MAXIMUM */ |
163 |
-- |
164 |
-- e = MPFR_GET_EXP (f); |
165 |
-- |
166 |
-- /* first compute prec(MAXIMUM); fits in an int */ |
167 |
-- for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++); |
168 |
-- |
169 |
-- /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */ |
170 |
-- |
171 |
-- /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */ |
172 |
-- if (e <= prec - 1) |
173 |
-- return 1; |
174 |
-+/* Note: though mpfr-impl.h is included in fits_u.h, we also include it |
175 |
-+ above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not |
176 |
-+ defined; this is necessary to avoid an empty translation unit, which |
177 |
-+ is forbidden by ISO C. Without this, a failing test can be reproduced |
178 |
-+ by creating an invalid stdint.h somewhere in the default include path |
179 |
-+ and by compiling MPFR with "gcc -ansi -pedantic-errors". */ |
180 |
- |
181 |
-- /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */ |
182 |
-- if (e >= prec + 1) |
183 |
-- return 0; |
184 |
-+#ifdef _MPFR_H_HAVE_INTMAX_T |
185 |
- |
186 |
-- MPFR_ASSERTD (e == prec); |
187 |
-+#define FUNCTION mpfr_fits_uintmax_p |
188 |
-+#define MAXIMUM MPFR_UINTMAX_MAX |
189 |
-+#define TYPE uintmax_t |
190 |
- |
191 |
-- /* hard case: first round to prec bits, then check */ |
192 |
-- mpfr_init2 (x, prec); |
193 |
-- mpfr_set (x, f, rnd); |
194 |
-- res = MPFR_GET_EXP (x) == e; |
195 |
-- mpfr_clear (x); |
196 |
-- return res; |
197 |
--} |
198 |
-+#include "fits_u.h" |
199 |
- |
200 |
- #endif |
201 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
202 |
---- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 |
203 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:56:55.000000000 +0000 |
204 |
-@@ -27,7 +27,7 @@ |
205 |
- #define MPFR_VERSION_MAJOR 3 |
206 |
- #define MPFR_VERSION_MINOR 1 |
207 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
208 |
--#define MPFR_VERSION_STRING "3.1.2-p1" |
209 |
-+#define MPFR_VERSION_STRING "3.1.2-p2" |
210 |
- |
211 |
- /* Macros dealing with MPFR VERSION */ |
212 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
213 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
214 |
---- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 |
215 |
-+++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:56:55.000000000 +0000 |
216 |
-@@ -25,5 +25,5 @@ |
217 |
- const char * |
218 |
- mpfr_get_version (void) |
219 |
- { |
220 |
-- return "3.1.2-p1"; |
221 |
-+ return "3.1.2-p2"; |
222 |
- } |
223 |
-diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c |
224 |
---- mpfr-3.1.2-a/tests/tfits.c 2013-03-13 15:37:45.000000000 +0000 |
225 |
-+++ mpfr-3.1.2-b/tests/tfits.c 2013-09-26 10:56:55.000000000 +0000 |
226 |
-@@ -33,155 +33,176 @@ |
227 |
- #include "mpfr-intmax.h" |
228 |
- #include "mpfr-test.h" |
229 |
- |
230 |
--#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); } |
231 |
--#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); } |
232 |
-+#define ERROR1(N) \ |
233 |
-+ do \ |
234 |
-+ { \ |
235 |
-+ printf("Error %d for rnd = %s and x = ", N, \ |
236 |
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); \ |
237 |
-+ mpfr_dump(x); \ |
238 |
-+ exit(1); \ |
239 |
-+ } \ |
240 |
-+ while (0) |
241 |
- |
242 |
- static void check_intmax (void); |
243 |
- |
244 |
- int |
245 |
- main (void) |
246 |
- { |
247 |
-- mpfr_t x; |
248 |
-+ mpfr_t x, y; |
249 |
-+ int i, r; |
250 |
- |
251 |
- tests_start_mpfr (); |
252 |
- |
253 |
- mpfr_init2 (x, 256); |
254 |
-+ mpfr_init2 (y, 8); |
255 |
- |
256 |
-- /* Check NAN */ |
257 |
-- mpfr_set_nan (x); |
258 |
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) |
259 |
-- ERROR1; |
260 |
-- if (mpfr_fits_slong_p (x, MPFR_RNDN)) |
261 |
-- ERROR1; |
262 |
-- if (mpfr_fits_uint_p (x, MPFR_RNDN)) |
263 |
-- ERROR1; |
264 |
-- if (mpfr_fits_sint_p (x, MPFR_RNDN)) |
265 |
-- ERROR1; |
266 |
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) |
267 |
-- ERROR1; |
268 |
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) |
269 |
-- ERROR1; |
270 |
-+ RND_LOOP (r) |
271 |
-+ { |
272 |
- |
273 |
-- /* Check INF */ |
274 |
-- mpfr_set_inf (x, 1); |
275 |
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) |
276 |
-- ERROR1; |
277 |
-- if (mpfr_fits_slong_p (x, MPFR_RNDN)) |
278 |
-- ERROR1; |
279 |
-- if (mpfr_fits_uint_p (x, MPFR_RNDN)) |
280 |
-- ERROR1; |
281 |
-- if (mpfr_fits_sint_p (x, MPFR_RNDN)) |
282 |
-- ERROR1; |
283 |
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) |
284 |
-- ERROR1; |
285 |
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) |
286 |
-- ERROR1; |
287 |
-+ /* Check NAN */ |
288 |
-+ mpfr_set_nan (x); |
289 |
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
290 |
-+ ERROR1 (1); |
291 |
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
292 |
-+ ERROR1 (2); |
293 |
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
294 |
-+ ERROR1 (3); |
295 |
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
296 |
-+ ERROR1 (4); |
297 |
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
298 |
-+ ERROR1 (5); |
299 |
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
300 |
-+ ERROR1 (6); |
301 |
- |
302 |
-- /* Check Zero */ |
303 |
-- MPFR_SET_ZERO (x); |
304 |
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) |
305 |
-- ERROR2; |
306 |
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) |
307 |
-- ERROR2; |
308 |
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) |
309 |
-- ERROR2; |
310 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
311 |
-- ERROR2; |
312 |
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) |
313 |
-- ERROR2; |
314 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
315 |
-- ERROR2; |
316 |
-+ /* Check INF */ |
317 |
-+ mpfr_set_inf (x, 1); |
318 |
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
319 |
-+ ERROR1 (7); |
320 |
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
321 |
-+ ERROR1 (8); |
322 |
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
323 |
-+ ERROR1 (9); |
324 |
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
325 |
-+ ERROR1 (10); |
326 |
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
327 |
-+ ERROR1 (11); |
328 |
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
329 |
-+ ERROR1 (12); |
330 |
- |
331 |
-- /* Check small op */ |
332 |
-- mpfr_set_str1 (x, "1@-1"); |
333 |
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) |
334 |
-- ERROR2; |
335 |
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) |
336 |
-- ERROR2; |
337 |
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) |
338 |
-- ERROR2; |
339 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
340 |
-- ERROR2; |
341 |
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) |
342 |
-- ERROR2; |
343 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
344 |
-- ERROR2; |
345 |
-+ /* Check Zero */ |
346 |
-+ MPFR_SET_ZERO (x); |
347 |
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
348 |
-+ ERROR1 (13); |
349 |
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
350 |
-+ ERROR1 (14); |
351 |
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
352 |
-+ ERROR1 (15); |
353 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
354 |
-+ ERROR1 (16); |
355 |
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
356 |
-+ ERROR1 (17); |
357 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
358 |
-+ ERROR1 (18); |
359 |
- |
360 |
-- /* Check 17 */ |
361 |
-- mpfr_set_ui (x, 17, MPFR_RNDN); |
362 |
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) |
363 |
-- ERROR2; |
364 |
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) |
365 |
-- ERROR2; |
366 |
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) |
367 |
-- ERROR2; |
368 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
369 |
-- ERROR2; |
370 |
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) |
371 |
-- ERROR2; |
372 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
373 |
-- ERROR2; |
374 |
-+ /* Check small positive op */ |
375 |
-+ mpfr_set_str1 (x, "1@-1"); |
376 |
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
377 |
-+ ERROR1 (19); |
378 |
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
379 |
-+ ERROR1 (20); |
380 |
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
381 |
-+ ERROR1 (21); |
382 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
383 |
-+ ERROR1 (22); |
384 |
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
385 |
-+ ERROR1 (23); |
386 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
387 |
-+ ERROR1 (24); |
388 |
- |
389 |
-- /* Check all other values */ |
390 |
-- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); |
391 |
-- mpfr_mul_2exp (x, x, 1, MPFR_RNDN); |
392 |
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) |
393 |
-- ERROR1; |
394 |
-- if (mpfr_fits_slong_p (x, MPFR_RNDN)) |
395 |
-- ERROR1; |
396 |
-- mpfr_mul_2exp (x, x, 40, MPFR_RNDN); |
397 |
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) |
398 |
-- ERROR1; |
399 |
-- if (mpfr_fits_uint_p (x, MPFR_RNDN)) |
400 |
-- ERROR1; |
401 |
-- if (mpfr_fits_sint_p (x, MPFR_RNDN)) |
402 |
-- ERROR1; |
403 |
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) |
404 |
-- ERROR1; |
405 |
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) |
406 |
-- ERROR1; |
407 |
-+ /* Check 17 */ |
408 |
-+ mpfr_set_ui (x, 17, MPFR_RNDN); |
409 |
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
410 |
-+ ERROR1 (25); |
411 |
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
412 |
-+ ERROR1 (26); |
413 |
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
414 |
-+ ERROR1 (27); |
415 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
416 |
-+ ERROR1 (28); |
417 |
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
418 |
-+ ERROR1 (29); |
419 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
420 |
-+ ERROR1 (30); |
421 |
- |
422 |
-- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); |
423 |
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) |
424 |
-- ERROR2; |
425 |
-- mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); |
426 |
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) |
427 |
-- ERROR2; |
428 |
-- mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); |
429 |
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) |
430 |
-- ERROR2; |
431 |
-- mpfr_set_ui (x, INT_MAX, MPFR_RNDN); |
432 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
433 |
-- ERROR2; |
434 |
-- mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); |
435 |
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) |
436 |
-- ERROR2; |
437 |
-- mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); |
438 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
439 |
-- ERROR2; |
440 |
-+ /* Check all other values */ |
441 |
-+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); |
442 |
-+ mpfr_mul_2exp (x, x, 1, MPFR_RNDN); |
443 |
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
444 |
-+ ERROR1 (31); |
445 |
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
446 |
-+ ERROR1 (32); |
447 |
-+ mpfr_mul_2exp (x, x, 40, MPFR_RNDN); |
448 |
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
449 |
-+ ERROR1 (33); |
450 |
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
451 |
-+ ERROR1 (34); |
452 |
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
453 |
-+ ERROR1 (35); |
454 |
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
455 |
-+ ERROR1 (36); |
456 |
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
457 |
-+ ERROR1 (37); |
458 |
- |
459 |
-- mpfr_set_si (x, 1, MPFR_RNDN); |
460 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
461 |
-- ERROR2; |
462 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
463 |
-- ERROR2; |
464 |
-+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); |
465 |
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) |
466 |
-+ ERROR1 (38); |
467 |
-+ mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); |
468 |
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
469 |
-+ ERROR1 (39); |
470 |
-+ mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); |
471 |
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) |
472 |
-+ ERROR1 (40); |
473 |
-+ mpfr_set_ui (x, INT_MAX, MPFR_RNDN); |
474 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
475 |
-+ ERROR1 (41); |
476 |
-+ mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); |
477 |
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) |
478 |
-+ ERROR1 (42); |
479 |
-+ mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); |
480 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
481 |
-+ ERROR1 (43); |
482 |
- |
483 |
-- /* Check negative value */ |
484 |
-- mpfr_set_si (x, -1, MPFR_RNDN); |
485 |
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) |
486 |
-- ERROR2; |
487 |
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) |
488 |
-- ERROR2; |
489 |
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) |
490 |
-- ERROR2; |
491 |
-- if (mpfr_fits_uint_p (x, MPFR_RNDN)) |
492 |
-- ERROR1; |
493 |
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) |
494 |
-- ERROR1; |
495 |
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) |
496 |
-- ERROR1; |
497 |
-+ mpfr_set_si (x, 1, MPFR_RNDN); |
498 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
499 |
-+ ERROR1 (44); |
500 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
501 |
-+ ERROR1 (45); |
502 |
-+ |
503 |
-+ /* Check negative op */ |
504 |
-+ for (i = 1; i <= 4; i++) |
505 |
-+ { |
506 |
-+ int inv; |
507 |
-+ |
508 |
-+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); |
509 |
-+ mpfr_rint (y, x, (mpfr_rnd_t) r); |
510 |
-+ inv = MPFR_NOTZERO (y); |
511 |
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv) |
512 |
-+ ERROR1 (46); |
513 |
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) |
514 |
-+ ERROR1 (47); |
515 |
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv) |
516 |
-+ ERROR1 (48); |
517 |
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) |
518 |
-+ ERROR1 (49); |
519 |
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv) |
520 |
-+ ERROR1 (50); |
521 |
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) |
522 |
-+ ERROR1 (51); |
523 |
-+ } |
524 |
-+ } |
525 |
- |
526 |
- mpfr_clear (x); |
527 |
-+ mpfr_clear (y); |
528 |
- |
529 |
- check_intmax (); |
530 |
- |
531 |
-@@ -189,85 +210,98 @@ |
532 |
- return 0; |
533 |
- } |
534 |
- |
535 |
--static void check_intmax (void) |
536 |
-+static void |
537 |
-+check_intmax (void) |
538 |
- { |
539 |
- #ifdef _MPFR_H_HAVE_INTMAX_T |
540 |
-- mpfr_t x; |
541 |
-+ mpfr_t x, y; |
542 |
-+ int i, r; |
543 |
- |
544 |
-- mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT); |
545 |
-+ mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT); |
546 |
-+ mpfr_init2 (y, 8); |
547 |
- |
548 |
-- /* Check NAN */ |
549 |
-- mpfr_set_nan (x); |
550 |
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
551 |
-- ERROR1; |
552 |
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) |
553 |
-- ERROR1; |
554 |
-+ RND_LOOP (r) |
555 |
-+ { |
556 |
-+ /* Check NAN */ |
557 |
-+ mpfr_set_nan (x); |
558 |
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
559 |
-+ ERROR1 (52); |
560 |
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
561 |
-+ ERROR1 (53); |
562 |
- |
563 |
-- /* Check INF */ |
564 |
-- mpfr_set_inf (x, 1); |
565 |
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
566 |
-- ERROR1; |
567 |
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) |
568 |
-- ERROR1; |
569 |
-+ /* Check INF */ |
570 |
-+ mpfr_set_inf (x, 1); |
571 |
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
572 |
-+ ERROR1 (54); |
573 |
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
574 |
-+ ERROR1 (55); |
575 |
- |
576 |
-- /* Check Zero */ |
577 |
-- MPFR_SET_ZERO (x); |
578 |
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
579 |
-- ERROR2; |
580 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
581 |
-- ERROR2; |
582 |
-+ /* Check Zero */ |
583 |
-+ MPFR_SET_ZERO (x); |
584 |
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
585 |
-+ ERROR1 (56); |
586 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
587 |
-+ ERROR1 (57); |
588 |
- |
589 |
-- /* Check small op */ |
590 |
-- mpfr_set_str1 (x, "1@-1"); |
591 |
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
592 |
-- ERROR2; |
593 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
594 |
-- ERROR2; |
595 |
-+ /* Check positive small op */ |
596 |
-+ mpfr_set_str1 (x, "1@-1"); |
597 |
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
598 |
-+ ERROR1 (58); |
599 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
600 |
-+ ERROR1 (59); |
601 |
- |
602 |
-- /* Check 17 */ |
603 |
-- mpfr_set_ui (x, 17, MPFR_RNDN); |
604 |
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
605 |
-- ERROR2; |
606 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
607 |
-- ERROR2; |
608 |
-+ /* Check 17 */ |
609 |
-+ mpfr_set_ui (x, 17, MPFR_RNDN); |
610 |
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
611 |
-+ ERROR1 (60); |
612 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
613 |
-+ ERROR1 (61); |
614 |
- |
615 |
-- /* Check hugest */ |
616 |
-- mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); |
617 |
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
618 |
-- ERROR1; |
619 |
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) |
620 |
-- ERROR1; |
621 |
-+ /* Check hugest */ |
622 |
-+ mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); |
623 |
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
624 |
-+ ERROR1 (62); |
625 |
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
626 |
-+ ERROR1 (63); |
627 |
- |
628 |
-- /* Check all other values */ |
629 |
-- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); |
630 |
-- mpfr_add_ui (x, x, 1, MPFR_RNDN); |
631 |
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
632 |
-- ERROR1; |
633 |
-- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); |
634 |
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
635 |
-- ERROR2; |
636 |
-- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); |
637 |
-- mpfr_add_ui (x, x, 1, MPFR_RNDN); |
638 |
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) |
639 |
-- ERROR1; |
640 |
-- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); |
641 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
642 |
-- ERROR2; |
643 |
-- mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); |
644 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
645 |
-- ERROR2; |
646 |
-- mpfr_sub_ui (x, x, 1, MPFR_RNDN); |
647 |
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) |
648 |
-- ERROR1; |
649 |
-+ /* Check all other values */ |
650 |
-+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); |
651 |
-+ mpfr_add_ui (x, x, 1, MPFR_RNDN); |
652 |
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
653 |
-+ ERROR1 (64); |
654 |
-+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); |
655 |
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) |
656 |
-+ ERROR1 (65); |
657 |
-+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); |
658 |
-+ mpfr_add_ui (x, x, 1, MPFR_RNDN); |
659 |
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
660 |
-+ ERROR1 (66); |
661 |
-+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); |
662 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
663 |
-+ ERROR1 (67); |
664 |
-+ mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); |
665 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
666 |
-+ ERROR1 (68); |
667 |
-+ mpfr_sub_ui (x, x, 1, MPFR_RNDN); |
668 |
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
669 |
-+ ERROR1 (69); |
670 |
- |
671 |
-- /* Check negative value */ |
672 |
-- mpfr_set_si (x, -1, MPFR_RNDN); |
673 |
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) |
674 |
-- ERROR2; |
675 |
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) |
676 |
-- ERROR1; |
677 |
-+ /* Check negative op */ |
678 |
-+ for (i = 1; i <= 4; i++) |
679 |
-+ { |
680 |
-+ int inv; |
681 |
-+ |
682 |
-+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); |
683 |
-+ mpfr_rint (y, x, (mpfr_rnd_t) r); |
684 |
-+ inv = MPFR_NOTZERO (y); |
685 |
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv) |
686 |
-+ ERROR1 (70); |
687 |
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) |
688 |
-+ ERROR1 (71); |
689 |
-+ } |
690 |
-+ } |
691 |
- |
692 |
- mpfr_clear (x); |
693 |
-+ mpfr_clear (y); |
694 |
- #endif |
695 |
- } |
696 |
-- |
697 |
|
698 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch03 b/dev-libs/mpfr/files/3.1.2/patch03 |
699 |
deleted file mode 100644 |
700 |
index 8e0cd8e..0000000 |
701 |
--- a/dev-libs/mpfr/files/3.1.2/patch03 |
702 |
+++ /dev/null |
703 |
@@ -1,129 +0,0 @@ |
704 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
705 |
---- mpfr-3.1.2-a/PATCHES 2013-10-09 13:34:21.000000000 +0000 |
706 |
-+++ mpfr-3.1.2-b/PATCHES 2013-10-09 13:34:21.000000000 +0000 |
707 |
-@@ -0,0 +1 @@ |
708 |
-+clang-divby0 |
709 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
710 |
---- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 |
711 |
-+++ mpfr-3.1.2-b/VERSION 2013-10-09 13:34:21.000000000 +0000 |
712 |
-@@ -1 +1 @@ |
713 |
--3.1.2-p2 |
714 |
-+3.1.2-p3 |
715 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h |
716 |
---- mpfr-3.1.2-a/src/mpfr-impl.h 2013-03-13 15:37:36.000000000 +0000 |
717 |
-+++ mpfr-3.1.2-b/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000 |
718 |
-@@ -468,8 +468,16 @@ |
719 |
- #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1) |
720 |
- |
721 |
- /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0 |
722 |
-- at compile time. */ |
723 |
--#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200) |
724 |
-+ at compile time. |
725 |
-+ Clang with -fsanitize=undefined is a bit similar due to a bug: |
726 |
-+ http://llvm.org/bugs/show_bug.cgi?id=17381 |
727 |
-+ but even without its sanitizer, it may be better to use the |
728 |
-+ double_zero version until IEEE 754 division by zero is properly |
729 |
-+ supported: |
730 |
-+ http://llvm.org/bugs/show_bug.cgi?id=17000 |
731 |
-+*/ |
732 |
-+#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \ |
733 |
-+ defined(__clang__) |
734 |
- static double double_zero = 0.0; |
735 |
- # define DBL_NAN (double_zero/double_zero) |
736 |
- # define DBL_POS_INF ((double) 1.0/double_zero) |
737 |
-@@ -501,6 +509,8 @@ |
738 |
- (with Xcode 2.4.1, i.e. the latest one). */ |
739 |
- #define LVALUE(x) (&(x) == &(x) || &(x) != &(x)) |
740 |
- #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX)) |
741 |
-+/* The DOUBLE_ISNAN(x) macro is also valid on long double x |
742 |
-+ (assuming that the compiler isn't too broken). */ |
743 |
- #ifdef MPFR_NANISNAN |
744 |
- /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations. |
745 |
- The + must not be replaced by a ||. With gcc -ffast-math, NaN is |
746 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
747 |
---- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 |
748 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-10-09 13:34:21.000000000 +0000 |
749 |
-@@ -27,7 +27,7 @@ |
750 |
- #define MPFR_VERSION_MAJOR 3 |
751 |
- #define MPFR_VERSION_MINOR 1 |
752 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
753 |
--#define MPFR_VERSION_STRING "3.1.2-p2" |
754 |
-+#define MPFR_VERSION_STRING "3.1.2-p3" |
755 |
- |
756 |
- /* Macros dealing with MPFR VERSION */ |
757 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
758 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
759 |
---- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 |
760 |
-+++ mpfr-3.1.2-b/src/version.c 2013-10-09 13:34:21.000000000 +0000 |
761 |
-@@ -25,5 +25,5 @@ |
762 |
- const char * |
763 |
- mpfr_get_version (void) |
764 |
- { |
765 |
-- return "3.1.2-p2"; |
766 |
-+ return "3.1.2-p3"; |
767 |
- } |
768 |
-diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c |
769 |
---- mpfr-3.1.2-a/tests/tget_flt.c 2013-03-13 15:37:44.000000000 +0000 |
770 |
-+++ mpfr-3.1.2-b/tests/tget_flt.c 2013-10-09 13:34:21.000000000 +0000 |
771 |
-@@ -28,9 +28,17 @@ |
772 |
- main (void) |
773 |
- { |
774 |
- mpfr_t x, y; |
775 |
-- float f, g, infp; |
776 |
-+ float f, g; |
777 |
- int i; |
778 |
-+#if !defined(MPFR_ERRDIVZERO) |
779 |
-+ float infp; |
780 |
-+#endif |
781 |
-+ |
782 |
-+ tests_start_mpfr (); |
783 |
- |
784 |
-+#if !defined(MPFR_ERRDIVZERO) |
785 |
-+ /* The definition of DBL_POS_INF involves a division by 0. This makes |
786 |
-+ "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */ |
787 |
- infp = (float) DBL_POS_INF; |
788 |
- if (infp * 0.5 != infp) |
789 |
- { |
790 |
-@@ -38,8 +46,7 @@ |
791 |
- fprintf (stderr, "(this is probably a compiler bug, please report)\n"); |
792 |
- exit (1); |
793 |
- } |
794 |
-- |
795 |
-- tests_start_mpfr (); |
796 |
-+#endif |
797 |
- |
798 |
- mpfr_init2 (x, 24); |
799 |
- mpfr_init2 (y, 24); |
800 |
-@@ -353,6 +360,7 @@ |
801 |
- printf ("expected %.8e, got %.8e\n", g, f); |
802 |
- exit (1); |
803 |
- } |
804 |
-+#if !defined(MPFR_ERRDIVZERO) |
805 |
- f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule), |
806 |
- thus we should get +Inf */ |
807 |
- g = infp; |
808 |
-@@ -376,6 +384,7 @@ |
809 |
- printf ("expected %.8e, got %.8e\n", g, f); |
810 |
- exit (1); |
811 |
- } |
812 |
-+#endif |
813 |
- |
814 |
- mpfr_clear (x); |
815 |
- mpfr_clear (y); |
816 |
-diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c |
817 |
---- mpfr-3.1.2-a/tests/tset_ld.c 2013-03-13 15:37:44.000000000 +0000 |
818 |
-+++ mpfr-3.1.2-b/tests/tset_ld.c 2013-10-09 13:34:21.000000000 +0000 |
819 |
-@@ -47,8 +47,11 @@ |
820 |
- static int |
821 |
- Isnan_ld (long double d) |
822 |
- { |
823 |
-- double e = (double) d; |
824 |
-- if (DOUBLE_ISNAN (e)) |
825 |
-+ /* Do not convert d to double as this can give an overflow, which |
826 |
-+ may confuse compilers without IEEE 754 support (such as clang |
827 |
-+ -fsanitize=undefined), or trigger a trap if enabled. |
828 |
-+ The DOUBLE_ISNAN macro should work fine on long double. */ |
829 |
-+ if (DOUBLE_ISNAN (d)) |
830 |
- return 1; |
831 |
- LONGDOUBLE_NAN_ACTION (d, goto yes); |
832 |
- return 0; |
833 |
|
834 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch04 b/dev-libs/mpfr/files/3.1.2/patch04 |
835 |
deleted file mode 100644 |
836 |
index 2451f36..0000000 |
837 |
--- a/dev-libs/mpfr/files/3.1.2/patch04 |
838 |
+++ /dev/null |
839 |
@@ -1,84 +0,0 @@ |
840 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
841 |
---- mpfr-3.1.2-a/PATCHES 2013-11-15 00:51:49.211333830 +0000 |
842 |
-+++ mpfr-3.1.2-b/PATCHES 2013-11-15 00:51:49.323334999 +0000 |
843 |
-@@ -0,0 +1 @@ |
844 |
-+printf-alt0 |
845 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
846 |
---- mpfr-3.1.2-a/VERSION 2013-11-15 00:51:49.211333830 +0000 |
847 |
-+++ mpfr-3.1.2-b/VERSION 2013-11-15 00:51:49.323334999 +0000 |
848 |
-@@ -1 +1 @@ |
849 |
--3.1.2-p3 |
850 |
-+3.1.2-p4 |
851 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
852 |
---- mpfr-3.1.2-a/src/mpfr.h 2013-11-15 00:51:49.211333830 +0000 |
853 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-11-15 00:51:49.323334999 +0000 |
854 |
-@@ -27,7 +27,7 @@ |
855 |
- #define MPFR_VERSION_MAJOR 3 |
856 |
- #define MPFR_VERSION_MINOR 1 |
857 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
858 |
--#define MPFR_VERSION_STRING "3.1.2-p3" |
859 |
-+#define MPFR_VERSION_STRING "3.1.2-p4" |
860 |
- |
861 |
- /* Macros dealing with MPFR VERSION */ |
862 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
863 |
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c |
864 |
---- mpfr-3.1.2-a/src/vasprintf.c 2013-03-13 15:37:37.000000000 +0000 |
865 |
-+++ mpfr-3.1.2-b/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000 |
866 |
-@@ -1040,7 +1040,7 @@ |
867 |
- } |
868 |
- |
869 |
- /* Determine the different parts of the string representation of the regular |
870 |
-- number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'. |
871 |
-+ number P when spec.spec is 'e', 'E', 'g', or 'G'. |
872 |
- DEC_INFO contains the previously computed exponent and string or is NULL. |
873 |
- |
874 |
- return -1 if some field > INT_MAX */ |
875 |
-@@ -1167,7 +1167,7 @@ |
876 |
- } |
877 |
- |
878 |
- /* Determine the different parts of the string representation of the regular |
879 |
-- number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'. |
880 |
-+ number P when spec.spec is 'f', 'F', 'g', or 'G'. |
881 |
- DEC_INFO contains the previously computed exponent and string or is NULL. |
882 |
- |
883 |
- return -1 if some field of number_parts is greater than INT_MAX */ |
884 |
-@@ -1559,7 +1559,7 @@ |
885 |
- /* fractional part */ |
886 |
- { |
887 |
- np->point = MPFR_DECIMAL_POINT; |
888 |
-- np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ? |
889 |
-+ np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ? |
890 |
- spec.prec - 1 : spec.prec; |
891 |
- } |
892 |
- else if (spec.alt) |
893 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
894 |
---- mpfr-3.1.2-a/src/version.c 2013-11-15 00:51:49.211333830 +0000 |
895 |
-+++ mpfr-3.1.2-b/src/version.c 2013-11-15 00:51:49.323334999 +0000 |
896 |
-@@ -25,5 +25,5 @@ |
897 |
- const char * |
898 |
- mpfr_get_version (void) |
899 |
- { |
900 |
-- return "3.1.2-p3"; |
901 |
-+ return "3.1.2-p4"; |
902 |
- } |
903 |
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c |
904 |
---- mpfr-3.1.2-a/tests/tsprintf.c 2013-03-13 15:37:44.000000000 +0000 |
905 |
-+++ mpfr-3.1.2-b/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000 |
906 |
-@@ -456,10 +456,16 @@ |
907 |
- check_sprintf ("1.999900 ", "%-#10.7RG", x); |
908 |
- check_sprintf ("1.9999 ", "%-10.7RG", x); |
909 |
- mpfr_set_ui (x, 1, MPFR_RNDN); |
910 |
-+ check_sprintf ("1.", "%#.1Rg", x); |
911 |
-+ check_sprintf ("1. ", "%-#5.1Rg", x); |
912 |
-+ check_sprintf (" 1.0", "%#5.2Rg", x); |
913 |
- check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x); |
914 |
- check_sprintf ("1", "%.30Rg", x); |
915 |
- mpfr_set_ui (x, 0, MPFR_RNDN); |
916 |
-- check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x); |
917 |
-+ check_sprintf ("0.", "%#.1Rg", x); |
918 |
-+ check_sprintf ("0. ", "%-#5.1Rg", x); |
919 |
-+ check_sprintf (" 0.0", "%#5.2Rg", x); |
920 |
-+ check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x); |
921 |
- check_sprintf ("0", "%.30Rg", x); |
922 |
- |
923 |
- /* following tests with precision 53 bits */ |
924 |
|
925 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch05 b/dev-libs/mpfr/files/3.1.2/patch05 |
926 |
deleted file mode 100644 |
927 |
index 669b91d..0000000 |
928 |
--- a/dev-libs/mpfr/files/3.1.2/patch05 |
929 |
+++ /dev/null |
930 |
@@ -1,42 +0,0 @@ |
931 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
932 |
---- mpfr-3.1.2-a/PATCHES 2013-12-01 11:07:49.575329762 +0000 |
933 |
-+++ mpfr-3.1.2-b/PATCHES 2013-12-01 11:07:49.751331625 +0000 |
934 |
-@@ -0,0 +1 @@ |
935 |
-+custom_init_set |
936 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
937 |
---- mpfr-3.1.2-a/VERSION 2013-12-01 11:07:49.571329714 +0000 |
938 |
-+++ mpfr-3.1.2-b/VERSION 2013-12-01 11:07:49.747331585 +0000 |
939 |
-@@ -1 +1 @@ |
940 |
--3.1.2-p4 |
941 |
-+3.1.2-p5 |
942 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
943 |
---- mpfr-3.1.2-a/src/mpfr.h 2013-12-01 11:07:49.571329714 +0000 |
944 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-12-01 11:07:49.747331585 +0000 |
945 |
-@@ -27,7 +27,7 @@ |
946 |
- #define MPFR_VERSION_MAJOR 3 |
947 |
- #define MPFR_VERSION_MINOR 1 |
948 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
949 |
--#define MPFR_VERSION_STRING "3.1.2-p4" |
950 |
-+#define MPFR_VERSION_STRING "3.1.2-p5" |
951 |
- |
952 |
- /* Macros dealing with MPFR VERSION */ |
953 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
954 |
-@@ -861,7 +861,7 @@ |
955 |
- _t = (mpfr_kind_t) _k; \ |
956 |
- _s = 1; \ |
957 |
- } else { \ |
958 |
-- _t = (mpfr_kind_t) -k; \ |
959 |
-+ _t = (mpfr_kind_t) - _k; \ |
960 |
- _s = -1; \ |
961 |
- } \ |
962 |
- _e = _t == MPFR_REGULAR_KIND ? (e) : \ |
963 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
964 |
---- mpfr-3.1.2-a/src/version.c 2013-12-01 11:07:49.575329762 +0000 |
965 |
-+++ mpfr-3.1.2-b/src/version.c 2013-12-01 11:07:49.747331585 +0000 |
966 |
-@@ -25,5 +25,5 @@ |
967 |
- const char * |
968 |
- mpfr_get_version (void) |
969 |
- { |
970 |
-- return "3.1.2-p4"; |
971 |
-+ return "3.1.2-p5"; |
972 |
- } |
973 |
|
974 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch06 b/dev-libs/mpfr/files/3.1.2/patch06 |
975 |
deleted file mode 100644 |
976 |
index 50cd04d..0000000 |
977 |
--- a/dev-libs/mpfr/files/3.1.2/patch06 |
978 |
+++ /dev/null |
979 |
@@ -1,43 +0,0 @@ |
980 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
981 |
---- mpfr-3.1.2-a/PATCHES 2014-04-15 21:56:49.609057464 +0000 |
982 |
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 21:56:49.697059857 +0000 |
983 |
-@@ -0,0 +1 @@ |
984 |
-+li2-return |
985 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
986 |
---- mpfr-3.1.2-a/VERSION 2014-04-15 21:56:49.609057464 +0000 |
987 |
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 21:56:49.697059857 +0000 |
988 |
-@@ -1 +1 @@ |
989 |
--3.1.2-p5 |
990 |
-+3.1.2-p6 |
991 |
-diff -Naurd mpfr-3.1.2-a/src/li2.c mpfr-3.1.2-b/src/li2.c |
992 |
---- mpfr-3.1.2-a/src/li2.c 2013-03-13 15:37:32.000000000 +0000 |
993 |
-+++ mpfr-3.1.2-b/src/li2.c 2014-04-15 21:56:49.653058661 +0000 |
994 |
-@@ -630,5 +630,5 @@ |
995 |
- return mpfr_check_range (y, inexact, rnd_mode); |
996 |
- } |
997 |
- |
998 |
-- MPFR_ASSERTN (0); /* should never reach this point */ |
999 |
-+ MPFR_RET_NEVER_GO_HERE (); |
1000 |
- } |
1001 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
1002 |
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 21:56:49.609057464 +0000 |
1003 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 21:56:49.697059857 +0000 |
1004 |
-@@ -27,7 +27,7 @@ |
1005 |
- #define MPFR_VERSION_MAJOR 3 |
1006 |
- #define MPFR_VERSION_MINOR 1 |
1007 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
1008 |
--#define MPFR_VERSION_STRING "3.1.2-p5" |
1009 |
-+#define MPFR_VERSION_STRING "3.1.2-p6" |
1010 |
- |
1011 |
- /* Macros dealing with MPFR VERSION */ |
1012 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
1013 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
1014 |
---- mpfr-3.1.2-a/src/version.c 2014-04-15 21:56:49.609057464 +0000 |
1015 |
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 21:56:49.697059857 +0000 |
1016 |
-@@ -25,5 +25,5 @@ |
1017 |
- const char * |
1018 |
- mpfr_get_version (void) |
1019 |
- { |
1020 |
-- return "3.1.2-p5"; |
1021 |
-+ return "3.1.2-p6"; |
1022 |
- } |
1023 |
|
1024 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch07 b/dev-libs/mpfr/files/3.1.2/patch07 |
1025 |
deleted file mode 100644 |
1026 |
index 378c3bf..0000000 |
1027 |
--- a/dev-libs/mpfr/files/3.1.2/patch07 |
1028 |
+++ /dev/null |
1029 |
@@ -1,71 +0,0 @@ |
1030 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
1031 |
---- mpfr-3.1.2-a/PATCHES 2014-04-15 22:04:57.090286262 +0000 |
1032 |
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:04:57.162288198 +0000 |
1033 |
-@@ -0,0 +1 @@ |
1034 |
-+exp3 |
1035 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
1036 |
---- mpfr-3.1.2-a/VERSION 2014-04-15 22:04:57.086286154 +0000 |
1037 |
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:04:57.162288198 +0000 |
1038 |
-@@ -1 +1 @@ |
1039 |
--3.1.2-p6 |
1040 |
-+3.1.2-p7 |
1041 |
-diff -Naurd mpfr-3.1.2-a/src/exp3.c mpfr-3.1.2-b/src/exp3.c |
1042 |
---- mpfr-3.1.2-a/src/exp3.c 2013-03-13 15:37:34.000000000 +0000 |
1043 |
-+++ mpfr-3.1.2-b/src/exp3.c 2014-04-15 22:04:57.126287230 +0000 |
1044 |
-@@ -283,7 +283,7 @@ |
1045 |
- } |
1046 |
- } |
1047 |
- |
1048 |
-- if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ, |
1049 |
-+ if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ, |
1050 |
- MPFR_PREC(y) + (rnd_mode == MPFR_RNDN))) |
1051 |
- { |
1052 |
- inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode); |
1053 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
1054 |
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:04:57.086286154 +0000 |
1055 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:04:57.162288198 +0000 |
1056 |
-@@ -27,7 +27,7 @@ |
1057 |
- #define MPFR_VERSION_MAJOR 3 |
1058 |
- #define MPFR_VERSION_MINOR 1 |
1059 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
1060 |
--#define MPFR_VERSION_STRING "3.1.2-p6" |
1061 |
-+#define MPFR_VERSION_STRING "3.1.2-p7" |
1062 |
- |
1063 |
- /* Macros dealing with MPFR VERSION */ |
1064 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
1065 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
1066 |
---- mpfr-3.1.2-a/src/version.c 2014-04-15 22:04:57.090286262 +0000 |
1067 |
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:04:57.162288198 +0000 |
1068 |
-@@ -25,5 +25,5 @@ |
1069 |
- const char * |
1070 |
- mpfr_get_version (void) |
1071 |
- { |
1072 |
-- return "3.1.2-p6"; |
1073 |
-+ return "3.1.2-p7"; |
1074 |
- } |
1075 |
-diff -Naurd mpfr-3.1.2-a/tests/texp.c mpfr-3.1.2-b/tests/texp.c |
1076 |
---- mpfr-3.1.2-a/tests/texp.c 2013-03-13 15:37:44.000000000 +0000 |
1077 |
-+++ mpfr-3.1.2-b/tests/texp.c 2014-04-15 22:04:57.126287230 +0000 |
1078 |
-@@ -150,6 +150,22 @@ |
1079 |
- exit (1); |
1080 |
- } |
1081 |
- |
1082 |
-+ mpfr_set_prec (x, 118); |
1083 |
-+ mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86"); |
1084 |
-+ mpfr_set_prec (y, 118); |
1085 |
-+ mpfr_exp_2 (y, x, MPFR_RNDU); |
1086 |
-+ mpfr_exp_3 (x, x, MPFR_RNDU); |
1087 |
-+ if (mpfr_cmp (x, y)) |
1088 |
-+ { |
1089 |
-+ printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n"); |
1090 |
-+ printf ("mpfr_exp_2 gives "); |
1091 |
-+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); |
1092 |
-+ printf ("\nmpfr_exp_3 gives "); |
1093 |
-+ mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN); |
1094 |
-+ printf ("\n"); |
1095 |
-+ exit (1); |
1096 |
-+ } |
1097 |
-+ |
1098 |
- mpfr_clear (x); |
1099 |
- mpfr_clear (y); |
1100 |
- return 0; |
1101 |
|
1102 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch08 b/dev-libs/mpfr/files/3.1.2/patch08 |
1103 |
deleted file mode 100644 |
1104 |
index 2245c7c..0000000 |
1105 |
--- a/dev-libs/mpfr/files/3.1.2/patch08 |
1106 |
+++ /dev/null |
1107 |
@@ -1,254 +0,0 @@ |
1108 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
1109 |
---- mpfr-3.1.2-a/PATCHES 2014-04-15 22:20:32.243481506 +0000 |
1110 |
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:22:32.418722707 +0000 |
1111 |
-@@ -0,0 +1 @@ |
1112 |
-+gmp6-compat |
1113 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
1114 |
---- mpfr-3.1.2-a/VERSION 2014-04-15 22:20:20.755171478 +0000 |
1115 |
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:21:45.225450147 +0000 |
1116 |
-@@ -1 +1 @@ |
1117 |
--3.1.2-p7 |
1118 |
-+3.1.2-p8 |
1119 |
-diff -Naurd mpfr-3.1.2-a/configure mpfr-3.1.2-b/configure |
1120 |
---- mpfr-3.1.2-a/configure 2013-03-13 15:38:20.000000000 +0000 |
1121 |
-+++ mpfr-3.1.2-b/configure 2014-04-15 22:21:38.821277476 +0000 |
1122 |
-@@ -14545,26 +14545,30 @@ |
1123 |
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
1124 |
- fi |
1125 |
- |
1126 |
--if test "$use_gmp_build" = yes ; then |
1127 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid GMP_NUMB_BITS" >&5 |
1128 |
--$as_echo_n "checking for valid GMP_NUMB_BITS... " >&6; } |
1129 |
-- if test "$cross_compiling" = yes; then : |
1130 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency" >&5 |
1131 |
-+$as_echo_n "checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency... " >&6; } |
1132 |
-+if test "$cross_compiling" = yes; then : |
1133 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't test" >&5 |
1134 |
- $as_echo "can't test" >&6; } |
1135 |
- else |
1136 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1137 |
- /* end confdefs.h. */ |
1138 |
- |
1139 |
-+#include <stdio.h> |
1140 |
- #include <limits.h> |
1141 |
- #include "gmp.h" |
1142 |
--#include "gmp-impl.h" |
1143 |
- |
1144 |
- int |
1145 |
- main () |
1146 |
- { |
1147 |
- |
1148 |
-- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT |
1149 |
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1; |
1150 |
-+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT) |
1151 |
-+ return 0; |
1152 |
-+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS); |
1153 |
-+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t)); |
1154 |
-+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n", |
1155 |
-+ (long) (sizeof(mp_limb_t) * CHAR_BIT)); |
1156 |
-+ return 1; |
1157 |
- |
1158 |
- ; |
1159 |
- return 0; |
1160 |
-@@ -14577,14 +14581,14 @@ |
1161 |
- |
1162 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1163 |
- $as_echo "no" >&6; } |
1164 |
-- as_fn_error $? "GMP_NUMB_BITS is incorrect. |
1165 |
--You probably need to change some of the GMP or MPFR compile options." "$LINENO" 5 |
1166 |
-+ as_fn_error $? "GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent. |
1167 |
-+You probably need to change some of the GMP or MPFR compile options. |
1168 |
-+See 'config.log' for details (search for GMP_NUMB_BITS)." "$LINENO" 5 |
1169 |
- fi |
1170 |
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
1171 |
- conftest.$ac_objext conftest.beam conftest.$ac_ext |
1172 |
- fi |
1173 |
- |
1174 |
--fi |
1175 |
- |
1176 |
- |
1177 |
- if test "$dont_link_with_gmp" = yes ; then |
1178 |
-diff -Naurd mpfr-3.1.2-a/configure.ac mpfr-3.1.2-b/configure.ac |
1179 |
---- mpfr-3.1.2-a/configure.ac 2013-03-13 15:37:46.000000000 +0000 |
1180 |
-+++ mpfr-3.1.2-b/configure.ac 2013-03-13 15:37:46.000000000 +0000 |
1181 |
-@@ -435,23 +435,29 @@ |
1182 |
- ]) |
1183 |
- fi |
1184 |
- |
1185 |
--dnl Check for valid GMP_NUMB_BITS and BYTES_PER_MP_LIMB |
1186 |
-+dnl Check for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency. |
1187 |
-+dnl Problems may occur if gmp.h was generated with some ABI |
1188 |
-+dnl and is used with another ABI (or if nails are used). |
1189 |
- dnl This test doesn't need to link with libgmp (at least it shouldn't). |
1190 |
--if test "$use_gmp_build" = yes ; then |
1191 |
-- AC_MSG_CHECKING(for valid GMP_NUMB_BITS) |
1192 |
-- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
1193 |
-+AC_MSG_CHECKING(for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency) |
1194 |
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
1195 |
-+#include <stdio.h> |
1196 |
- #include <limits.h> |
1197 |
- #include "gmp.h" |
1198 |
--#include "gmp-impl.h" |
1199 |
- ]], [[ |
1200 |
-- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT |
1201 |
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1; |
1202 |
-+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT) |
1203 |
-+ return 0; |
1204 |
-+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS); |
1205 |
-+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t)); |
1206 |
-+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n", |
1207 |
-+ (long) (sizeof(mp_limb_t) * CHAR_BIT)); |
1208 |
-+ return 1; |
1209 |
- ]])], [AC_MSG_RESULT(yes)], [ |
1210 |
- AC_MSG_RESULT(no) |
1211 |
-- AC_MSG_ERROR([GMP_NUMB_BITS is incorrect. |
1212 |
--You probably need to change some of the GMP or MPFR compile options.])], |
1213 |
-+ AC_MSG_ERROR([GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent. |
1214 |
-+You probably need to change some of the GMP or MPFR compile options. |
1215 |
-+See 'config.log' for details (search for GMP_NUMB_BITS).])], |
1216 |
- [AC_MSG_RESULT([can't test])]) |
1217 |
--fi |
1218 |
- |
1219 |
- |
1220 |
- dnl We really need to link using libtool. But it is impossible with the current |
1221 |
-diff -Naurd mpfr-3.1.2-a/src/init2.c mpfr-3.1.2-b/src/init2.c |
1222 |
---- mpfr-3.1.2-a/src/init2.c 2013-03-13 15:37:32.000000000 +0000 |
1223 |
-+++ mpfr-3.1.2-b/src/init2.c 2014-04-15 22:21:06.220398489 +0000 |
1224 |
-@@ -30,11 +30,11 @@ |
1225 |
- |
1226 |
- /* Check if we can represent the number of limbs |
1227 |
- * associated to the maximum of mpfr_prec_t*/ |
1228 |
-- MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) ); |
1229 |
-+ MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) ); |
1230 |
- |
1231 |
-- /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */ |
1232 |
-- MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT |
1233 |
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ); |
1234 |
-+ /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */ |
1235 |
-+ MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT |
1236 |
-+ && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB ); |
1237 |
- |
1238 |
- MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS); |
1239 |
- |
1240 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr-gmp.h mpfr-3.1.2-b/src/mpfr-gmp.h |
1241 |
---- mpfr-3.1.2-a/src/mpfr-gmp.h 2013-03-13 15:37:32.000000000 +0000 |
1242 |
-+++ mpfr-3.1.2-b/src/mpfr-gmp.h 2014-04-15 22:21:06.220398489 +0000 |
1243 |
-@@ -72,7 +72,6 @@ |
1244 |
- #endif |
1245 |
- |
1246 |
- /* Define some macros */ |
1247 |
--#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) |
1248 |
- |
1249 |
- #define MP_LIMB_T_MAX (~(mp_limb_t)0) |
1250 |
- |
1251 |
-@@ -96,19 +95,19 @@ |
1252 |
- #define SHRT_HIGHBIT SHRT_MIN |
1253 |
- |
1254 |
- /* MP_LIMB macros */ |
1255 |
--#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB) |
1256 |
--#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) |
1257 |
--#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) |
1258 |
-+#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB) |
1259 |
-+#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) |
1260 |
-+#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) |
1261 |
- #define MPN_COPY(dst,src,n) \ |
1262 |
- do \ |
1263 |
- { \ |
1264 |
- if ((dst) != (src)) \ |
1265 |
- { \ |
1266 |
- MPFR_ASSERTD ((char *) (dst) >= (char *) (src) + \ |
1267 |
-- (n) * BYTES_PER_MP_LIMB || \ |
1268 |
-+ (n) * MPFR_BYTES_PER_MP_LIMB || \ |
1269 |
- (char *) (src) >= (char *) (dst) + \ |
1270 |
-- (n) * BYTES_PER_MP_LIMB); \ |
1271 |
-- memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB); \ |
1272 |
-+ (n) * MPFR_BYTES_PER_MP_LIMB); \ |
1273 |
-+ memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB); \ |
1274 |
- } \ |
1275 |
- } \ |
1276 |
- while (0) |
1277 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h |
1278 |
---- mpfr-3.1.2-a/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000 |
1279 |
-+++ mpfr-3.1.2-b/src/mpfr-impl.h 2014-04-15 22:21:06.220398489 +0000 |
1280 |
-@@ -191,7 +191,7 @@ |
1281 |
- # endif |
1282 |
- #endif |
1283 |
- |
1284 |
-- |
1285 |
-+#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) |
1286 |
- |
1287 |
- /****************************************************** |
1288 |
- ******************** Check GMP *********************** |
1289 |
-@@ -930,7 +930,7 @@ |
1290 |
- #define MPFR_SET_ALLOC_SIZE(x, n) \ |
1291 |
- ( ((mp_size_t*) MPFR_MANT(x))[-1] = n) |
1292 |
- #define MPFR_MALLOC_SIZE(s) \ |
1293 |
-- ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) ) |
1294 |
-+ ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) ) |
1295 |
- #define MPFR_SET_MANT_PTR(x,p) \ |
1296 |
- (MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1)) |
1297 |
- #define MPFR_GET_REAL_PTR(x) \ |
1298 |
-@@ -964,7 +964,7 @@ |
1299 |
- #endif |
1300 |
- |
1301 |
- #define MPFR_TMP_LIMBS_ALLOC(N) \ |
1302 |
-- ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB)) |
1303 |
-+ ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB)) |
1304 |
- |
1305 |
- /* temporary allocate 1 limb at xp, and initialize mpfr variable x */ |
1306 |
- /* The temporary var doesn't have any size field, but it doesn't matter |
1307 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
1308 |
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:20:20.755171478 +0000 |
1309 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:21:45.225450147 +0000 |
1310 |
-@@ -27,7 +27,7 @@ |
1311 |
- #define MPFR_VERSION_MAJOR 3 |
1312 |
- #define MPFR_VERSION_MINOR 1 |
1313 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
1314 |
--#define MPFR_VERSION_STRING "3.1.2-p7" |
1315 |
-+#define MPFR_VERSION_STRING "3.1.2-p8" |
1316 |
- |
1317 |
- /* Macros dealing with MPFR VERSION */ |
1318 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
1319 |
-diff -Naurd mpfr-3.1.2-a/src/mul.c mpfr-3.1.2-b/src/mul.c |
1320 |
---- mpfr-3.1.2-a/src/mul.c 2013-03-13 15:37:37.000000000 +0000 |
1321 |
-+++ mpfr-3.1.2-b/src/mul.c 2014-04-15 22:21:06.224398597 +0000 |
1322 |
-@@ -106,7 +106,7 @@ |
1323 |
- MPFR_ASSERTD(tn <= k); |
1324 |
- |
1325 |
- /* Check for no size_t overflow*/ |
1326 |
-- MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); |
1327 |
-+ MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); |
1328 |
- MPFR_TMP_MARK(marker); |
1329 |
- tmp = MPFR_TMP_LIMBS_ALLOC (k); |
1330 |
- |
1331 |
-@@ -301,7 +301,7 @@ |
1332 |
- MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ |
1333 |
- |
1334 |
- /* Check for no size_t overflow*/ |
1335 |
-- MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); |
1336 |
-+ MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); |
1337 |
- MPFR_TMP_MARK (marker); |
1338 |
- tmp = MPFR_TMP_LIMBS_ALLOC (k); |
1339 |
- |
1340 |
-diff -Naurd mpfr-3.1.2-a/src/stack_interface.c mpfr-3.1.2-b/src/stack_interface.c |
1341 |
---- mpfr-3.1.2-a/src/stack_interface.c 2013-03-13 15:37:32.000000000 +0000 |
1342 |
-+++ mpfr-3.1.2-b/src/stack_interface.c 2014-04-15 22:21:06.220398489 +0000 |
1343 |
-@@ -26,7 +26,7 @@ |
1344 |
- size_t |
1345 |
- mpfr_custom_get_size (mpfr_prec_t prec) |
1346 |
- { |
1347 |
-- return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; |
1348 |
-+ return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB; |
1349 |
- } |
1350 |
- |
1351 |
- #undef mpfr_custom_init |
1352 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
1353 |
---- mpfr-3.1.2-a/src/version.c 2014-04-15 22:20:20.755171478 +0000 |
1354 |
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:21:45.225450147 +0000 |
1355 |
-@@ -25,5 +25,5 @@ |
1356 |
- const char * |
1357 |
- mpfr_get_version (void) |
1358 |
- { |
1359 |
-- return "3.1.2-p7"; |
1360 |
-+ return "3.1.2-p8"; |
1361 |
- } |
1362 |
|
1363 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch09 b/dev-libs/mpfr/files/3.1.2/patch09 |
1364 |
deleted file mode 100644 |
1365 |
index 6ff7c4a..0000000 |
1366 |
--- a/dev-libs/mpfr/files/3.1.2/patch09 |
1367 |
+++ /dev/null |
1368 |
@@ -1,166 +0,0 @@ |
1369 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
1370 |
---- mpfr-3.1.2-a/PATCHES 2014-06-30 15:15:25.533266905 +0000 |
1371 |
-+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:15:25.617269178 +0000 |
1372 |
-@@ -0,0 +1 @@ |
1373 |
-+div-overflow |
1374 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
1375 |
---- mpfr-3.1.2-a/VERSION 2014-06-30 15:15:25.529266797 +0000 |
1376 |
-+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:15:25.617269178 +0000 |
1377 |
-@@ -1 +1 @@ |
1378 |
--3.1.2-p8 |
1379 |
-+3.1.2-p9 |
1380 |
-diff -Naurd mpfr-3.1.2-a/src/div.c mpfr-3.1.2-b/src/div.c |
1381 |
---- mpfr-3.1.2-a/src/div.c 2013-03-13 15:37:33.000000000 +0000 |
1382 |
-+++ mpfr-3.1.2-b/src/div.c 2014-06-30 15:15:25.585268312 +0000 |
1383 |
-@@ -750,7 +750,9 @@ |
1384 |
- truncate_check_qh: |
1385 |
- if (qh) |
1386 |
- { |
1387 |
-- qexp ++; |
1388 |
-+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX)) |
1389 |
-+ qexp ++; |
1390 |
-+ /* else qexp is now incorrect, but one will still get an overflow */ |
1391 |
- q0p[q0size - 1] = MPFR_LIMB_HIGHBIT; |
1392 |
- } |
1393 |
- goto truncate; |
1394 |
-@@ -765,7 +767,9 @@ |
1395 |
- inex = 1; /* always here */ |
1396 |
- if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh)) |
1397 |
- { |
1398 |
-- qexp ++; |
1399 |
-+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX)) |
1400 |
-+ qexp ++; |
1401 |
-+ /* else qexp is now incorrect, but one will still get an overflow */ |
1402 |
- q0p[q0size - 1] = MPFR_LIMB_HIGHBIT; |
1403 |
- } |
1404 |
- |
1405 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
1406 |
---- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:15:25.533266905 +0000 |
1407 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:15:25.613269070 +0000 |
1408 |
-@@ -27,7 +27,7 @@ |
1409 |
- #define MPFR_VERSION_MAJOR 3 |
1410 |
- #define MPFR_VERSION_MINOR 1 |
1411 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
1412 |
--#define MPFR_VERSION_STRING "3.1.2-p8" |
1413 |
-+#define MPFR_VERSION_STRING "3.1.2-p9" |
1414 |
- |
1415 |
- /* Macros dealing with MPFR VERSION */ |
1416 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
1417 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
1418 |
---- mpfr-3.1.2-a/src/version.c 2014-06-30 15:15:25.533266905 +0000 |
1419 |
-+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:15:25.613269070 +0000 |
1420 |
-@@ -25,5 +25,5 @@ |
1421 |
- const char * |
1422 |
- mpfr_get_version (void) |
1423 |
- { |
1424 |
-- return "3.1.2-p8"; |
1425 |
-+ return "3.1.2-p9"; |
1426 |
- } |
1427 |
-diff -Naurd mpfr-3.1.2-a/tests/tdiv.c mpfr-3.1.2-b/tests/tdiv.c |
1428 |
---- mpfr-3.1.2-a/tests/tdiv.c 2013-03-13 15:37:44.000000000 +0000 |
1429 |
-+++ mpfr-3.1.2-b/tests/tdiv.c 2014-06-30 15:15:25.585268312 +0000 |
1430 |
-@@ -1104,6 +1104,96 @@ |
1431 |
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS) |
1432 |
- #include "tgeneric.c" |
1433 |
- |
1434 |
-+static void |
1435 |
-+test_extreme (void) |
1436 |
-+{ |
1437 |
-+ mpfr_t x, y, z; |
1438 |
-+ mpfr_exp_t emin, emax; |
1439 |
-+ mpfr_prec_t p[4] = { 8, 32, 64, 256 }; |
1440 |
-+ int xi, yi, zi, j, r; |
1441 |
-+ unsigned int flags, ex_flags; |
1442 |
-+ |
1443 |
-+ emin = mpfr_get_emin (); |
1444 |
-+ emax = mpfr_get_emax (); |
1445 |
-+ |
1446 |
-+ mpfr_set_emin (MPFR_EMIN_MIN); |
1447 |
-+ mpfr_set_emax (MPFR_EMAX_MAX); |
1448 |
-+ |
1449 |
-+ for (xi = 0; xi < 4; xi++) |
1450 |
-+ { |
1451 |
-+ mpfr_init2 (x, p[xi]); |
1452 |
-+ mpfr_setmax (x, MPFR_EMAX_MAX); |
1453 |
-+ MPFR_ASSERTN (mpfr_check (x)); |
1454 |
-+ for (yi = 0; yi < 4; yi++) |
1455 |
-+ { |
1456 |
-+ mpfr_init2 (y, p[yi]); |
1457 |
-+ mpfr_setmin (y, MPFR_EMIN_MIN); |
1458 |
-+ for (j = 0; j < 2; j++) |
1459 |
-+ { |
1460 |
-+ MPFR_ASSERTN (mpfr_check (y)); |
1461 |
-+ for (zi = 0; zi < 4; zi++) |
1462 |
-+ { |
1463 |
-+ mpfr_init2 (z, p[zi]); |
1464 |
-+ RND_LOOP (r) |
1465 |
-+ { |
1466 |
-+ mpfr_clear_flags (); |
1467 |
-+ mpfr_div (z, x, y, (mpfr_rnd_t) r); |
1468 |
-+ flags = __gmpfr_flags; |
1469 |
-+ MPFR_ASSERTN (mpfr_check (z)); |
1470 |
-+ ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; |
1471 |
-+ if (flags != ex_flags) |
1472 |
-+ { |
1473 |
-+ printf ("Bad flags in test_extreme on z = a/b" |
1474 |
-+ " with %s and\n", |
1475 |
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); |
1476 |
-+ printf ("a = "); |
1477 |
-+ mpfr_dump (x); |
1478 |
-+ printf ("b = "); |
1479 |
-+ mpfr_dump (y); |
1480 |
-+ printf ("Expected flags:"); |
1481 |
-+ flags_out (ex_flags); |
1482 |
-+ printf ("Got flags: "); |
1483 |
-+ flags_out (flags); |
1484 |
-+ printf ("z = "); |
1485 |
-+ mpfr_dump (z); |
1486 |
-+ exit (1); |
1487 |
-+ } |
1488 |
-+ mpfr_clear_flags (); |
1489 |
-+ mpfr_div (z, y, x, (mpfr_rnd_t) r); |
1490 |
-+ flags = __gmpfr_flags; |
1491 |
-+ MPFR_ASSERTN (mpfr_check (z)); |
1492 |
-+ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; |
1493 |
-+ if (flags != ex_flags) |
1494 |
-+ { |
1495 |
-+ printf ("Bad flags in test_extreme on z = a/b" |
1496 |
-+ " with %s and\n", |
1497 |
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); |
1498 |
-+ printf ("a = "); |
1499 |
-+ mpfr_dump (y); |
1500 |
-+ printf ("b = "); |
1501 |
-+ mpfr_dump (x); |
1502 |
-+ printf ("Expected flags:"); |
1503 |
-+ flags_out (ex_flags); |
1504 |
-+ printf ("Got flags: "); |
1505 |
-+ flags_out (flags); |
1506 |
-+ printf ("z = "); |
1507 |
-+ mpfr_dump (z); |
1508 |
-+ exit (1); |
1509 |
-+ } |
1510 |
-+ } |
1511 |
-+ mpfr_clear (z); |
1512 |
-+ } /* zi */ |
1513 |
-+ mpfr_nextabove (y); |
1514 |
-+ } /* j */ |
1515 |
-+ mpfr_clear (y); |
1516 |
-+ } /* yi */ |
1517 |
-+ mpfr_clear (x); |
1518 |
-+ } /* xi */ |
1519 |
-+ |
1520 |
-+ set_emin (emin); |
1521 |
-+ set_emax (emax); |
1522 |
-+} |
1523 |
-+ |
1524 |
- int |
1525 |
- main (int argc, char *argv[]) |
1526 |
- { |
1527 |
-@@ -1130,6 +1220,7 @@ |
1528 |
- test_20070603 (); |
1529 |
- test_20070628 (); |
1530 |
- test_generic (2, 800, 50); |
1531 |
-+ test_extreme (); |
1532 |
- |
1533 |
- tests_end_mpfr (); |
1534 |
- return 0; |
1535 |
|
1536 |
diff --git a/dev-libs/mpfr/files/3.1.2/patch10 b/dev-libs/mpfr/files/3.1.2/patch10 |
1537 |
deleted file mode 100644 |
1538 |
index 43848f7..0000000 |
1539 |
--- a/dev-libs/mpfr/files/3.1.2/patch10 |
1540 |
+++ /dev/null |
1541 |
@@ -1,138 +0,0 @@ |
1542 |
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES |
1543 |
---- mpfr-3.1.2-a/PATCHES 2014-06-30 15:17:53.337268149 +0000 |
1544 |
-+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:17:53.417270314 +0000 |
1545 |
-@@ -0,0 +1 @@ |
1546 |
-+vasprintf |
1547 |
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION |
1548 |
---- mpfr-3.1.2-a/VERSION 2014-06-30 15:17:53.337268149 +0000 |
1549 |
-+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:17:53.413270206 +0000 |
1550 |
-@@ -1 +1 @@ |
1551 |
--3.1.2-p9 |
1552 |
-+3.1.2-p10 |
1553 |
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h |
1554 |
---- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:17:53.337268149 +0000 |
1555 |
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:17:53.413270206 +0000 |
1556 |
-@@ -27,7 +27,7 @@ |
1557 |
- #define MPFR_VERSION_MAJOR 3 |
1558 |
- #define MPFR_VERSION_MINOR 1 |
1559 |
- #define MPFR_VERSION_PATCHLEVEL 2 |
1560 |
--#define MPFR_VERSION_STRING "3.1.2-p9" |
1561 |
-+#define MPFR_VERSION_STRING "3.1.2-p10" |
1562 |
- |
1563 |
- /* Macros dealing with MPFR VERSION */ |
1564 |
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) |
1565 |
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c |
1566 |
---- mpfr-3.1.2-a/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000 |
1567 |
-+++ mpfr-3.1.2-b/src/vasprintf.c 2014-06-30 15:17:53.377269231 +0000 |
1568 |
-@@ -884,14 +884,18 @@ |
1569 |
- first digit, we want the exponent for radix two and the decimal |
1570 |
- point AFTER the first digit. */ |
1571 |
- { |
1572 |
-- MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */ |
1573 |
-+ /* An integer overflow is normally not possible since MPFR_EXP_MIN |
1574 |
-+ is twice as large as MPFR_EMIN_MIN. */ |
1575 |
-+ MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4); |
1576 |
- exp = (exp - 1) * 4; |
1577 |
- } |
1578 |
- else |
1579 |
- /* EXP is the exponent for decimal point BEFORE the first digit, we |
1580 |
- want the exponent for decimal point AFTER the first digit. */ |
1581 |
- { |
1582 |
-- MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */ |
1583 |
-+ /* An integer overflow is normally not possible since MPFR_EXP_MIN |
1584 |
-+ is twice as large as MPFR_EMIN_MIN. */ |
1585 |
-+ MPFR_ASSERTN (exp > MPFR_EXP_MIN); |
1586 |
- --exp; |
1587 |
- } |
1588 |
- } |
1589 |
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c |
1590 |
---- mpfr-3.1.2-a/src/version.c 2014-06-30 15:17:53.337268149 +0000 |
1591 |
-+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:17:53.413270206 +0000 |
1592 |
-@@ -25,5 +25,5 @@ |
1593 |
- const char * |
1594 |
- mpfr_get_version (void) |
1595 |
- { |
1596 |
-- return "3.1.2-p9"; |
1597 |
-+ return "3.1.2-p10"; |
1598 |
- } |
1599 |
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c |
1600 |
---- mpfr-3.1.2-a/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000 |
1601 |
-+++ mpfr-3.1.2-b/tests/tsprintf.c 2014-06-30 15:17:53.377269231 +0000 |
1602 |
-@@ -1184,6 +1184,69 @@ |
1603 |
- check_emax_aux (MPFR_EMAX_MAX); |
1604 |
- } |
1605 |
- |
1606 |
-+static void |
1607 |
-+check_emin_aux (mpfr_exp_t e) |
1608 |
-+{ |
1609 |
-+ mpfr_t x; |
1610 |
-+ char *s1, s2[256]; |
1611 |
-+ int i; |
1612 |
-+ mpfr_exp_t emin; |
1613 |
-+ mpz_t ee; |
1614 |
-+ |
1615 |
-+ MPFR_ASSERTN (e >= LONG_MIN); |
1616 |
-+ emin = mpfr_get_emin (); |
1617 |
-+ set_emin (e); |
1618 |
-+ |
1619 |
-+ mpfr_init2 (x, 16); |
1620 |
-+ mpz_init (ee); |
1621 |
-+ |
1622 |
-+ mpfr_setmin (x, e); |
1623 |
-+ mpz_set_si (ee, e); |
1624 |
-+ mpz_sub_ui (ee, ee, 1); |
1625 |
-+ |
1626 |
-+ i = mpfr_asprintf (&s1, "%Ra", x); |
1627 |
-+ MPFR_ASSERTN (i > 0); |
1628 |
-+ |
1629 |
-+ gmp_snprintf (s2, 256, "0x1p%Zd", ee); |
1630 |
-+ |
1631 |
-+ if (strcmp (s1, s2) != 0) |
1632 |
-+ { |
1633 |
-+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e); |
1634 |
-+ printf ("Expected %s\n", s2); |
1635 |
-+ printf ("Got %s\n", s1); |
1636 |
-+ exit (1); |
1637 |
-+ } |
1638 |
-+ |
1639 |
-+ mpfr_free_str (s1); |
1640 |
-+ |
1641 |
-+ i = mpfr_asprintf (&s1, "%Rb", x); |
1642 |
-+ MPFR_ASSERTN (i > 0); |
1643 |
-+ |
1644 |
-+ gmp_snprintf (s2, 256, "1p%Zd", ee); |
1645 |
-+ |
1646 |
-+ if (strcmp (s1, s2) != 0) |
1647 |
-+ { |
1648 |
-+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e); |
1649 |
-+ printf ("Expected %s\n", s2); |
1650 |
-+ printf ("Got %s\n", s1); |
1651 |
-+ exit (1); |
1652 |
-+ } |
1653 |
-+ |
1654 |
-+ mpfr_free_str (s1); |
1655 |
-+ |
1656 |
-+ mpfr_clear (x); |
1657 |
-+ mpz_clear (ee); |
1658 |
-+ set_emin (emin); |
1659 |
-+} |
1660 |
-+ |
1661 |
-+static void |
1662 |
-+check_emin (void) |
1663 |
-+{ |
1664 |
-+ check_emin_aux (-15); |
1665 |
-+ check_emin_aux (mpfr_get_emin ()); |
1666 |
-+ check_emin_aux (MPFR_EMIN_MIN); |
1667 |
-+} |
1668 |
-+ |
1669 |
- int |
1670 |
- main (int argc, char **argv) |
1671 |
- { |
1672 |
-@@ -1203,6 +1266,7 @@ |
1673 |
- decimal (); |
1674 |
- mixed (); |
1675 |
- check_emax (); |
1676 |
-+ check_emin (); |
1677 |
- |
1678 |
- #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) |
1679 |
- locale_da_DK (); |
1680 |
|
1681 |
diff --git a/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild b/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild |
1682 |
deleted file mode 100644 |
1683 |
index 90b92c0..0000000 |
1684 |
--- a/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild |
1685 |
+++ /dev/null |
1686 |
@@ -1,62 +0,0 @@ |
1687 |
-# Copyright 1999-2015 Gentoo Foundation |
1688 |
-# Distributed under the terms of the GNU General Public License v2 |
1689 |
-# $Id$ |
1690 |
- |
1691 |
-EAPI="4" |
1692 |
- |
1693 |
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x |
1694 |
-inherit eutils libtool multilib multilib-minimal |
1695 |
- |
1696 |
-MY_PV=${PV/_p*} |
1697 |
-MY_P=${PN}-${MY_PV} |
1698 |
-PLEVEL=${PV/*p} |
1699 |
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" |
1700 |
-HOMEPAGE="http://www.mpfr.org/" |
1701 |
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz" |
1702 |
- |
1703 |
-LICENSE="LGPL-2.1" |
1704 |
-SLOT="0" |
1705 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1706 |
-IUSE="static-libs" |
1707 |
- |
1708 |
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]" |
1709 |
-DEPEND="${RDEPEND}" |
1710 |
- |
1711 |
-S=${WORKDIR}/${MY_P} |
1712 |
- |
1713 |
-src_prepare() { |
1714 |
- if [[ ${PLEVEL} != ${PV} ]] ; then |
1715 |
- local i |
1716 |
- for (( i = 1; i <= PLEVEL; ++i )) ; do |
1717 |
- epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i}) |
1718 |
- done |
1719 |
- fi |
1720 |
- find . -type f -exec touch -r configure {} + |
1721 |
- elibtoolize |
1722 |
-} |
1723 |
- |
1724 |
-multilib_src_configure() { |
1725 |
- # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 |
1726 |
- ECONF_SOURCE=${S} \ |
1727 |
- user_redefine_cc=yes \ |
1728 |
- econf \ |
1729 |
- --docdir="\$(datarootdir)/doc/${PF}" \ |
1730 |
- $(use_enable static-libs static) |
1731 |
-} |
1732 |
- |
1733 |
-multilib_src_install_all() { |
1734 |
- use static-libs || find "${ED}"/usr -name '*.la' -delete |
1735 |
- |
1736 |
- # clean up html/license install |
1737 |
- pushd "${ED}"/usr/share/doc/${PF} >/dev/null |
1738 |
- dohtml *.html && rm COPYING* *.html || die |
1739 |
- popd >/dev/null |
1740 |
-} |
1741 |
- |
1742 |
-pkg_preinst() { |
1743 |
- preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1) |
1744 |
-} |
1745 |
- |
1746 |
-pkg_postinst() { |
1747 |
- preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1) |
1748 |
-} |