[src/trunk]: src/external/lgpl3/gmp regen for GMP 6.2.1 and i386 and arm64. ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/lgpl3/gmp regen for GMP 6.2.1 and i386 and arm64. ...
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 08 Nov 2021 14:47:47 +0000
details:   https://anonhg.NetBSD.org/src/rev/de2af9c2b928
branches:  trunk
changeset: 1022315:de2af9c2b928
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 12 07:59:51 2021 +0000

description:
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.

diffstat:

 external/lgpl3/gmp/README                            |  23 +++++++++++++------
 external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h  |   8 +++---
 external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 |   1 +
 external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h     |  11 +++++----
 external/lgpl3/gmp/lib/libgmp/arch/i386/config.h     |   6 ++--
 external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h        |  11 +++++----
 6 files changed, 36 insertions(+), 24 deletions(-)

diffs (194 lines):

diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/README
--- a/external/lgpl3/gmp/README Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/README Mon Jul 12 07:59:51 2021 +0000
@@ -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 @@
 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 @@
 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.
-
-
 mrg%netbsd.org@localhost
-- 2017/08/22
+- 2021/07/11
diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h       Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h       Mon Jul 12 07:59:51 2021 +0000
@@ -548,7 +548,7 @@
 #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 @@
 #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 @@
 #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 @@
 
 /* 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.  */
diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4
--- a/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4      Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4      Mon Jul 12 07:59:51 2021 +0000
@@ -27,6 +27,7 @@
 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')
diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h  Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h  Mon Jul 12 07:59:51 2021 +0000
@@ -361,11 +361,9 @@
     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 @@
 #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 @@
 /* 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__
diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/lib/libgmp/arch/i386/config.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h  Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h  Mon Jul 12 07:59:51 2021 +0000
@@ -548,7 +548,7 @@
 #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 @@
 #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 @@
 /* #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 */
diff -r ce4178123a4a -r de2af9c2b928 external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h     Mon Jul 12 07:04:37 2021 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h     Mon Jul 12 07:59:51 2021 +0000
@@ -361,11 +361,9 @@
     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 @@
 #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 @@
 /* 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__
Prev by Date: [src/trunk]: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64 regen gmp parts fo...
Next by Date: [src/trunk]: src/external/mit/xorg/lib/libEGL look for libglapi in ${OLD_SUFF...
Previous by Thread: [src/trunk]: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64 regen gmp parts fo...
Next by Thread: [src/trunk]: src/external/mit/xorg/lib/libEGL look for libglapi in ${OLD_SUFF...
Indexes:
Home | Main Index | Thread Index | Old Index