[16/20] libcpu-rt-c/x86-64: Add strnlen

Message ID 20180612221939.19545-17-hjl.tools@gmail.com
State New
Headers show
Series
  • RFC: Add the CPU run-time library for C
Related show

Commit Message

H.J. Lu June 12, 2018, 10:19 p.m.
* sysdeps/x86_64/Makefile (cpu-rt-c-routines): Add strnlen.
	* sysdeps/x86_64/multiarch/Makefile
	(libcpu-rt-c-sysdep_routines): Add strnlen-sse2 and
	strnlen-avx2.
	* sysdeps/x86_64/multiarch/strnlen-sse2.S: Support libcpu-rt-c.
	* sysdeps/x86_64/multiarch/strnlen.c: Likewise.
---
 sysdeps/x86_64/Makefile                 |  2 +-
 sysdeps/x86_64/multiarch/Makefile       |  3 ++-
 sysdeps/x86_64/multiarch/strnlen-sse2.S |  2 +-
 sysdeps/x86_64/multiarch/strnlen.c      | 20 ++++++++++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

Patch

diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index ea0d7a31dc..1a5720bbac 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -148,7 +148,7 @@  endif
 
 ifeq ($(subdir),cpu-rt-c)
 cpu-rt-c-routines += memchr memcmp memcpy memmove mempcpy memrchr \
-		     memset strcat strchr strcmp strcpy strlen \
+		     memset strcat strchr strcmp strcpy strlen strnlen \
 		     wmemset
 
 # For the CPU run-time tests.
diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile
index 10de1f3af3..1c902eec4e 100644
--- a/sysdeps/x86_64/multiarch/Makefile
+++ b/sysdeps/x86_64/multiarch/Makefile
@@ -88,5 +88,6 @@  libcpu-rt-c-sysdep_routines += memchr-sse2 memchr-avx2 \
 			       strcmp-sse2-unaligned strcmp-ssse3 \
 			       strcmp-sse4_2 strcmp-avx2 strcpy-sse2 \
 			       strcpy-sse2-unaligned strcpy-ssse3 \
-			       strlen-sse2 strlen-avx2
+			       strlen-sse2 strlen-avx2 \
+			       strnlen-sse2 strnlen-avx2
 endif
diff --git a/sysdeps/x86_64/multiarch/strnlen-sse2.S b/sysdeps/x86_64/multiarch/strnlen-sse2.S
index 41f33f6f6f..a5cba9a698 100644
--- a/sysdeps/x86_64/multiarch/strnlen-sse2.S
+++ b/sysdeps/x86_64/multiarch/strnlen-sse2.S
@@ -16,7 +16,7 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
 # define __strnlen __strnlen_sse2
 
 # undef weak_alias
diff --git a/sysdeps/x86_64/multiarch/strnlen.c b/sysdeps/x86_64/multiarch/strnlen.c
index 3ab94ce230..5752764d2b 100644
--- a/sysdeps/x86_64/multiarch/strnlen.c
+++ b/sysdeps/x86_64/multiarch/strnlen.c
@@ -18,7 +18,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 /* Define multiple versions only for the definition in libc.  */
-#if IS_IN (libc)
+#if IS_IN (libc) || IS_IN (libcpu_rt_c)
 # define strnlen __redirect_strnlen
 # define __strnlen __redirect___strnlen
 # include <string.h>
@@ -28,12 +28,28 @@ 
 # define SYMBOL_NAME strnlen
 # include "ifunc-avx2.h"
 
+#if IS_IN (libcpu_rt_c)
+# define __strnlen strnlen
+#endif
+
 libc_ifunc_redirected (__redirect_strnlen, __strnlen, IFUNC_SELECTOR ());
+
+# if IS_IN (libcpu_rt_c)
+#  ifdef SHARED
+__hidden_ver1 (strnlen, __strnlen, __redirect___strnlen)
+  __attribute__((visibility ("hidden")));
+#  else
+#   undef __strnlen
+/* Needed by strncpy-c.o.  */
+strong_alias (strnlen, __strnlen);
+#  endif
+# else
+#  ifdef SHARED
 weak_alias (__strnlen, strnlen);
-# ifdef SHARED
 __hidden_ver1 (__strnlen, __GI___strnlen, __redirect___strnlen)
   __attribute__((visibility ("hidden")));
 __hidden_ver1 (strnlen, __GI_strnlen, __redirect_strnlen)
   __attribute__((weak, visibility ("hidden")));
+#  endif
 # endif
 #endif