657b0dc854
Upstream commit: 6ade91c21140d8c803c289932dbfc74537f65a1f
- elf: Avoid some free (NULL) calls in _dl_update_slotinfo
- misc: Add support for Linux uio.h RWF_NOAPPEND flag
Resolves: RHEL-34577
- i386: Disable Intel Xeon Phi tests for GCC 15 and above (BZ 31782)
- Reinstate generic features-time64.h
- Always define __USE_TIME_BITS64 when 64 bit time_t is used
- socket: Use may_alias on sockaddr structs (bug 19622)
- parse_fdinfo: Don't advance pointer twice [BZ #31798]
- LoongArch: Fix undefined `__memset_aligned` reference in ld.so linking.
- socket: Add new test for connect
- libsupport: Add xgetpeername
- x86_64: Fix missing wcsncat function definition without multiarch (x86-64-v4)
Resolves: RHEL-35602
Fedora 40 commit: fec1cd8ce1
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
commit ab4ef4421f85ea7afeb482ded51003658b08de7e
|
|
Author: Gabi Falk <gabifalk@gmx.com>
|
|
Date: Tue May 7 18:25:00 2024 +0000
|
|
|
|
x86_64: Fix missing wcsncat function definition without multiarch (x86-64-v4)
|
|
|
|
This code expects the WCSCAT preprocessor macro to be predefined in case
|
|
the evex implementation of the function should be defined with a name
|
|
different from __wcsncat_evex. However, when glibc is built for
|
|
x86-64-v4 without multiarch support, sysdeps/x86_64/wcsncat.S defines
|
|
WCSNCAT variable instead of WCSCAT to build it as wcsncat. Rename the
|
|
variable to WCSNCAT, as it is actually a better naming choice for the
|
|
variable in this case.
|
|
|
|
Reported-by: Kenton Groombridge
|
|
Link: https://bugs.gentoo.org/921945
|
|
Fixes: 64b8b6516b ("x86: Add evex optimized functions for the wchar_t strcpy family")
|
|
Signed-off-by: Gabi Falk <gabifalk@gmx.com>
|
|
Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com>
|
|
(cherry picked from commit dd5f891c1ad9f1b43b9db93afe2a55cbb7a6194e)
|
|
|
|
diff --git a/sysdeps/x86_64/multiarch/wcsncat-evex.S b/sysdeps/x86_64/multiarch/wcsncat-evex.S
|
|
index 392215950afd56be..10bfb0a5314130cf 100644
|
|
--- a/sysdeps/x86_64/multiarch/wcsncat-evex.S
|
|
+++ b/sysdeps/x86_64/multiarch/wcsncat-evex.S
|
|
@@ -1,9 +1,9 @@
|
|
-#ifndef WCSCAT
|
|
-# define WCSCAT __wcsncat_evex
|
|
+#ifndef WCSNCAT
|
|
+# define WCSNCAT __wcsncat_evex
|
|
#endif
|
|
|
|
#define USE_AS_WCSCPY
|
|
#define USE_AS_STRCAT
|
|
|
|
-#define STRNCAT WCSCAT
|
|
+#define STRNCAT WCSNCAT
|
|
#include "strncat-evex.S"
|