From: Christoph Müllner <christoph.muellner@vrull.eu>
This patch adds ifunc support for calls to memset to the RISC-V code.
No optimized code is added as part of this patch.
Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
---
sysdeps/riscv/multiarch/Makefile | 2 +-
sysdeps/riscv/multiarch/ifunc-impl-list.c | 3 ++
sysdeps/riscv/multiarch/memset.c | 40 +++++++++++++++++++++++
sysdeps/riscv/multiarch/memset_generic.c | 32 ++++++++++++++++++
4 files changed, 76 insertions(+), 1 deletion(-)
create mode 100644 sysdeps/riscv/multiarch/memset.c
create mode 100644 sysdeps/riscv/multiarch/memset_generic.c
@@ -1,4 +1,4 @@
ifeq ($(subdir),string)
sysdep_routines += \
-
+ memset_generic
endif
@@ -35,5 +35,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
size_t i = 0;
+ IFUNC_IMPL (i, name, memset,
+ IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic))
+
return i;
}
new file mode 100644
@@ -0,0 +1,40 @@
+/* Multiple versions of memset. RISC-V version.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+/* Define multiple versions only for the definition in libc. */
+
+#if IS_IN (libc)
+/* Redefine memset so that the compiler won't complain about the type
+ mismatch with the IFUNC selector in strong_alias, below. */
+# undef memset
+# define memset __redirect_memset
+# include <string.h>
+# include <ldsodefs.h>
+# include <sys/auxv.h>
+# include <init-arch.h>
+
+extern __typeof (__redirect_memset) __libc_memset;
+extern __typeof (__redirect_memset) __memset_generic attribute_hidden;
+
+libc_ifunc (__libc_memset, __memset_generic);
+
+# undef memset
+strong_alias (__libc_memset, memset);
+#else
+# include <string/memset.c>
+#endif
new file mode 100644
@@ -0,0 +1,32 @@
+/* Memset for RISC-V, default version for internal use.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <string.h>
+
+#define MEMSET __memset_generic
+
+#ifdef SHARED
+# undef libc_hidden_builtin_def
+# define libc_hidden_builtin_def(name) \
+ __hidden_ver1(__memset_generic, __GI_memset, __memset_generic);
+#endif
+
+extern void *__memset_generic(void *s, int c, size_t n);
+
+#include <string/memset.c>