[Gmp-commit] /var/hg/gmp: Update AC_PROG_LIBTOOL, AC_PROG_NM, AC_CHECK_LIBM, ...
mercurial at gmplib.org
mercurial at gmplib.org
Mon Aug 21 12:55:20 CEST 2023
details: /var/hg/gmp/rev/29dc06fa1bfc
changeset: 18440:29dc06fa1bfc
user: Marc Glisse <marc.glisse at inria.fr>
date: Mon Aug 21 12:55:16 2023 +0200
description:
Update AC_PROG_LIBTOOL, AC_PROG_NM, AC_CHECK_LIBM, AC_TYPE_SIGNAL.
diffstat:
ChangeLog | 6 ++++++
acinclude.m4 | 22 +++++++++++-----------
configure.ac | 10 ++++------
tests/misc.c | 2 +-
tests/spinner.c | 2 +-
tests/tests.h | 2 +-
tune/time.c | 12 ++++++------
7 files changed, 30 insertions(+), 26 deletions(-)
diffs (222 lines):
diff -r 40680ec7428b -r 29dc06fa1bfc ChangeLog
--- a/ChangeLog Mon Aug 21 12:00:39 2023 +0200
+++ b/ChangeLog Mon Aug 21 12:55:16 2023 +0200
@@ -4,6 +4,12 @@
* configure.ac, tests/misc.c, tune/freq.c, tune/speed.c, tune/time.c:
Unconditionally include time.h.
+ * acinclude.m4: AC_PROG_LIBTOOL -> LT_INIT, AC_PROG_NM -> LT_PATH_NM
+ * configure.ac: AC_PROG_LIBTOOL -> LT_INIT, AC_CHECK_LIBM -> LT_LIB_M,
+ remove AC_TYPE_SIGNAL.
+ * tests/misc.c, tests/spinner.c, tests/tests.h, tune/time.c:
+ RETSIGTYPE -> void.
+
2023-08-19 Marc Glisse <marc.glisse at inria.fr>
* doc/gmp.texi: Rename IEEE P754. Remove @refill.
diff -r 40680ec7428b -r 29dc06fa1bfc acinclude.m4
--- a/acinclude.m4 Mon Aug 21 12:00:39 2023 +0200
+++ b/acinclude.m4 Mon Aug 21 12:55:16 2023 +0200
@@ -275,7 +275,7 @@
AC_DEFUN([GMP_PROG_AR],
[dnl Want to establish $AR before libtool initialization.
-AC_BEFORE([$0],[AC_PROG_LIBTOOL])
+AC_BEFORE([$0],[LT_INIT])
gmp_user_AR=$AR
AC_CHECK_TOOL(AR, ar, ar)
if test -z "$gmp_user_AR"; then
@@ -401,12 +401,12 @@
dnl GMP_PROG_NM
dnl -----------
-dnl GMP additions to libtool AC_PROG_NM.
+dnl GMP additions to libtool LT_PATH_NM.
dnl
-dnl Note that if AC_PROG_NM can't find a working nm it still leaves
+dnl Note that if LT_PATH_NM can't find a working nm it still leaves
dnl $NM set to "nm", so $NM can't be assumed to actually work.
dnl
-dnl A user-selected $NM is always left unchanged. AC_PROG_NM is still run
+dnl A user-selected $NM is always left unchanged. LT_PATH_NM is still run
dnl to get the "checking" message printed though.
dnl
dnl Perhaps it'd be worthwhile checking that nm works, by running it on an
@@ -420,11 +420,11 @@
dnl to just demand that the user provides a coherent environment.
AC_DEFUN([GMP_PROG_NM],
-[dnl Make sure we're the first to call AC_PROG_NM, so our extra flags are
+[dnl Make sure we're the first to call LT_PATH_NM, so our extra flags are
dnl used by everyone.
-AC_BEFORE([$0],[AC_PROG_NM])
+AC_BEFORE([$0],[LT_PATH_NM])
gmp_user_NM=$NM
-AC_PROG_NM
+LT_PATH_NM
# FIXME: When cross compiling (ie. $ac_tool_prefix not empty), libtool
# defaults to plain "nm" if a "${ac_tool_prefix}nm" is not found. In this
@@ -438,7 +438,7 @@
gmp_save_ac_tool_prefix=$ac_tool_prefix
ac_tool_prefix=
NM=
- AC_PROG_NM
+ LT_PATH_NM
ac_tool_prefix=$gmp_save_ac_tool_prefix
fi
@@ -2708,7 +2708,7 @@
dnl %edx.
dnl
dnl Flags to specify PIC are taken from $lt_prog_compiler_pic set by
-dnl AC_PROG_LIBTOOL.
+dnl LT_INIT.
dnl
dnl Enhancement: Cache the values determined here. But what's the right way
dnl to get two variables (mcount_nonpic_reg and mcount_nonpic_call say) set
@@ -2716,7 +2716,7 @@
AC_DEFUN([GMP_ASM_X86_MCOUNT],
[AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_PROG_LIBTOOL])
+AC_REQUIRE([LT_INIT])
AC_MSG_CHECKING([how to call x86 mcount])
cat >conftest.c <<EOF
foo(){bar();}
@@ -3957,7 +3957,7 @@
dnl ------------------------
dnl Establish LIBM_FOR_BUILD as -lm, if that seems to work.
dnl
-dnl Libtool AC_CHECK_LIBM also uses -lmw on *-ncr-sysv4.3*, if it works.
+dnl Libtool LT_LIB_M also uses -lmw on *-ncr-sysv4.3*, if it works.
dnl Don't know what that does, lets assume it's not needed just for log().
AC_DEFUN([GMP_CHECK_LIBM_FOR_BUILD],
diff -r 40680ec7428b -r 29dc06fa1bfc configure.ac
--- a/configure.ac Mon Aug 21 12:00:39 2023 +0200
+++ b/configure.ac Mon Aug 21 12:55:16 2023 +0200
@@ -2601,7 +2601,7 @@
AM_CONDITIONAL(WANT_CXX, test $want_cxx = yes)
# FIXME: We're not interested in CXXCPP for ourselves, but if we don't do it
-# here then AC_PROG_LIBTOOL will AC_REQUIRE it (via _LT_AC_TAGCONFIG) and
+# here then LT_INIT will AC_REQUIRE it (via _LT_AC_TAGCONFIG) and
# hence execute it unconditionally, and that will fail if there's no C++
# compiler (and no generic /lib/cpp).
#
@@ -2803,7 +2803,7 @@
fi
fi
-# The dead hand of AC_REQUIRE makes AC_PROG_LIBTOOL expand and execute
+# The dead hand of AC_REQUIRE makes LT_INIT expand and execute
# AC_PROG_F77, even when F77 is not in the selected with_tags. This is
# probably harmless, but it's unsightly and bloats our configure, so pretend
# AC_PROG_F77 has been expanded already.
@@ -2813,7 +2813,7 @@
#
#AC_PROVIDE([AC_PROG_F77])
-AC_PROG_LIBTOOL
+LT_INIT
# Generate an error here if attempting to build both shared and static when
# $libname.a is in $library_names_spec (as mentioned above), rather than
@@ -2892,8 +2892,6 @@
[#include <stdio.h>
#include <errno.h>])
-AC_TYPE_SIGNAL
-
# Reasons for testing:
# intmax_t - C99
# long double - not in the HP bundled K&R cc
@@ -2924,7 +2922,7 @@
GMP_H_EXTERN_INLINE
# from libtool
-AC_CHECK_LIBM
+LT_LIB_M
AC_SUBST(LIBM)
GMP_FUNC_ALLOCA
diff -r 40680ec7428b -r 29dc06fa1bfc tests/misc.c
--- a/tests/misc.c Mon Aug 21 12:00:39 2023 +0200
+++ b/tests/misc.c Mon Aug 21 12:55:16 2023 +0200
@@ -589,7 +589,7 @@
jmp_buf tests_sigfpe_target;
-RETSIGTYPE
+void
tests_sigfpe_handler (int sig)
{
longjmp (tests_sigfpe_target, 1);
diff -r 40680ec7428b -r 29dc06fa1bfc tests/spinner.c
--- a/tests/spinner.c Mon Aug 21 12:00:39 2023 +0200
+++ b/tests/spinner.c Mon Aug 21 12:55:16 2023 +0200
@@ -51,7 +51,7 @@
/*ARGSUSED*/
-RETSIGTYPE
+void
spinner_signal (int signum)
{
spinner_tick = 1;
diff -r 40680ec7428b -r 29dc06fa1bfc tests/tests.h
--- a/tests/tests.h Mon Aug 21 12:00:39 2023 +0200
+++ b/tests/tests.h Mon Aug 21 12:55:16 2023 +0200
@@ -73,7 +73,7 @@
(signal (SIGFPE, tests_sigfpe_handler), \
setjmp (tests_sigfpe_target))
-RETSIGTYPE tests_sigfpe_handler (int);
+void tests_sigfpe_handler (int);
void tests_sigfpe_done (void);
extern jmp_buf tests_sigfpe_target;
diff -r 40680ec7428b -r 29dc06fa1bfc tune/time.c
--- a/tune/time.c Mon Aug 21 12:00:39 2023 +0200
+++ b/tune/time.c Mon Aug 21 12:55:16 2023 +0200
@@ -446,7 +446,7 @@
static jmp_buf cycles_works_buf;
-static RETSIGTYPE
+static void
cycles_works_handler (int sig)
{
longjmp (cycles_works_buf, 1);
@@ -475,7 +475,7 @@
* all linux systems. */
#ifdef SIGILL
{
- RETSIGTYPE (*old_handler) (int);
+ void (*old_handler) (int);
unsigned cycles[2];
old_handler = signal (SIGILL, cycles_works_handler);
@@ -826,7 +826,7 @@
static jmp_buf mftb_works_buf;
-static RETSIGTYPE
+static void
mftb_works_handler (int sig)
{
longjmp (mftb_works_buf, 1);
@@ -835,9 +835,9 @@
int
mftb_works_p (void)
{
- unsigned a[2];
- RETSIGTYPE (*old_handler) (int);
- double cycletime;
+ unsigned a[2];
+ void (*old_handler) (int);
+ double cycletime;
/* suppress a warning about a[] unused */
a[0] = 0;
More information about the gmp-commit
mailing list