From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 7 Jan 2025 01:36:55 +0000 (+0100)
Subject: include/string.h: Also redirect calls if not inlined in libpthread
X-Git-Tag: glibc-2.41~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4c414796a4b7464b24f5e13f35042f3b7a2444b;p=thirdparty%2Fglibc.git

include/string.h: Also redirect calls if not inlined in libpthread

htl's pt-alloc.c calls __mempcpy, which is #defined to
__builtin_mempcpy, but which does not happen to get inlined (the size is
dynamic), and then gcc emits a reference to mempcpy, thus violating
symbol exposition standard. We thus also have to redirect such
references to __mempcpy too.
---

diff --git a/include/string.h b/include/string.h
index 1f6aef9f93..b9c41b0eea 100644
--- a/include/string.h
+++ b/include/string.h
@@ -175,7 +175,7 @@ extern __typeof (strnlen) strnlen attribute_hidden;
 extern __typeof (strsep) strsep attribute_hidden;
 #endif
 
-#if IS_IN (libc) && !defined SHARED \
+#if (IS_IN (libc) || IS_IN (libpthread)) && !defined SHARED \
   && !defined NO_MEMPCPY_STPCPY_REDIRECT
 /* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
    __mempcpy and __stpcpy if not inlined.  */