Mon Jul 12 07:04:37 2021 UTC ()
regen gmp parts for amd64 and gmp 6.2.1.


(mrg)
diff -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h
diff -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4
diff -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h

cvs diff -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h 2020/09/27 00:31:54 1.4
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h 2021/07/12 07:04:37 1.5
@@ -538,36 +538,36 @@ see https://www.gnu.org/licenses/. @@ -538,36 +538,36 @@ see https://www.gnu.org/licenses/.
538/* Define to 1 to disable the use of inline assembly */ 538/* Define to 1 to disable the use of inline assembly */
539/* #undef NO_ASM */ 539/* #undef NO_ASM */
540 540
541/* Name of package */ 541/* Name of package */
542#define PACKAGE "gmp" 542#define PACKAGE "gmp"
543 543
544/* Define to the address where bug reports for this package should be sent. */ 544/* Define to the address where bug reports for this package should be sent. */
545#define PACKAGE_BUGREPORT "gmp-bugs@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html" 545#define PACKAGE_BUGREPORT "gmp-bugs@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html"
546 546
547/* Define to the full name of this package. */ 547/* Define to the full name of this package. */
548#define PACKAGE_NAME "GNU MP" 548#define PACKAGE_NAME "GNU MP"
549 549
550/* Define to the full name and version of this package. */ 550/* Define to the full name and version of this package. */
551#define PACKAGE_STRING "GNU MP 6.2.0" 551#define PACKAGE_STRING "GNU MP 6.2.1"
552 552
553/* Define to the one symbol short name of this package. */ 553/* Define to the one symbol short name of this package. */
554#define PACKAGE_TARNAME "gmp" 554#define PACKAGE_TARNAME "gmp"
555 555
556/* Define to the home page for this package. */ 556/* Define to the home page for this package. */
557#define PACKAGE_URL "http://www.gnu.org/software/gmp/" 557#define PACKAGE_URL "http://www.gnu.org/software/gmp/"
558 558
559/* Define to the version of this package. */ 559/* Define to the version of this package. */
560#define PACKAGE_VERSION "6.2.0" 560#define PACKAGE_VERSION "6.2.1"
561 561
562/* Define as the return type of signal handlers (`int' or `void'). */ 562/* Define as the return type of signal handlers (`int' or `void'). */
563#define RETSIGTYPE void 563#define RETSIGTYPE void
564 564
565/* The size of `mp_limb_t', as computed by sizeof. */ 565/* The size of `mp_limb_t', as computed by sizeof. */
566#define SIZEOF_MP_LIMB_T 8 566#define SIZEOF_MP_LIMB_T 8
567 567
568/* The size of `unsigned', as computed by sizeof. */ 568/* The size of `unsigned', as computed by sizeof. */
569#define SIZEOF_UNSIGNED 4 569#define SIZEOF_UNSIGNED 4
570 570
571/* The size of `unsigned long', as computed by sizeof. */ 571/* The size of `unsigned long', as computed by sizeof. */
572#define SIZEOF_UNSIGNED_LONG 8 572#define SIZEOF_UNSIGNED_LONG 8
573 573
@@ -580,27 +580,27 @@ see https://www.gnu.org/licenses/. @@ -580,27 +580,27 @@ see https://www.gnu.org/licenses/.
580/* Define to 1 if sscanf requires writable inputs */ 580/* Define to 1 if sscanf requires writable inputs */
581/* #undef SSCANF_WRITABLE_INPUT */ 581/* #undef SSCANF_WRITABLE_INPUT */
582 582
583/* Define to 1 if you have the ANSI C header files. */ 583/* Define to 1 if you have the ANSI C header files. */
584#define STDC_HEADERS 1 584#define STDC_HEADERS 1
585 585
586/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ 586/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
587#define TIME_WITH_SYS_TIME 1 587#define TIME_WITH_SYS_TIME 1
588 588
589/* Maximum size the tune program can test for SQR_TOOM2_THRESHOLD */ 589/* Maximum size the tune program can test for SQR_TOOM2_THRESHOLD */
590/* #undef TUNE_SQR_TOOM2_MAX */ 590/* #undef TUNE_SQR_TOOM2_MAX */
591 591
592/* Version number of package */ 592/* Version number of package */
593#define VERSION "6.2.0" 593#define VERSION "6.2.1"
594 594
595/* Define to 1 to enable ASSERT checking, per --enable-assert */ 595/* Define to 1 to enable ASSERT checking, per --enable-assert */
596/* #undef WANT_ASSERT */ 596/* #undef WANT_ASSERT */
597 597
598/* Define to 1 to enable GMP_CPU_TYPE faking cpuid, per --enable-fake-cpuid */ 598/* Define to 1 to enable GMP_CPU_TYPE faking cpuid, per --enable-fake-cpuid */
599/* #undef WANT_FAKE_CPUID */ 599/* #undef WANT_FAKE_CPUID */
600 600
601/* Define to 1 when building a fat binary. */ 601/* Define to 1 when building a fat binary. */
602/* #undef WANT_FAT_BINARY */ 602/* #undef WANT_FAT_BINARY */
603 603
604/* Define to 1 to enable FFTs for multiplication, per --enable-fft */ 604/* Define to 1 to enable FFTs for multiplication, per --enable-fft */
605#define WANT_FFT 1 605#define WANT_FFT 1
606 606

