From: "H.J. Lu" <hjl.tools@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org, Joseph Myers <josmyers@redhat.com>,
Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH v3 2/7] math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488)
Date: Tue, 21 May 2024 05:40:20 -0700 [thread overview]
Message-ID: <CAMe9rOpnQVT-pGFXpGfkcr2Zk6OTxg-b0UWG0qx0820N_uJCZg@mail.gmail.com> (raw)
In-Reply-To: <20240402140644.2172819-3-adhemerval.zanella@linaro.org>
On Tue, Apr 2, 2024 at 7:06 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
> The commit 16439f419b removed the static fmod/fmodf on i386 and m68k
> with and empty w_fmod.c (required for the ABIs that uses the newly
> implementation). This patch fixes by adding the required symbols on
> the arch-specific w_fmod{f}_compat.c implementation.
>
> To statically build fmod fails on some ABI (alpha, s390, sparc) because
> it does not export the ldexpf128, this is also fixed by this patch.
>
> Checked on i686-linux-gnu and with a build for m68k-linux-gnu with
> 'make test t=math/test-{float,double}-modf-static build-math-static-tests=yes'.
> ---
> sysdeps/i386/fpu/w_fmod_compat.c | 7 ++++---
> sysdeps/i386/fpu/w_fmodf_compat.c | 7 ++++---
> sysdeps/ieee754/ldbl-opt/s_ldexpl.c | 4 ++--
> sysdeps/m68k/m680x0/fpu/w_fmod_compat.c | 5 +++--
> sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c | 7 ++++---
> 5 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/sysdeps/i386/fpu/w_fmod_compat.c b/sysdeps/i386/fpu/w_fmod_compat.c
> index 5ac9995ffd..528bfc2a13 100644
> --- a/sysdeps/i386/fpu/w_fmod_compat.c
> +++ b/sysdeps/i386/fpu/w_fmod_compat.c
> @@ -7,8 +7,9 @@
> # define LIBM_SVID_COMPAT 1
> # undef compat_symbol
> # define compat_symbol(a, b, c, d)
> -#endif
> -#include <math/w_fmod_compat.c>
> -#ifdef SHARED
> +# include <math/w_fmod_compat.c>
> libm_alias_double (__fmod_compat, fmod)
> +#else
> +#include <math-type-macros-double.h>
> +#include <w_fmod_template.c>
> #endif
> diff --git a/sysdeps/i386/fpu/w_fmodf_compat.c b/sysdeps/i386/fpu/w_fmodf_compat.c
> index cc417e07d3..5a61693e51 100644
> --- a/sysdeps/i386/fpu/w_fmodf_compat.c
> +++ b/sysdeps/i386/fpu/w_fmodf_compat.c
> @@ -7,8 +7,9 @@
> # define LIBM_SVID_COMPAT 1
> # undef compat_symbol
> # define compat_symbol(a, b, c, d)
> -#endif
> -#include <math/w_fmodf_compat.c>
> -#ifdef SHARED
> +# include <math/w_fmodf_compat.c>
> libm_alias_float (__fmod_compat, fmod)
> +#else
> +#include <math-type-macros-float.h>
> +#include <w_fmod_template.c>
> #endif
> diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
> index 1afbe7d8ad..932cc4341c 100644
> --- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
> +++ b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
> @@ -17,13 +17,13 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#if IS_IN (libc)
> +#if IS_IN (libc) && defined SHARED
> # define declare_mgen_alias(f,t)
> #endif
> #include <math-type-macros-ldouble.h>
> #include <s_ldexp_template.c>
>
> -#if IS_IN (libc)
> +#if IS_IN (libc) && defined SHARED
> long_double_symbol (libc, __ldexpl, ldexpl);
> long_double_symbol (libc, __wrap_scalbnl, scalbnl);
> #endif
> diff --git a/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c b/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
> index 527d4fbed2..57f38091e6 100644
> --- a/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
> +++ b/sysdeps/m68k/m680x0/fpu/w_fmod_compat.c
> @@ -7,8 +7,9 @@
> # define LIBM_SVID_COMPAT 1
> # undef compat_symbol
> # define compat_symbol(a, b, c, d)
> -#endif
> #include <math/w_fmod_compat.c>
> -#ifdef SHARED
> libm_alias_double (__fmod_compat, fmod)
> +#else
> +#include <math-type-macros-double.h>
> +#include <w_fmod_template.c>
> #endif
> diff --git a/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c b/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
> index 5043586b91..88db07f443 100644
> --- a/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
> +++ b/sysdeps/m68k/m680x0/fpu/w_fmodf_compat.c
> @@ -7,8 +7,9 @@
> # define LIBM_SVID_COMPAT 1
> # undef compat_symbol
> # define compat_symbol(a, b, c, d)
> -#endif
> -#include <math/w_fmodf_compat.c>
> -#ifdef SHARED
> +# include <math/w_fmodf_compat.c>
> libm_alias_float (__fmod_compat, fmod)
> +#else
> +#include <math-type-macros-float.h>
> +#include <w_fmod_template.c>
> #endif
> --
> 2.34.1
>
My WIP static ABI check identified exp10 exp10f32x exp10f64 fmod fmodf fmodf32
fmodf32x fmodf64 are missing in i386 libm.a:
https://sourceware.org/bugzilla/show_bug.cgi?id=31775
Does your patch fix all of them?
--
H.J.
next prev parent reply other threads:[~2024-05-21 12:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 14:06 [PATCH v3 0/7] Fix some libm static issues Adhemerval Zanella
2024-04-02 14:06 ` [PATCH v3 1/7] math: Add support for auto static math tests Adhemerval Zanella
2024-05-20 16:48 ` H.J. Lu
2024-05-20 17:21 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 2/7] math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488) Adhemerval Zanella
2024-05-11 9:59 ` Aurelien Jarno
2024-05-21 12:40 ` H.J. Lu [this message]
2024-05-21 12:54 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 3/7] math: Fix i386 and m68k exp10 on static build Adhemerval Zanella
2024-05-11 9:59 ` Aurelien Jarno
2024-05-21 12:48 ` H.J. Lu
2024-05-21 12:54 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 4/7] math: Fix isnanf128 " Adhemerval Zanella
2024-05-20 16:51 ` H.J. Lu
2024-05-20 18:53 ` Adhemerval Zanella Netto
2024-05-20 21:34 ` H.J. Lu
2024-05-21 12:32 ` Adhemerval Zanella Netto
2024-05-21 12:36 ` H.J. Lu
2024-05-21 12:56 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 5/7] math: Provided copysignf128 for static libm on alpha, s390, and sparcv9 Adhemerval Zanella
2024-05-20 16:55 ` H.J. Lu
2024-05-20 19:04 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 6/7] math: Provide frexpf128 " Adhemerval Zanella
2024-05-20 16:57 ` H.J. Lu
2024-05-20 19:06 ` Adhemerval Zanella Netto
2024-04-02 14:06 ` [PATCH v3 7/7] math: Provide modf128 " Adhemerval Zanella
2024-05-20 16:59 ` H.J. Lu
2024-05-20 19:07 ` Adhemerval Zanella Netto
2024-05-21 15:40 ` H.J. Lu
2024-05-21 16:41 ` Adhemerval Zanella Netto
2024-05-20 16:31 ` [PATCH v3 0/7] Fix some libm static issues Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMe9rOpnQVT-pGFXpGfkcr2Zk6OTxg-b0UWG0qx0820N_uJCZg@mail.gmail.com \
--to=hjl.tools@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=josmyers@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).