From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id 6A9B13858D1E; Wed, 13 Jul 2022 22:54:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A9B13858D1E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc] x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/master X-Git-Oldrev: f27e5e21787abc9f719879af47687221aa1027b3 X-Git-Newrev: 30e57e0a21cc50eead14f729a29a5604a6b23e18 Message-Id: <20220713225417.6A9B13858D1E@sourceware.org> Date: Wed, 13 Jul 2022 22:54:17 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 22:54:17 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=30e57e0a21cc50eead14f729a29a5604a6b23e18 commit 30e57e0a21cc50eead14f729a29a5604a6b23e18 Author: Noah Goldstein Date: Tue Jul 12 12:28:05 2022 -0700 x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII The previous macro name can be confusing given that both `__strcasecmp_l_nonascii` and `__strcasecmp_nonascii` are functions and we use the `_l` version. Diff: --- sysdeps/x86_64/multiarch/strcmp-avx2.S | 6 +++--- sysdeps/x86_64/multiarch/strcmp-evex.S | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S index 516cde1145..3ab21e3a58 100644 --- a/sysdeps/x86_64/multiarch/strcmp-avx2.S +++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S @@ -89,12 +89,12 @@ # define STRCASECMP __strncasecmp_avx2 # define LOCALE_REG rcx # define LOCALE_REG_LP RCX_LP -# define STRCASECMP_NONASCII __strncasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strncasecmp_l_nonascii # else # define STRCASECMP __strcasecmp_avx2 # define LOCALE_REG rdx # define LOCALE_REG_LP RDX_LP -# define STRCASECMP_NONASCII __strcasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strcasecmp_l_nonascii # endif # endif @@ -215,7 +215,7 @@ STRCMP: mov (%LOCALE_REG), %RAX_LP # endif testl $1, LOCALE_DATA_VALUES + _NL_CTYPE_NONASCII_CASE * SIZEOF_VALUES(%rax) - jne STRCASECMP_NONASCII + jne STRCASECMP_L_NONASCII leaq _nl_C_LC_CTYPE_tolower + 128 * 4(%rip), TOLOWER_BASE # endif diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S index e97d51bb26..afbf13a230 100644 --- a/sysdeps/x86_64/multiarch/strcmp-evex.S +++ b/sysdeps/x86_64/multiarch/strcmp-evex.S @@ -123,12 +123,12 @@ # define STRCASECMP __strncasecmp_evex # define LOCALE_REG rcx # define LOCALE_REG_LP RCX_LP -# define STRCASECMP_NONASCII __strncasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strncasecmp_l_nonascii # else # define STRCASECMP __strcasecmp_evex # define LOCALE_REG rdx # define LOCALE_REG_LP RDX_LP -# define STRCASECMP_NONASCII __strcasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strcasecmp_l_nonascii # endif # endif @@ -241,7 +241,7 @@ STRCMP: mov (%LOCALE_REG), %RAX_LP # endif testl $1, LOCALE_DATA_VALUES + _NL_CTYPE_NONASCII_CASE * SIZEOF_VALUES(%rax) - jne STRCASECMP_NONASCII + jne STRCASECMP_L_NONASCII leaq _nl_C_LC_CTYPE_tolower + 128 * 4(%rip), TOLOWER_BASE # endif