Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/lgpl3/gmp/dist merge GMP 6.2.1.



details:   https://anonhg.NetBSD.org/src/rev/77fbc8c3c168
branches:  trunk
changeset: 984571:77fbc8c3c168
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 11 21:15:45 2021 +0000

description:
merge GMP 6.2.1.

diffstat:

 external/lgpl3/gmp/dist/Makefile.in                        |   12 +-
 external/lgpl3/gmp/dist/config.guess                       |   12 +-
 external/lgpl3/gmp/dist/configfsf.guess                    |   61 +-
 external/lgpl3/gmp/dist/configfsf.sub                      |  600 +++++++-----
 external/lgpl3/gmp/dist/configure                          |   61 +-
 external/lgpl3/gmp/dist/gmp-h.in                           |    2 +-
 external/lgpl3/gmp/dist/gmp-impl.h                         |   14 +-
 external/lgpl3/gmp/dist/longlong.h                         |   47 +-
 external/lgpl3/gmp/dist/mpn/alpha/ev67/gcd_1.asm           |  145 ---
 external/lgpl3/gmp/dist/mpn/arm/v5/gcd_1.asm               |  120 --
 external/lgpl3/gmp/dist/mpn/arm/v6t2/gcd_1.asm             |  115 --
 external/lgpl3/gmp/dist/mpn/arm64/gcd_1.asm                |  125 --
 external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c              |    2 +-
 external/lgpl3/gmp/dist/mpn/ia64/gcd_1.asm                 |  238 -----
 external/lgpl3/gmp/dist/mpn/mips64/addmul_1.asm            |  101 --
 external/lgpl3/gmp/dist/mpn/mips64/mul_1.asm               |   92 -
 external/lgpl3/gmp/dist/mpn/mips64/sqr_diagonal.asm        |   77 -
 external/lgpl3/gmp/dist/mpn/mips64/submul_1.asm            |  101 --
 external/lgpl3/gmp/dist/mpn/mips64/umul.asm                |   45 -
 external/lgpl3/gmp/dist/mpn/powerpc64/mode64/gcd_1.asm     |  125 --
 external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7/gcd_1.asm  |  110 --
 external/lgpl3/gmp/dist/mpn/sparc64/gcd_1.asm              |  135 --
 external/lgpl3/gmp/dist/mpn/x86/bobcat/gmp-mparam.h        |  197 ----
 external/lgpl3/gmp/dist/mpn/x86/fat/gcd_1.c                |   32 -
 external/lgpl3/gmp/dist/mpn/x86/k6/gcd_1.asm               |  359 -------
 external/lgpl3/gmp/dist/mpn/x86/k7/gcd_1.asm               |  193 ----
 external/lgpl3/gmp/dist/mpn/x86/p6/gcd_1.asm               |  161 ---
 external/lgpl3/gmp/dist/mpn/x86_64/addmul_2.asm            |  184 ---
 external/lgpl3/gmp/dist/mpn/x86_64/bd1/gcd_1.asm           |   37 -
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aors_n.asm       |  150 ---
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aorsmul_1.asm    |  183 ---
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyd.asm        |   91 -
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyi.asm        |   94 --
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/gmp-mparam.h     |  219 ----
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_1.asm        |  187 ----
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_basecase.asm |  486 ----------
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/redc_1.asm       |  507 ----------
 external/lgpl3/gmp/dist/mpn/x86_64/bobcat/sqr_basecase.asm |  565 ------------
 external/lgpl3/gmp/dist/mpn/x86_64/core2/gcd_1.asm         |  146 ---
 external/lgpl3/gmp/dist/mpn/x86_64/coreisbr/popcount.asm   |  118 --
 external/lgpl3/gmp/dist/mpn/x86_64/gcd_1.asm               |  165 ---
 external/lgpl3/gmp/dist/mpn/x86_64/k10/gcd_1.asm           |   37 -
 external/lgpl3/gmp/dist/mpn/x86_64/mulx/aorsmul_1.asm      |  161 ---
 external/lgpl3/gmp/dist/mpn/x86_64/mulx/mul_1.asm          |  154 ---
 external/lgpl3/gmp/dist/mpn/x86_64/nano/gcd_1.asm          |   37 -
 external/lgpl3/gmp/dist/tests/cxx/t-ops2.cc                |  268 -----
 external/lgpl3/gmp/dist/tests/devel/addmul_N.c             |  272 -----
 external/lgpl3/gmp/dist/tests/devel/anymul_1.c             |  255 -----
 external/lgpl3/gmp/dist/tests/devel/aors_n.c               |  262 -----
 external/lgpl3/gmp/dist/tests/devel/cnd_aors_n.c           |  257 -----
 external/lgpl3/gmp/dist/tests/devel/copy.c                 |  225 ----
 external/lgpl3/gmp/dist/tests/devel/divmod_1.c             |  199 ----
 external/lgpl3/gmp/dist/tests/devel/divrem.c               |  118 --
 external/lgpl3/gmp/dist/tests/devel/logops_n.c             |  229 ----
 external/lgpl3/gmp/dist/tests/devel/mul_N.c                |  270 -----
 external/lgpl3/gmp/dist/tests/devel/shift.c                |  244 -----
 external/lgpl3/gmp/dist/tests/devel/tst-addsub.c           |   97 --
 external/lgpl3/gmp/dist/tests/mpz/bit.c                    |  405 --------
 58 files changed, 459 insertions(+), 9445 deletions(-)