cvs diff -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 2020/09/27 00:31:54 1.4
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 2021/07/12 07:04:37 1.5
@@ -9,26 +9,27 @@ define(,) @@ -9,26 +9,27 @@ define(,)
9define(<TEXT>, <.text>) 9define(<TEXT>, <.text>)
10define(<DATA>, <.data>) 10define(<DATA>, <.data>)
11define(<LABEL_SUFFIX>, <:>) 11define(<LABEL_SUFFIX>, <:>)
12define(<GLOBL>, <.globl>) 12define(<GLOBL>, <.globl>)
13define(<GLOBL_ATTR>, <>) 13define(<GLOBL_ATTR>, <>)
14define(<GSYM_PREFIX>, <>) 14define(<GSYM_PREFIX>, <>)
15define(<RODATA>, < .section .rodata>) 15define(<RODATA>, < .section .rodata>)
16define(<TYPE>, <.type $1,@$2>) 16define(<TYPE>, <.type $1,@$2>)
17define(<SIZE>, <.size $1,$2>) 17define(<SIZE>, <.size $1,$2>)
18define(<LSYM_PREFIX>, <.L>) 18define(<LSYM_PREFIX>, <.L>)
19define(<W32>, <.long>) 19define(<W32>, <.long>)
20define(<ALIGN_LOGARITHMIC>,<no>) 20define(<ALIGN_LOGARITHMIC>,<no>)
21define(<ALIGN_FILL_0x90>,<yes>) 21define(<ALIGN_FILL_0x90>,<yes>)
 22define(<HAVE_COFF_TYPE>, <no>)
