Module Name: src Committed By: mrg Date: Mon Jul 12 07:59:52 UTC 2021
Modified Files: src/external/lgpl3/gmp: README src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/i386: config.h gmp.h Log Message: regen for GMP 6.2.1 and i386 and arm64. update docs so i don't forget that i mostly got 'native-gmp' working last year. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/README cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/lgpl3/gmp/README diff -u src/external/lgpl3/gmp/README:1.8 src/external/lgpl3/gmp/README:1.9 --- src/external/lgpl3/gmp/README:1.8 Fri Jun 1 21:46:18 2018 +++ src/external/lgpl3/gmp/README Mon Jul 12 07:59:51 2021 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.8 2018/06/01 21:46:18 mrg Exp $ +$NetBSD: README,v 1.9 2021/07/12 07:59:51 mrg Exp $ GMP in NetBSD. We need GMP for GCC >= 4.2. @@ -10,7 +10,20 @@ creates a bunch of symlinks and weeds ou files with the same name in different subdirectories linked into the same final product. All of these issues need to be dealt with. -There are a few steps to this: +There is a mostly-working "mknative" for GMP now. If this fails, see the +section below for the old instructions. + + - run a "./build tools libs", possibly setting MKGCC=no if the + GMP port is currently not working at all. + + - cd to tools/gmp, and run $TOOLDIR/bin/nbmake-$arch native-gmp + + - if that works, commit the files it changed in the source tree. + + - set NEWCONFIGDIR=/writeable/src if eg /usr/src is read-only. + +These are the old steps, that maybe are necessary to fix the automated +output: - run ./configure, save the output. you can use the makefile "Makefile.netbsd-gmp" in this directory to run this with the @@ -54,9 +67,5 @@ There are a few steps to this: The amd64 port is a good reference to compare. -This is still a work in progress and methods used to build may be -changed at any time. - - m...@netbsd.org -- 2017/08/22 +- 2021/07/11 Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2 Sun Sep 27 00:31:51 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h Mon Jul 12 07:59:52 2021 @@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_NAME "GNU MP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU MP 6.2.0" +#define PACKAGE_STRING "GNU MP 6.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gmp" @@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_URL "http://www.gnu.org/software/gmp/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.2.0" +#define PACKAGE_VERSION "6.2.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/. #define TUNE_SQR_TOOM2_MAX SQR_TOOM2_MAX_GENERIC /* Version number of package */ -#define VERSION "6.2.0" +#define VERSION "6.2.1" /* Define to 1 to enable ASSERT checking, per --enable-assert */ /* #undef WANT_ASSERT */ @@ -641,7 +641,7 @@ see https://www.gnu.org/licenses/. /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ -#define YYTEXT_POINTER 1 +/* #undef YYTEXT_POINTER */ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2 Sun Sep 27 00:31:51 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 Mon Jul 12 07:59:52 2021 @@ -27,6 +27,7 @@ define(<GMP_NUMB_BITS>,eval(GMP_LIMB_BIT changequote(`,') ifdef(`__CONFIG_M4_INCLUDED__',,` include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4') +include_mpn(`arm64/arm64-defs.m4') define_not_for_expansion(`HAVE_HOST_CPU_aarch64') define_not_for_expansion(`HAVE_ABI_64') define_not_for_expansion(`HAVE_LIMB_LITTLE_ENDIAN') Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h:1.2 Sun Sep 27 00:31:51 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h Mon Jul 12 07:59:52 2021 @@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr; GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #ifdef __GNUC__ -#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \ - || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) +#if (defined __GNUC_STDC_INLINE__) || \ + (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4) #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) -#else -#define __GMP_EXTERN_INLINE extern __inline__ #endif #define __GMP_INLINE_PROTOTYPES 1 #endif @@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt #define mpn_sec_invert_itch __MPN(sec_invert_itch) __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE; +#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv) +__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t); + /**************** mpz inlines ****************/ @@ -2329,7 +2330,7 @@ enum /* Major version number is the value of __GNU_MP__ too, above. */ #define __GNU_MP_VERSION 6 #define __GNU_MP_VERSION_MINOR 2 -#define __GNU_MP_VERSION_PATCHLEVEL 0 +#define __GNU_MP_VERSION_PATCHLEVEL 1 #define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL) #define __GMP_H__ Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.5 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.6 --- src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h:1.5 Sun Sep 27 00:31:52 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h Mon Jul 12 07:59:52 2021 @@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_NAME "GNU MP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU MP 6.2.0" +#define PACKAGE_STRING "GNU MP 6.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gmp" @@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_URL "http://www.gnu.org/software/gmp/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.2.0" +#define PACKAGE_VERSION "6.2.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/. /* #undef TUNE_SQR_TOOM2_MAX */ /* Version number of package */ -#define VERSION "6.2.0" +#define VERSION "6.2.1" /* Define to 1 to enable ASSERT checking, per --enable-assert */ /* #undef WANT_ASSERT */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h:1.5 --- src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h:1.4 Sun Sep 27 00:31:52 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h Mon Jul 12 07:59:52 2021 @@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr; GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #ifdef __GNUC__ -#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \ - || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) +#if (defined __GNUC_STDC_INLINE__) || \ + (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4) #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) -#else -#define __GMP_EXTERN_INLINE extern __inline__ #endif #define __GMP_INLINE_PROTOTYPES 1 #endif @@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt #define mpn_sec_invert_itch __MPN(sec_invert_itch) __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE; +#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv) +__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t); + /**************** mpz inlines ****************/ @@ -2329,7 +2330,7 @@ enum /* Major version number is the value of __GNU_MP__ too, above. */ #define __GNU_MP_VERSION 6 #define __GNU_MP_VERSION_MINOR 2 -#define __GNU_MP_VERSION_PATCHLEVEL 0 +#define __GNU_MP_VERSION_PATCHLEVEL 1 #define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL) #define __GMP_H__