diffs (truncated from 11269 to 300 lines):

diff -r 10bce8d7ef1a -r 77fbc8c3c168 external/lgpl3/gmp/dist/Makefile.in
--- a/external/lgpl3/gmp/dist/Makefile.in       Sun Jul 11 21:14:44 2021 +0000
+++ b/external/lgpl3/gmp/dist/Makefile.in       Sun Jul 11 21:15:45 2021 +0000
@@ -101,6 +101,7 @@
 #        6.1.1   13:1:3    9:1:5     -
 #        6.1.2   13:2:3    9:2:5     -
 #        6.2.0   14:0:4   10:0:6     -
+#        6.2.1   14:1:4   10:1:6     -
 #
 # Starting at 3:0:0 is a slight abuse of the versioning system, but it
 # ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
@@ -566,10 +567,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 LIBGMP_LT_CURRENT = 14
-LIBGMP_LT_REVISION = 0
+LIBGMP_LT_REVISION = 1
 LIBGMP_LT_AGE = 4
 LIBGMPXX_LT_CURRENT = 10
-LIBGMPXX_LT_REVISION = 0
+LIBGMPXX_LT_REVISION = 1
 LIBGMPXX_LT_AGE = 6
 SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
 
@@ -596,8 +597,9 @@
        COPYING.LESSERv3 COPYINGv2 COPYINGv3 asl.h gmpxx.h bootstrap.c \
        gen-fac.c gen-fib.c gen-bases.c gen-trialdivtab.c \
        gen-jacobitab.c gen-psqr.c mini-gmp/README mini-gmp/mini-gmp.c \
-       mini-gmp/mini-gmp.h mini-gmp/mini-mpq.c mini-gmp/mini-mpq.h \
-       mini-gmp/tests/Makefile mini-gmp/tests/run-tests
+       mini-gmp/mini-gmp.h mini-gmp/ChangeLog mini-gmp/mini-mpq.c \
+       mini-gmp/mini-mpq.h mini-gmp/tests/Makefile \
+       mini-gmp/tests/run-tests
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gmp.pc $(am__append_1)
 @WANT_CXX_TRUE@GMPXX_HEADERS_OPTION = gmpxx.h
@@ -1509,7 +1511,7 @@
        abs_srcdir="`cd $(srcdir) && pwd`" ; \
        $(MKDIR_P) mini-gmp/tests \
        && cd mini-gmp/tests \
