diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-04-19 17:52:33 -0500 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-04-19 20:18:57 -0500 |
| commit | c72a1a062a1ded52719802c07ab459e1fd54d2a6 (patch) | |
| tree | 55eba23a9d1abb393f8556418f6c2d14026c4ac7 | |
| parent | 3e9acce8c50883b6cd8a3fb653363d9fa21e1608 (diff) | |
| download | glibc-c72a1a062a1ded52719802c07ab459e1fd54d2a6.tar.gz glibc-c72a1a062a1ded52719802c07ab459e1fd54d2a6.tar.xz glibc-c72a1a062a1ded52719802c07ab459e1fd54d2a6.zip | |
x86: Fix missing __wmemcmp def for disable-multiarch build
commit 8804157ad9da39631703b92315460808eac86b0c
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Fri Apr 15 12:27:59 2022 -0500
x86: Optimize memcmp SSE2 in memcmp.S
Only defined wmemcmp and missed __wmemcmp. This commit fixes that by
defining __wmemcmp and setting wmemcmp as a weak alias to __wmemcmp.
Both multiarch and disable-multiarch builds succeed and full xchecks
pass.
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
| -rw-r--r-- | sysdeps/x86_64/multiarch/wmemcmp-sse2.S | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/wmemcmp.S | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S index 57be1c446e..f09192ed77 100644 --- a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S +++ b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S @@ -16,10 +16,6 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#if IS_IN (libc) -# define MEMCMP __wmemcmp_sse2 -#else -# define MEMCMP wmemcmp -#endif #define USE_AS_WMEMCMP 1 -#include "memcmp-sse2.S" +#define MEMCMP __wmemcmp_sse2 +#include "../memcmp.S" diff --git a/sysdeps/x86_64/wmemcmp.S b/sysdeps/x86_64/wmemcmp.S index 032f389158..815b999e4e 100644 --- a/sysdeps/x86_64/wmemcmp.S +++ b/sysdeps/x86_64/wmemcmp.S @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#define MEMCMP wmemcmp +#define MEMCMP __wmemcmp #define USE_AS_WMEMCMP 1 -#include "multiarch/memcmp-sse2.S" +#include "memcmp.S" + +weak_alias (__wmemcmp, wmemcmp) |