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

mercurial at gmplib.org mercurial at gmplib.org
Sun Nov 1 22:06:34 UTC 2020


details:   /var/hg/gmp-6.2/rev/b99f087210bc
changeset: 18114:b99f087210bc
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 21:45:50 2020 +0100
description:
tests/misc/t-locale.c (nl_langinfo): No redefine on __TERMUX__

details:   /var/hg/gmp-6.2/rev/138dba9ed557
changeset: 18115:138dba9ed557
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 21:47:08 2020 +0100
description:
tests/mpf/t-get_d_2exp.c: Amend last change.

details:   /var/hg/gmp-6.2/rev/80dd2ae26cc5
changeset: 18116:80dd2ae26cc5
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 21:48:50 2020 +0100
description:
configure.ac: X86_{,64_}PATTERN: GMP_ASM_COFF_TYPE for all ABIs

details:   /var/hg/gmp-6.2/rev/1df4ed4bd118
changeset: 18117:1df4ed4bd118
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 21:49:26 2020 +0100
description:
mpn/x86_64/x86_64-defs.m4 (COFF_TYPE): Copy from mpn/x86/x86-defs.m4

details:   /var/hg/gmp-6.2/rev/086d22dcb8f5
changeset: 18118:086d22dcb8f5
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 22:57:06 2020 +0100
description:
configure.ac: Consider *-*-msys as *-*-mingw* (almost everywhere)

details:   /var/hg/gmp-6.2/rev/dd9f1f7c24ac
changeset: 18119:dd9f1f7c24ac
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 23:05:37 2020 +0100
description:
Makefile.am (EXTRA_DIST): Add mini-gmp/ChangeLog.

details:   /var/hg/gmp-6.2/rev/4134e90e90d8
changeset: 18120:4134e90e90d8
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Nov 01 23:06:17 2020 +0100
description:
ChangeLog

diffstat:

 ChangeLog                 |  12 ++++++++++++
 Makefile.am               |   2 +-
 configure.ac              |  10 +++++-----
 mpn/x86_64/x86_64-defs.m4 |  18 ++++++++++++++++++
 tests/misc/t-locale.c     |   4 ++--
 tests/mpf/t-get_d_2exp.c  |   2 +-
 6 files changed, 39 insertions(+), 9 deletions(-)

diffs (147 lines):

diff -r 85041f80c7a8 -r 4134e90e90d8 ChangeLog
--- a/ChangeLog	Thu Oct 29 18:20:55 2020 +0100
+++ b/ChangeLog	Sun Nov 01 23:06:17 2020 +0100
@@ -1,3 +1,15 @@
+2020-11-01 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* configure.ac: X86_{,64_}PATTERN: GMP_ASM_COFF_TYPE for all ABIs;
+	* mpn/x86_64/x86_64-defs.m4 (COFF_TYPE): Copy from mpn/x86/x86-defs.m4
+	as suggested by Jeremy Drake.
+
+	* tests/misc/t-locale.c (nl_langinfo): No redefine on __TERMUX__,
+	spotted by Sanselme and Glisse.
+	* configure.ac: Consider *-*-msys as *-*-mingw* (except on arm* |
+	aarch64*), as suggested by Ralph Peterson.
+	* Makefile.am (EXTRA_DIST): Add mini-gmp/ChangeLog.
+
 2020-10-30 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* tests/mpf/t-get_d_2exp.c: Test also the case zero.
diff -r 85041f80c7a8 -r 4134e90e90d8 Makefile.am
--- a/Makefile.am	Thu Oct 29 18:20:55 2020 +0100
+++ b/Makefile.am	Sun Nov 01 23:06:17 2020 +0100
@@ -412,7 +412,7 @@
 
 # Distribute mini-gmp. Test sources copied by dist-hook.
 EXTRA_DIST += 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/ChangeLog mini-gmp/mini-mpq.c mini-gmp/mini-mpq.h \
 	      mini-gmp/tests/Makefile mini-gmp/tests/run-tests
 
 # Avoid: CVS - cvs directories
diff -r 85041f80c7a8 -r 4134e90e90d8 configure.ac
--- a/configure.ac	Thu Oct 29 18:20:55 2020 +0100
+++ b/configure.ac	Sun Nov 01 23:06:17 2020 +0100
@@ -2011,7 +2011,7 @@
 	    # Sun cc.
 	    cc_64_cflags="-xO3 -m64"
 	    ;;
-	  *-*-mingw* | *-*-cygwin)
+	  *-*-mingw* | *-*-msys | *-*-cygwin)
 	    limb_64=longlong
 	    CALLING_CONVENTIONS_OBJS_64=""
 	    AC_DEFINE(HOST_DOS64,1,[Define to 1 for Windos/64])