-       && TEST_LIBRARY_PATH="../../.libs"  \
+       && TEST_SHLIB_DIR="${abs_top_builddir}/.libs" \
           $(MAKE) -f "$$abs_srcdir/mini-gmp/tests/Makefile" \
                VPATH="$$abs_srcdir/mini-gmp/tests" \
                srcdir="$$abs_srcdir/mini-gmp/tests" \
diff -r 10bce8d7ef1a -r 77fbc8c3c168 external/lgpl3/gmp/dist/config.guess
--- a/external/lgpl3/gmp/dist/config.guess      Sun Jul 11 21:14:44 2021 +0000
+++ b/external/lgpl3/gmp/dist/config.guess      Sun Jul 11 21:15:45 2021 +0000
@@ -992,9 +992,19 @@
            default:
              modelstr = "zen2";
              break;
-         }
+           }
+         break;
+       case 25:                /* Zen 3 */
+         cpu_64bit = 1, cpu_avx = 1;
+         modelstr = "zen3";
+         break;
        }
     }
+  else if (strcmp (vendor_string, "HygonGenuine") == 0)
+    {
+      cpu_64bit = 1, cpu_avx = 1;
+      modelstr = "zen";
+    }
   else if (strcmp (vendor_string, "CyrixInstead") == 0)
     {
       /* Should recognize Cyrix' processors too.  */
diff -r 10bce8d7ef1a -r 77fbc8c3c168 external/lgpl3/gmp/dist/configfsf.guess
--- a/external/lgpl3/gmp/dist/configfsf.guess   Sun Jul 11 21:14:44 2021 +0000
+++ b/external/lgpl3/gmp/dist/configfsf.guess   Sun Jul 11 21:15:45 2021 +0000
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-01-01'
+timestamp='2020-10-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -150,17 +150,15 @@
        #elif defined(__dietlibc__)
        LIBC=dietlibc
        #else
+       #include <stdarg.h>
+       #ifdef __DEFINED_va_list
+       LIBC=musl
+       #else
        LIBC=gnu
        #endif
+       #endif
        EOF
        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
-       # If ldd exists, use it to detect musl libc.
-       if command -v ldd >/dev/null && \
-               ldd --version 2>&1 | grep -q ^musl
-       then
-           LIBC=musl
-       fi
        ;;
 esac
 
@@ -184,6 +182,7 @@
            "/usr/sbin/$sysctl" 2>/dev/null || \
            echo unknown)`
        case "$UNAME_MACHINE_ARCH" in
+           aarch64eb) machine=aarch64_be-unknown ;;
            armeb) machine=armeb-unknown ;;
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
@@ -404,7 +403,7 @@
        # If there is a compiler, see if it is configured for 64-bit objects.
        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
        # This test works for both compilers.
-       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+       if test "$CC_FOR_BUILD" != no_compiler_found; then
            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
                grep IS_64BIT_ARCH >/dev/null
@@ -544,10 +543,10 @@
     AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
-       if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+       if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
        then
-           if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-              [ "$TARGET_BINARY_INTERFACE"x = x ]
+           if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+              test "$TARGET_BINARY_INTERFACE"x = x
            then
                echo m88k-dg-dgux"$UNAME_RELEASE"
            else
@@ -580,7 +579,7 @@
        echo i386-ibm-aix
        exit ;;
     ia64:AIX:*:*)
-       if [ -x /usr/bin/oslevel ] ; then
+       if test -x /usr/bin/oslevel ; then
                IBM_REV=`/usr/bin/oslevel`
        else
                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
@@ -620,7 +619,7 @@
        else
                IBM_ARCH=powerpc
        fi
-       if [ -x /usr/bin/lslpp ] ; then
+       if test -x /usr/bin/lslpp ; then
                IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
                           awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
        else
@@ -655,7 +654,7 @@
            9000/31?)            HP_ARCH=m68000 ;;
            9000/[34]??)         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
-               if [ -x /usr/bin/getconf ]; then
+               if test -x /usr/bin/getconf; then
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "$sc_cpu_version" in
@@ -669,7 +668,7 @@
                        esac ;;
                    esac
                fi
-               if [ "$HP_ARCH" = "" ]; then
+               if test "$HP_ARCH" = ""; then
                    set_cc_for_build
                    sed 's/^            //' << EOF > "$dummy.c"
 
@@ -708,7 +707,7 @@
                    test -z "$HP_ARCH" && HP_ARCH=hppa
                fi ;;
        esac
-       if [ "$HP_ARCH" = hppa2.0w ]
+       if test "$HP_ARCH" = hppa2.0w
        then
            set_cc_for_build
 
@@ -782,7 +781,7 @@
        echo hppa1.0-hp-osf
        exit ;;
     i*86:OSF1:*:*)
-       if [ -x /usr/sbin/sysversion ] ; then
+       if test -x /usr/sbin/sysversion ; then
            echo "$UNAME_MACHINE"-unknown-osf1mk
        else
            echo "$UNAME_MACHINE"-unknown-osf1
@@ -1095,7 +1094,17 @@
        echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
        exit ;;
     x86_64:Linux:*:*)
-       echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+       set_cc_for_build
+       LIBCABI=$LIBC
+       if test "$CC_FOR_BUILD" != no_compiler_found; then
+           if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+               (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_X32 >/dev/null
+           then
+               LIBCABI="$LIBC"x32
+           fi
+       fi
+       echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
        exit ;;
     xtensa*:Linux:*:*)
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1284,7 +1293,7 @@
        echo mips-sony-newsos6
        exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-       if [ -d /usr/nec ]; then
+       if test -d /usr/nec; then
                echo mips-nec-sysv"$UNAME_RELEASE"
        else
                echo mips-unknown-sysv"$UNAME_RELEASE"
@@ -1332,6 +1341,9 @@
     *:Rhapsody:*:*)
        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
        exit ;;
+    arm64:Darwin:*:*)
+       echo aarch64-apple-darwin"$UNAME_RELEASE"
+       exit ;;
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p`
        case $UNAME_PROCESSOR in
