diff mbox series

powerpc: Remove duplicated versionsort from libm.a (BZ 31789)

Message ID 20240523160455.621355-1-adhemerval.zanella@linaro.org
State Accepted
Commit 8f58e412b1e26d2c7e65c13a0ce758fbaf18d83f
Headers show
Series powerpc: Remove duplicated versionsort from libm.a (BZ 31789) | expand

Commit Message

Adhemerval Zanella May 23, 2024, 4:04 p.m. UTC 
The powerpc32 have an extra versionsort provided by LFS
versionsort64.o.  It seems that 5226a81f5517bcbc892679cca792006a6bafc53f
used the wrong check to create the alias for the LFS to non-LFS version.
It should not matter for _DIRENT_MATCHES_DIRENT64 since both symbols
have the same implementation.
---
 dirent/versionsort64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

H.J. Lu May 23, 2024, 4:09 p.m. UTC | #1 
On Thu, May 23, 2024 at 9:05 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
> The powerpc32 have an extra versionsort provided by LFS
> versionsort64.o.  It seems that 5226a81f5517bcbc892679cca792006a6bafc53f
> used the wrong check to create the alias for the LFS to non-LFS version.
> It should not matter for _DIRENT_MATCHES_DIRENT64 since both symbols
> have the same implementation.
> ---
>  dirent/versionsort64.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
> index 5ae404f1bd..5fe94e37ed 100644
> --- a/dirent/versionsort64.c
> +++ b/dirent/versionsort64.c
> @@ -26,6 +26,6 @@ versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
>    return __strverscmp ((*a)->d_name, (*b)->d_name);
>  }
>
> -#if !_DIRENT_MATCHES_DIRENT64
> +#if _DIRENT_MATCHES_DIRENT64

This matches sysdeps/unix/sysv/linux/versionsort64.c:

#if _DIRENT_MATCHES_DIRENT64
weak_alias (__versionsort64, versionsort64)
weak_alias (__versionsort64, versionsort)
#else

>  weak_alias (versionsort64, versionsort)
>  #endif
> --
> 2.43.0
>

Why don't powerpc32 and sparc use sysdeps/unix/sysv/linux/versionsort64.c?
H.J. Lu May 23, 2024, 4:11 p.m. UTC | #2 
On Thu, May 23, 2024 at 9:05 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
> The powerpc32 have an extra versionsort provided by LFS
> versionsort64.o.  It seems that 5226a81f5517bcbc892679cca792006a6bafc53f
> used the wrong check to create the alias for the LFS to non-LFS version.
> It should not matter for _DIRENT_MATCHES_DIRENT64 since both symbols
> have the same implementation.
> ---
>  dirent/versionsort64.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
> index 5ae404f1bd..5fe94e37ed 100644
> --- a/dirent/versionsort64.c
> +++ b/dirent/versionsort64.c
> @@ -26,6 +26,6 @@ versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
>    return __strverscmp ((*a)->d_name, (*b)->d_name);
>  }
>
> -#if !_DIRENT_MATCHES_DIRENT64
> +#if _DIRENT_MATCHES_DIRENT64
>  weak_alias (versionsort64, versionsort)
>  #endif
> --
> 2.43.0
>

sysdeps/unix/sysv/linux/powerpc/powerpc32/versionsort64.c and
sysdeps/unix/sysv/linux/sparc/sparc32/versionsort64.c have

#include <dirent/versionsort64.c>


LGTM.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>

Thanks.
diff mbox series

Patch

diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
index 5ae404f1bd..5fe94e37ed 100644
--- a/dirent/versionsort64.c
+++ b/dirent/versionsort64.c
@@ -26,6 +26,6 @@  versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
   return __strverscmp ((*a)->d_name, (*b)->d_name);
 }
 
-#if !_DIRENT_MATCHES_DIRENT64
+#if _DIRENT_MATCHES_DIRENT64
 weak_alias (versionsort64, versionsort)
 #endif