diff mbox series

[v2,1/2] i686: Don't include multiarch memove in libc.a

Message ID 20210809141659.2075052-2-hjl.tools@gmail.com
State Committed
Commit d4877540e565f89f0a33e5b92c9f4b995e2f3a33
Headers
Series benchtests: Building benchmarks as static executables |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

H.J. Lu Aug. 9, 2021, 2:16 p.m. UTC 
  On i686, there is no multiarch memove in libc.a, don't include multiarch
memove in ifunc-impl-list.c in libc.a.
---
 sysdeps/i386/i686/multiarch/ifunc-impl-list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

H.J. Lu Aug. 30, 2021, 12:57 p.m. UTC | #1 
On Mon, Aug 9, 2021 at 7:17 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On i686, there is no multiarch memove in libc.a, don't include multiarch
> memove in ifunc-impl-list.c in libc.a.
> ---
>  sysdeps/i386/i686/multiarch/ifunc-impl-list.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
> index 4e3cc56fa3..d3365cdc9d 100644
> --- a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
> +++ b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
> @@ -84,7 +84,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
>                               __memmove_chk_sse2_unaligned)
>               IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,
>                               __memmove_chk_ia32))
> -#endif
>
>    /* Support sysdeps/i386/i686/multiarch/memmove.S.  */
>    IFUNC_IMPL (i, name, memmove,
> @@ -95,6 +94,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
>               IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSE2),
>                               __memmove_sse2_unaligned)
>               IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_ia32))
> +#endif
>
>    /* Support sysdeps/i386/i686/multiarch/memrchr.S.  */
>    IFUNC_IMPL (i, name, memrchr,
> --
> 2.31.1
>

I am checking in this as an obvious fix.
diff mbox series

Patch

diff --git a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
index 4e3cc56fa3..d3365cdc9d 100644
--- a/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
+++ b/sysdeps/i386/i686/multiarch/ifunc-impl-list.c
@@ -84,7 +84,6 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __memmove_chk_sse2_unaligned)
 	      IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,
 			      __memmove_chk_ia32))
-#endif
 
   /* Support sysdeps/i386/i686/multiarch/memmove.S.  */
   IFUNC_IMPL (i, name, memmove,
@@ -95,6 +94,7 @@  __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, memmove, CPU_FEATURE_USABLE (SSE2),
 			      __memmove_sse2_unaligned)
 	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_ia32))
+#endif
 
   /* Support sysdeps/i386/i686/multiarch/memrchr.S.  */
   IFUNC_IMPL (i, name, memrchr,