@@ -1346,7 +1358,7 @@
        else
            set_cc_for_build
        fi
-       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+       if test "$CC_FOR_BUILD" != no_compiler_found; then
            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
                   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
                   grep IS_64BIT_ARCH >/dev/null
@@ -1629,6 +1641,12 @@
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+EOF
+
+year=`echo $timestamp | sed 's,-.*,,'`
+# shellcheck disable=SC2003
+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches%gnu.org@localhost to
@@ -1656,6 +1674,7 @@
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
diff -r 10bce8d7ef1a -r 77fbc8c3c168 external/lgpl3/gmp/dist/configfsf.sub
--- a/external/lgpl3/gmp/dist/configfsf.sub     Sun Jul 11 21:14:44 2021 +0000
+++ b/external/lgpl3/gmp/dist/configfsf.sub     Sun Jul 11 21:15:45 2021 +0000
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-01-01'
+timestamp='2020-10-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -124,28 +124,27 @@
                ;;
        *-*-*-*)
                basic_machine=$field1-$field2
-               os=$field3-$field4
+               basic_os=$field3-$field4
                ;;
        *-*-*)
                # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
                # parts
                maybe_os=$field2-$field3
                case $maybe_os in
-                       nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
-                       | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+                       nto-qnx* | linux-* | uclinux-uclibc* \
                        | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
                        | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
                        | storm-chaos* | os2-emx* | rtmk-nova*)
                                basic_machine=$field1
-                               os=$maybe_os
+                               basic_os=$maybe_os
                                ;;
                        android-linux)
                                basic_machine=$field1-unknown
-                               os=linux-android
+                               basic_os=linux-android
                                ;;
                        *)
                                basic_machine=$field1-$field2
-                               os=$field3
+                               basic_os=$field3



Home | Main Index | Thread Index | Old Index