@@ -2037,7 +2037,7 @@
 # x86s, but allow any CPU here so as to catch "none" too.
 #
 case $host in
-  *-*-mingw*)
+  *-*-mingw* | *-*-msys)
     gcc_cflags_optlist="$gcc_cflags_optlist nocygwin"
     gcc_cflags_nocygwin="-mno-cygwin"
     ;;
@@ -2664,7 +2664,7 @@
 
 AC_SUBST(LIBGMP_DLL,0)
 case $host in
-  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+  *-*-cygwin* | *-*-mingw* | *-*-msys | *-*-pw32* | *-*-os2*)
     # By default, build only static.
     if test -z "$enable_shared"; then
       enable_shared=no
@@ -3782,11 +3782,11 @@
       if test "$x86_have_mulx" = yes; then
         GMP_ASM_X86_MULX
       fi
+      GMP_ASM_COFF_TYPE
       case $ABI in
         32)
           GMP_INCLUDE_MPN(x86/x86-defs.m4)
           AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86)
-          GMP_ASM_COFF_TYPE
           GMP_ASM_X86_GOT_UNDERSCORE
           GMP_ASM_X86_SHLDL_CL
 	  case $enable_profiling in
@@ -3803,7 +3803,7 @@
 	  case $host in
 	    *-*-darwin*)
 	      GMP_INCLUDE_MPN(x86_64/darwin.m4) ;;
-	    *-*-mingw* | *-*-cygwin)
+	    *-*-mingw* | *-*-msys | *-*-cygwin)
 	      GMP_INCLUDE_MPN(x86_64/dos64.m4) ;;
 	    *-openbsd*)
 	      GMP_DEFINE_RAW(["define(<OPENBSD>,1)"]) ;;
diff -r 85041f80c7a8 -r 4134e90e90d8 mpn/x86_64/x86_64-defs.m4
--- a/mpn/x86_64/x86_64-defs.m4	Thu Oct 29 18:20:55 2020 +0100
+++ b/mpn/x86_64/x86_64-defs.m4	Sun Nov 01 23:06:17 2020 +0100
@@ -93,10 +93,28 @@
 m4_assert_numargs(1)
 `	GLOBL	$1
 	TYPE($1,`function')
+	COFF_TYPE($1)
 $1:
 ')
 
 
+dnl  Usage: COFF_TYPE(GSYM_PREFIX`'foo)
+dnl
+dnl  Emit COFF style ".def ... .endef" type information for a function, when
+dnl  supported.  The argument should include any GSYM_PREFIX.
+dnl
+dnl  See autoconf macro GMP_ASM_COFF_TYPE for HAVE_COFF_TYPE.
+
+define(COFF_TYPE,
+m4_assert_numargs(1)
+m4_assert_defined(`HAVE_COFF_TYPE')
+`ifelse(HAVE_COFF_TYPE,yes,
+	`.def	$1
+	.scl	2
+	.type	32
+	.endef')')
+
+
 dnl  Usage: ASSERT([cond][,instructions])
 dnl
 dnl  If WANT_ASSERT is 1, output the given instructions and expect the given
diff -r 85041f80c7a8 -r 4134e90e90d8 tests/misc/t-locale.c
--- a/tests/misc/t-locale.c	Thu Oct 29 18:20:55 2020 +0100
+++ b/tests/misc/t-locale.c	Sun Nov 01 23:06:17 2020 +0100
@@ -1,6 +1,6 @@
 /* Test locale support, or attempt to do so.
 
-Copyright 2001, 2002, 2011, 2014 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2011, 2014, 2020 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library test suite.
 
@@ -57,7 +57,7 @@
 #endif
 
 /* Replace the libc nl_langinfo with one we can manipulate. */
-#if HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO && ! defined __TERMUX__
 char *
 nl_langinfo (nl_item n)
 #if defined __cplusplus && defined __GLIBC__
diff -r 85041f80c7a8 -r 4134e90e90d8 tests/mpf/t-get_d_2exp.c
--- a/tests/mpf/t-get_d_2exp.c	Thu Oct 29 18:20:55 2020 +0100
+++ b/tests/mpf/t-get_d_2exp.c	Sun Nov 01 23:06:17 2020 +0100
@@ -42,7 +42,7 @@
   got = mpf_get_d_2exp (&got_exp, f);
   if (got != 0 || got_exp != 0)
     {
-      printf    ("mpf_get_d_2exp wrong on zero\n", exp);
+      printf    ("mpf_get_d_2exp wrong on zero\n");
       mpf_trace ("   f    ", f);
       d_trace   ("   got  ", got);
       printf    ("   got exp  %ld\n", got_exp);



More information about the gmp-commit mailing list