[Gmp-commit] /var/hg/gmp: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/c3413ffefdf2
changeset: 17983:c3413ffefdf2
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Mon Dec 02 22:47:27 2019 +0100
description:
Remove check for NATIVE_ implementation.

details:   /var/hg/gmp/rev/d5907dfa1bbc
changeset: 17984:d5907dfa1bbc
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Mon Dec 02 22:52:52 2019 +0100
description:
Finish change vs fat and gcd_11.  Remove gcd_22 from fat functions for now, its calls to gcd_11 are problematic.

diffstat:

 configure.ac              |  3 ++-
 gmp-impl.h                |  6 +++---
 mpn/generic/gcd_11.c      |  5 ++---
 mpn/x86/fat/fat.c         |  1 -
 mpn/x86/x86-defs.m4       |  2 +-
 mpn/x86_64/fat/fat.c      |  1 -
 mpn/x86_64/x86_64-defs.m4 |  2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diffs (114 lines):

diff -r 5f237941addc -r d5907dfa1bbc configure.ac
--- a/configure.ac	Fri Nov 29 14:49:17 2019 +0100
+++ b/configure.ac	Mon Dec 02 22:52:52 2019 +0100
@@ -2280,7 +2280,7 @@
 
       fat_functions="add_n addmul_1 bdiv_dbm1c com cnd_add_n cnd_sub_n
 		     copyd copyi dive_1 divrem_1
-		     gcd_1 lshift lshiftc mod_1 mod_1_1 mod_1_1_cps mod_1_2
+		     gcd_11 lshift lshiftc mod_1 mod_1_1 mod_1_1_cps mod_1_2
 		     mod_1_2_cps mod_1_4 mod_1_4_cps mod_34lsub1 mode1o mul_1
 		     mul_basecase mullo_basecase pre_divrem_1 pre_mod_1 redc_1
 		     redc_2 rshift sqr_basecase sub_n submul_1"
@@ -3593,6 +3593,7 @@
 #undef HAVE_NATIVE_mpn_divrem_2
 #undef HAVE_NATIVE_mpn_gcd_1
 #undef HAVE_NATIVE_mpn_gcd_11
+#undef HAVE_NATIVE_mpn_gcd_22
 #undef HAVE_NATIVE_mpn_hamdist
 #undef HAVE_NATIVE_mpn_invert_limb
 #undef HAVE_NATIVE_mpn_ior_n
diff -r 5f237941addc -r d5907dfa1bbc gmp-impl.h
--- a/gmp-impl.h	Fri Nov 29 14:49:17 2019 +0100
+++ b/gmp-impl.h	Mon Dec 02 22:52:52 2019 +0100
@@ -91,8 +91,8 @@
   __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)
 #define DECL_divrem_1(name) \
   __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t)
-#define DECL_gcd_1(name) \
-  __GMP_DECLSPEC mp_limb_t name (mp_srcptr, mp_size_t, mp_limb_t)
+#define DECL_gcd_11(name) \
+  __GMP_DECLSPEC mp_limb_t name (mp_limb_t, mp_limb_t)
 #define DECL_lshift(name) \
   __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_srcptr, mp_size_t, unsigned)
 #define DECL_lshiftc(name) \
@@ -4667,7 +4667,7 @@
   DECL_copyi           ((*copyi));
   DECL_divexact_1      ((*divexact_1));
   DECL_divrem_1        ((*divrem_1));
-  DECL_gcd_1           ((*gcd_1));
+  DECL_gcd_11          ((*gcd_11));
   DECL_lshift          ((*lshift));
   DECL_lshiftc         ((*lshiftc));
   DECL_mod_1           ((*mod_1));
diff -r 5f237941addc -r d5907dfa1bbc mpn/generic/gcd_11.c
--- a/mpn/generic/gcd_11.c	Fri Nov 29 14:49:17 2019 +0100
+++ b/mpn/generic/gcd_11.c	Mon Dec 02 22:52:52 2019 +0100
@@ -1,6 +1,7 @@
 /* mpn_gcd_11 -- limb greatest common divisor.
 
-Copyright 1994, 1996, 2000, 2001, 2009, 2012, 2019 Free Software Foundation, Inc.
+Copyright 1994, 1996, 2000, 2001, 2009, 2012, 2019 Free Software Foundation,
+Inc.
 
 This file is part of the GNU MP Library.
 
@@ -31,7 +32,6 @@
 #include "gmp-impl.h"
 #include "longlong.h"
 
-#if !HAVE_NATIVE_mpn_gcd_11
 mp_limb_t
 mpn_gcd_11 (mp_limb_t u, mp_limb_t v)
 {
@@ -72,4 +72,3 @@
     }
   return (u << 1) + 1;
 }
-#endif /* !HAVE_NATIVE_mpn_gcd_11 */
diff -r 5f237941addc -r d5907dfa1bbc mpn/x86/fat/fat.c
--- a/mpn/x86/fat/fat.c	Fri Nov 29 14:49:17 2019 +0100
+++ b/mpn/x86/fat/fat.c	Mon Dec 02 22:52:52 2019 +0100
@@ -175,7 +175,6 @@
   __MPN(divexact_1_init),
   __MPN(divrem_1_init),
   __MPN(gcd_11_init),
-  __MPN(gcd_22_init),
   __MPN(lshift_init),
   __MPN(lshiftc_init),
   __MPN(mod_1_init),
diff -r 5f237941addc -r d5907dfa1bbc mpn/x86/x86-defs.m4
--- a/mpn/x86/x86-defs.m4	Fri Nov 29 14:49:17 2019 +0100
+++ b/mpn/x86/x86-defs.m4	Mon Dec 02 22:52:52 2019 +0100
@@ -78,7 +78,7 @@
 `copyi',
 `divexact_1',
 `divrem_1',
-`gcd_1',
+`gcd_11',
 `lshift',
 `lshiftc',
 `mod_1',
diff -r 5f237941addc -r d5907dfa1bbc mpn/x86_64/fat/fat.c
--- a/mpn/x86_64/fat/fat.c	Fri Nov 29 14:49:17 2019 +0100
+++ b/mpn/x86_64/fat/fat.c	Mon Dec 02 22:52:52 2019 +0100
@@ -161,7 +161,6 @@
   __MPN(divexact_1_init),
   __MPN(divrem_1_init),
   __MPN(gcd_11_init),
-  __MPN(gcd_22_init),
   __MPN(lshift_init),
   __MPN(lshiftc_init),
   __MPN(mod_1_init),
diff -r 5f237941addc -r d5907dfa1bbc mpn/x86_64/x86_64-defs.m4
--- a/mpn/x86_64/x86_64-defs.m4	Fri Nov 29 14:49:17 2019 +0100
+++ b/mpn/x86_64/x86_64-defs.m4	Mon Dec 02 22:52:52 2019 +0100
@@ -51,7 +51,7 @@
 `copyi',
 `divexact_1',
 `divrem_1',
-`gcd_1',
+`gcd_11',
 `lshift',
 `lshiftc',
 `mod_1',