diff mbox series

[v1,1/4] x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII

Message ID 20220712192808.335531-1-goldstein.w.n@gmail.com
State Committed
Commit 30e57e0a21cc50eead14f729a29a5604a6b23e18
Headers
Series [v1,1/4] x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Noah Goldstein July 12, 2022, 7:28 p.m. UTC 
  The previous macro name can be confusing given that both
`__strcasecmp_l_nonascii` and `__strcasecmp_nonascii` are
functions and we use the `_l` version.
---
 sysdeps/x86_64/multiarch/strcmp-avx2.S | 6 +++---
 sysdeps/x86_64/multiarch/strcmp-evex.S | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

H.J. Lu July 12, 2022, 11:30 p.m. UTC | #1 
On Tue, Jul 12, 2022 at 12:28 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
>
> The previous macro name can be confusing given that both
> `__strcasecmp_l_nonascii` and `__strcasecmp_nonascii` are
> functions and we use the `_l` version.
> ---
>  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
>
> --
> 2.34.1
>

LGTM.

Thanks.
diff mbox series

Patch

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