22define(<SQR_TOOM2_THRESHOLD>,<34>) 23define(<SQR_TOOM2_THRESHOLD>,<34>)
23define(<BMOD_1_TO_MOD_1_THRESHOLD>,<16>) 24define(<BMOD_1_TO_MOD_1_THRESHOLD>,<16>)
24define(<SIZEOF_UNSIGNED>,<4>) 25define(<SIZEOF_UNSIGNED>,<4>)
25define(<GMP_LIMB_BITS>,64) 26define(<GMP_LIMB_BITS>,64)
26define(<GMP_NAIL_BITS>,0) 27define(<GMP_NAIL_BITS>,0)
27define(<GMP_NUMB_BITS>,eval(GMP_LIMB_BITS-GMP_NAIL_BITS)) 28define(<GMP_NUMB_BITS>,eval(GMP_LIMB_BITS-GMP_NAIL_BITS))
28>) 29>)
29changequote(`,') 30changequote(`,')
30ifdef(`__CONFIG_M4_INCLUDED__',,` 31ifdef(`__CONFIG_M4_INCLUDED__',,`
31include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4') 32include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4')
32include_mpn(`x86_64/x86_64-defs.m4') 33include_mpn(`x86_64/x86_64-defs.m4')
33define_not_for_expansion(`HAVE_HOST_CPU_x86_64') 34define_not_for_expansion(`HAVE_HOST_CPU_x86_64')
34define_not_for_expansion(`HAVE_ABI_64') 35define_not_for_expansion(`HAVE_ABI_64')

cvs diff -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h 2020/09/27 00:31:54 1.5
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h 2021/07/12 07:04:37 1.6
@@ -351,31 +351,29 @@ typedef __mpq_struct *mpq_ptr; @@ -351,31 +351,29 @@ typedef __mpq_struct *mpq_ptr;
351#endif 351#endif
352 352
353 353
354/* PORTME: What other compilers have a useful "extern inline"? "static 354/* PORTME: What other compilers have a useful "extern inline"? "static
355 inline" would be an acceptable substitute if the compiler (or linker) 355 inline" would be an acceptable substitute if the compiler (or linker)
356 discards unused statics. */ 356 discards unused statics. */
357 357
358 /* gcc has __inline__ in all modes, including strict ansi. Give a prototype 358 /* gcc has __inline__ in all modes, including strict ansi. Give a prototype
359 for an inline too, so as to correctly specify "dllimport" on windows, in 359 for an inline too, so as to correctly specify "dllimport" on windows, in
360 case the function is called rather than inlined. 360 case the function is called rather than inlined.
361 GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 361 GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
362 inline semantics, unless -fgnu89-inline is used. */ 362 inline semantics, unless -fgnu89-inline is used. */
363#ifdef __GNUC__ 363#ifdef __GNUC__
364#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \ 364#if (defined __GNUC_STDC_INLINE__) || \
365 || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) 365 (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4)
366#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) 366#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
367#else 
368#define __GMP_EXTERN_INLINE extern __inline__ 
369#endif 367#endif
370#define __GMP_INLINE_PROTOTYPES 1 368#define __GMP_INLINE_PROTOTYPES 1
371#endif 369#endif
372 370
373/* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1 371/* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
374 strict ANSI mode. Inlining is done even when not optimizing (ie. -O0 372 strict ANSI mode. Inlining is done even when not optimizing (ie. -O0
375 mode, which is the default), but an unnecessary local copy of foo is 373 mode, which is the default), but an unnecessary local copy of foo is
376 emitted unless -O is used. "extern __inline" is accepted, but the 374 emitted unless -O is used. "extern __inline" is accepted, but the
377 "extern" appears to be ignored, ie. it becomes a plain global function 375 "extern" appears to be ignored, ie. it becomes a plain global function
378 but which is inlined within its file. Don't know if all old versions of 376 but which is inlined within its file. Don't know if all old versions of
379 DEC C supported __inline, but as a start let's do the right thing for 377 DEC C supported __inline, but as a start let's do the right thing for
380 current versions. */ 378 current versions. */
381#ifdef __DECC 379#ifdef __DECC
@@ -1683,26 +1681,29 @@ __GMP_DECLSPEC void mpn_sec_tabselect (v @@ -1683,26 +1681,29 @@ __GMP_DECLSPEC void mpn_sec_tabselect (v
1683__GMP_DECLSPEC mp_limb_t mpn_sec_div_qr (mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr); 1681__GMP_DECLSPEC mp_limb_t mpn_sec_div_qr (mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
1684#define mpn_sec_div_qr_itch __MPN(sec_div_qr_itch) 1682#define mpn_sec_div_qr_itch __MPN(sec_div_qr_itch)
1685__GMP_DECLSPEC mp_size_t mpn_sec_div_qr_itch (mp_size_t, mp_size_t) __GMP_ATTRIBUTE_PURE; 1683__GMP_DECLSPEC mp_size_t mpn_sec_div_qr_itch (mp_size_t, mp_size_t) __GMP_ATTRIBUTE_PURE;
1686#define mpn_sec_div_r __MPN(sec_div_r) 1684#define mpn_sec_div_r __MPN(sec_div_r)
1687__GMP_DECLSPEC void mpn_sec_div_r (mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr); 1685__GMP_DECLSPEC void mpn_sec_div_r (mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
1688#define mpn_sec_div_r_itch __MPN(sec_div_r_itch) 1686#define mpn_sec_div_r_itch __MPN(sec_div_r_itch)
1689__GMP_DECLSPEC mp_size_t mpn_sec_div_r_itch (mp_size_t, mp_size_t) __GMP_ATTRIBUTE_PURE; 1687__GMP_DECLSPEC mp_size_t mpn_sec_div_r_itch (mp_size_t, mp_size_t) __GMP_ATTRIBUTE_PURE;
1690 1688
1691#define mpn_sec_invert __MPN(sec_invert) 1689#define mpn_sec_invert __MPN(sec_invert)
1692__GMP_DECLSPEC int mpn_sec_invert (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_bitcnt_t, mp_ptr); 1690__GMP_DECLSPEC int mpn_sec_invert (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_bitcnt_t, mp_ptr);
1693#define mpn_sec_invert_itch __MPN(sec_invert_itch) 1691#define mpn_sec_invert_itch __MPN(sec_invert_itch)
1694__GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE; 1692__GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE;
1695 1693
 1694#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv)
 1695__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t);
 1696
1696 1697
1697/**************** mpz inlines ****************/ 1698/**************** mpz inlines ****************/
1698 1699
1699/* The following are provided as inlines where possible, but always exist as 1700/* The following are provided as inlines where possible, but always exist as
1700 library functions too, for binary compatibility. 1701 library functions too, for binary compatibility.
1701 1702
1702 Within gmp itself this inlining generally isn't relied on, since it 1703 Within gmp itself this inlining generally isn't relied on, since it
1703 doesn't get done for all compilers, whereas if something is worth 1704 doesn't get done for all compilers, whereas if something is worth
1704 inlining then it's worth arranging always. 1705 inlining then it's worth arranging always.
1705 1706
1706 There are two styles of inlining here. When the same bit of code is 1707 There are two styles of inlining here. When the same bit of code is
1707 wanted for the inline as for the library version, then __GMP_FORCE_foo 1708 wanted for the inline as for the library version, then __GMP_FORCE_foo
1708 arranges for that code to be emitted and the __GMP_EXTERN_INLINE 1709 arranges for that code to be emitted and the __GMP_EXTERN_INLINE
@@ -2319,18 +2320,18 @@ enum @@ -2319,18 +2320,18 @@ enum
2319 GMP_ERROR_UNSUPPORTED_ARGUMENT = 1, 2320 GMP_ERROR_UNSUPPORTED_ARGUMENT = 1,
2320 GMP_ERROR_DIVISION_BY_ZERO = 2, 2321 GMP_ERROR_DIVISION_BY_ZERO = 2,
2321 GMP_ERROR_SQRT_OF_NEGATIVE = 4, 2322 GMP_ERROR_SQRT_OF_NEGATIVE = 4,
2322 GMP_ERROR_INVALID_ARGUMENT = 8 2323 GMP_ERROR_INVALID_ARGUMENT = 8
2323}; 2324};
2324 2325
2325/* Define CC and CFLAGS which were used to build this version of GMP */ 2326/* Define CC and CFLAGS which were used to build this version of GMP */
2326#define __GMP_CC "gcc" 2327#define __GMP_CC "gcc"
2327#define __GMP_CFLAGS "-O2 -pedantic -fomit-frame-pointer -m64 -mtune=k8 -march=k8 -mno-avx" 2328#define __GMP_CFLAGS "-O2 -pedantic -fomit-frame-pointer -m64 -mtune=k8 -march=k8 -mno-avx"
2328 2329
2329/* Major version number is the value of __GNU_MP__ too, above. */ 2330/* Major version number is the value of __GNU_MP__ too, above. */
2330#define __GNU_MP_VERSION 6 2331#define __GNU_MP_VERSION 6
2331#define __GNU_MP_VERSION_MINOR 2 2332#define __GNU_MP_VERSION_MINOR 2
2332#define __GNU_MP_VERSION_PATCHLEVEL 0 2333#define __GNU_MP_VERSION_PATCHLEVEL 1
2333#define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL) 2334#define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL)
2334 2335
2335#define __GMP_H__ 2336#define __GMP_H__
2336#endif /* __GMP_H__ */ 2337#endif /* __GMP_H__ */