33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
commit 31c7d69af59da0da80caa74b2ec6ae149013384d
|
||
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Fri Feb 16 07:40:37 2024 +0100
|
||
|
|
|
||
|
|
i386: Use generic memrchr in libc (bug 31316)
|
||
|
|
|
||
|
|
Before this change, we incorrectly used the SSE2 variant in the
|
||
|
|
implementation, without checking that the system actually supports
|
||
|
|
SSE2.
|
||
|
|
|
||
|
|
Tested-by: Sam James <sam@gentoo.org>
|
||
|
|
(cherry picked from commit 0d9166c2245cad4ac520b337dee40c9a583872b6)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c
|
||
|
|
index ef7bbbe792afc78e..20bfdf3af35b66e4 100644
|
||
|
|
--- a/sysdeps/i386/i686/multiarch/memrchr-c.c
|
||
|
|
+++ b/sysdeps/i386/i686/multiarch/memrchr-c.c
|
||
|
|
@@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#include "string/memrchr.c"
|
||
|
|
+strong_alias (__memrchr_ia32, __GI___memrchr)
|
||
|
|
diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
|
||
|
|
index d9dae04171bfedff..e123f87435b3c6a6 100644
|
||
|
|
--- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S
|
||
|
|
+++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
|
||
|
|
@@ -720,5 +720,4 @@ L(ret_null):
|
||
|
|
ret
|
||
|
|
|
||
|
|
END (__memrchr_sse2)
|
||
|
|
-strong_alias (__memrchr_sse2, __GI___memrchr)
|
||
|
|
#endif
|