From a13ebbb49237ea76132f285f2ee202654e9efc9f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 2 Jun 2024 18:34:36 +0200 Subject: [PATCH] isnanf, isnand, isnanl: Fix link errors on AIX 7.1 with xlc. * lib/isnanf-nolibm.h (HAVE_ISNANF_NOLIBM): New macro. * lib/isnand-nolibm.h (HAVE_ISNAND_NOLIBM): New macro. * lib/isnanl-nolibm.h (HAVE_ISNANL_NOLIBM): New macro. * lib/math.h (isnanf): Don't define via isnan if HAVE_ISNANF_NOLIBM is defined. (isnand): Don't define via isnan if HAVE_ISNAND_NOLIBM is defined. (isnanl): Don't define via isnan if HAVE_ISNANL_NOLIBM is defined. --- ChangeLog | 11 +++++++++++ lib/isnand-nolibm.h | 3 +++ lib/isnanf-nolibm.h | 3 +++ lib/isnanl-nolibm.h | 3 +++ lib/math.in.h | 6 +++--- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c681593ab..201256e29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2024-06-02 Bruno Haible + + isnanf, isnand, isnanl: Fix link errors on AIX 7.1 with xlc. + * lib/isnanf-nolibm.h (HAVE_ISNANF_NOLIBM): New macro. + * lib/isnand-nolibm.h (HAVE_ISNAND_NOLIBM): New macro. + * lib/isnanl-nolibm.h (HAVE_ISNANL_NOLIBM): New macro. + * lib/math.h (isnanf): Don't define via isnan if HAVE_ISNANF_NOLIBM is + defined. + (isnand): Don't define via isnan if HAVE_ISNAND_NOLIBM is defined. + (isnanl): Don't define via isnan if HAVE_ISNANL_NOLIBM is defined. + 2024-05-31 Bruno Haible windows-once: Improve comments. diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h index 4d8b0e8f53..1ac8ab9dcf 100644 --- a/lib/isnand-nolibm.h +++ b/lib/isnand-nolibm.h @@ -36,3 +36,6 @@ # define isnand rpl_isnand extern int isnand (double x); #endif + +/* Tell that our isnand does not need libm. */ +#define HAVE_ISNAND_NOLIBM 1 diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h index 520b8147d2..01f3bfea12 100644 --- a/lib/isnanf-nolibm.h +++ b/lib/isnanf-nolibm.h @@ -44,3 +44,6 @@ extern int isnanf (float x); # define isnanf rpl_isnanf extern int isnanf (float x); #endif + +/* Tell that our isnanf does not need libm. */ +#define HAVE_ISNANF_NOLIBM 1 diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h index 3ea82f7d7d..71a4d49d77 100644 --- a/lib/isnanl-nolibm.h +++ b/lib/isnanl-nolibm.h @@ -37,3 +37,6 @@ # define isnanl rpl_isnanl extern int isnanl (long double x); #endif + +/* Tell that our isnanl does not need libm. */ +#define HAVE_ISNANL_NOLIBM 1 diff --git a/lib/math.in.h b/lib/math.in.h index 72a61d7044..3b0a41b1d4 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -2557,7 +2557,7 @@ _GL_EXTERN_C int isnanf (float x); GCC >= 4.0 also provides __builtin_isnanf, but clang doesn't. */ # undef isnanf # define isnanf(x) __builtin_isnan ((float)(x)) -# elif defined isnan +# elif defined isnan && !defined HAVE_ISNANF_NOLIBM # undef isnanf # define isnanf(x) isnan ((float)(x)) # endif @@ -2586,7 +2586,7 @@ _GL_EXTERN_C int isnand (double x); /* GCC >= 4.0 and clang provide a type-generic built-in for isnan. */ # undef isnand # define isnand(x) __builtin_isnan ((double)(x)) -# else +# elif !defined HAVE_ISNAND_NOLIBM # undef isnand # define isnand(x) isnan ((double)(x)) # endif @@ -2609,7 +2609,7 @@ _GL_EXTERN_C int isnand (double x); GCC >= 4.0 also provides __builtin_isnanl, but clang doesn't. */ # undef isnanl # define isnanl(x) __builtin_isnan ((long double)(x)) -# elif defined isnan +# elif defined isnan && !defined HAVE_ISNANL_NOLIBM # undef isnanl # define isnanl(x) isnan ((long double)(x)) # endif -- 2.39.5