From: Yao Zihong <zihong.plct@isrc.iscas.ac.cn>
Date: Mon, 26 Jan 2026 21:28:00 +0000 (-0600)
Subject: riscv: Disable multiarch memset variants when !IS_IN(libc)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39d9fa9e313308afa44b2b4843f8442e0ae1c067;p=thirdparty%2Fglibc.git

riscv: Disable multiarch memset variants when !IS_IN(libc)

This patch disables multiarch memset variants when !IS_IN(libc),
because rtld can only use a single fixed implementation.

Signed-off-by: Yao Zihong <zihong.plct@isrc.iscas.ac.cn>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/sysdeps/riscv/multiarch/memset-generic.c b/sysdeps/riscv/multiarch/memset-generic.c
index a4586d853a..a477bfd76b 100644
--- a/sysdeps/riscv/multiarch/memset-generic.c
+++ b/sysdeps/riscv/multiarch/memset-generic.c
@@ -22,5 +22,5 @@
 # define MEMSET __memset_generic
 # undef libc_hidden_builtin_def
 # define libc_hidden_builtin_def(x)
+# include <string/memset.c>
 #endif
-#include <string/memset.c>