From patchwork Tue Jun 12 22:19:38 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: 27776 Received: (qmail 94467 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 93302 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=sk:strncpy 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 19/20] libcpu-rt-c/x86-64: Add strncpy Date: Tue, 12 Jun 2018 15:19:38 -0700 Message-Id: <20180612221939.19545-20-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 strncpy. * sysdeps/x86_64/multiarch/Makefile (libcpu-rt-c-sysdep_routines): Add strncpy-c, strncpy-sse2-unaligned and strncpy-ssse3. * sysdeps/x86_64/multiarch/strncpy.c: Support libcpu-rt-c. --- sysdeps/x86_64/Makefile | 2 +- sysdeps/x86_64/multiarch/Makefile | 4 +++- sysdeps/x86_64/multiarch/strncpy.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 4e872b1220..17d3a07894 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 strncmp \ + strnlen strncmp strncpy \ wmemset # For the CPU run-time tests. diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile index e3c197ba84..de4938b3eb 100644 --- a/sysdeps/x86_64/multiarch/Makefile +++ b/sysdeps/x86_64/multiarch/Makefile @@ -91,5 +91,7 @@ libcpu-rt-c-sysdep_routines += memchr-sse2 memchr-avx2 \ strlen-sse2 strlen-avx2 strncat-c \ strncat-sse2-unaligned strncat-ssse3 \ strnlen-sse2 strnlen-avx2 strncmp-sse2 \ - strncmp-ssse3 strncmp-sse4_2 strncmp-avx2 + strncmp-ssse3 strncmp-sse4_2 strncmp-avx2 \ + strncpy-c strncpy-sse2-unaligned \ + strncpy-ssse3 endif diff --git a/sysdeps/x86_64/multiarch/strncpy.c b/sysdeps/x86_64/multiarch/strncpy.c index 3c3de8b18e..30bd615f99 100644 --- a/sysdeps/x86_64/multiarch/strncpy.c +++ b/sysdeps/x86_64/multiarch/strncpy.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 strncpy __redirect_strncpy # include # undef strncpy @@ -28,7 +28,7 @@ libc_ifunc_redirected (__redirect_strncpy, strncpy, IFUNC_SELECTOR ()); -# ifdef SHARED +# if defined SHARED && !IS_IN (libcpu_rt_c) __hidden_ver1 (strncpy, __GI_strncpy, __redirect_strncpy) __attribute__ ((visibility ("hidden"))); # endif