From patchwork Tue Jun 12 22:19:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 27774 Received: (qmail 94307 invoked by alias); 12 Jun 2018 22:20:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 93286 invoked by uid 89); 12 Jun 2018 22:20:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: mga01.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH 18/20] libcpu-rt-c/x86-64: Add strncmp Date: Tue, 12 Jun 2018 15:19:37 -0700 Message-Id: <20180612221939.19545-19-hjl.tools@gmail.com> In-Reply-To: <20180612221939.19545-1-hjl.tools@gmail.com> References: <20180612221939.19545-1-hjl.tools@gmail.com> * sysdeps/x86_64/Makefile (cpu-rt-c-routines): Add strncmp. * sysdeps/x86_64/multiarch/Makefile (libcpu-rt-c-sysdep_routines): Add strncmp-sse2, strncmp-ssse3, strncmp-sse4_2 and strncmp-avx2. * sysdeps/x86_64/multiarch/strncmp-sse2.S: Also rename STRCMP to __strncmp_sse2 for libcpu-rt-c. * sysdeps/x86_64/multiarch/strncmp.c: Support libcpu-rt-c. --- sysdeps/x86_64/Makefile | 2 +- sysdeps/x86_64/multiarch/Makefile | 3 ++- sysdeps/x86_64/multiarch/strncmp-sse2.S | 2 +- sysdeps/x86_64/multiarch/strncmp.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 3c9ea605c6..4e872b1220 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -149,7 +149,7 @@ endif ifeq ($(subdir),cpu-rt-c) cpu-rt-c-routines += memchr memcmp memcpy memmove mempcpy memrchr \ memset strcat strchr strcmp strcpy strlen strncat \ - strnlen \ + strnlen strncmp \ wmemset # For the CPU run-time tests. diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile index c9ae280f43..e3c197ba84 100644 --- a/sysdeps/x86_64/multiarch/Makefile +++ b/sysdeps/x86_64/multiarch/Makefile @@ -90,5 +90,6 @@ libcpu-rt-c-sysdep_routines += memchr-sse2 memchr-avx2 \ strcpy-sse2-unaligned strcpy-ssse3 \ strlen-sse2 strlen-avx2 strncat-c \ strncat-sse2-unaligned strncat-ssse3 \ - strnlen-sse2 strnlen-avx2 + strnlen-sse2 strnlen-avx2 strncmp-sse2 \ + strncmp-ssse3 strncmp-sse4_2 strncmp-avx2 endif diff --git a/sysdeps/x86_64/multiarch/strncmp-sse2.S b/sysdeps/x86_64/multiarch/strncmp-sse2.S index a5ecb82b13..5ef1d31ac3 100644 --- a/sysdeps/x86_64/multiarch/strncmp-sse2.S +++ b/sysdeps/x86_64/multiarch/strncmp-sse2.S @@ -18,7 +18,7 @@ #include -#if IS_IN (libc) +#if IS_IN (libc) || IS_IN (libcpu_rt_c) # define STRCMP __strncmp_sse2 # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(strcmp) diff --git a/sysdeps/x86_64/multiarch/strncmp.c b/sysdeps/x86_64/multiarch/strncmp.c index 02b6d0b6f5..427763ff05 100644 --- a/sysdeps/x86_64/multiarch/strncmp.c +++ b/sysdeps/x86_64/multiarch/strncmp.c @@ -18,7 +18,7 @@ . */ /* Define multiple versions only for the definition in libc. */ -#if IS_IN (libc) +#if IS_IN (libc) || IS_IN (libcpu_rt_c) # define strncmp __redirect_strncmp # include # undef strncmp @@ -53,7 +53,7 @@ IFUNC_SELECTOR (void) libc_ifunc_redirected (__redirect_strncmp, strncmp, IFUNC_SELECTOR ()); -# ifdef SHARED +# if defined SHARED && !IS_IN (libcpu_rt_c) __hidden_ver1 (strncmp, __GI_strncmp, __redirect_strncmp) __attribute__ ((visibility ("hidden"))); # endif