From: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Tue, 12 Jul 2022 19:28:05 +0000 (-0700)
Subject: x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII
X-Git-Tag: glibc-2.36~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30e57e0a21cc50eead14f729a29a5604a6b23e18;p=thirdparty%2Fglibc.git

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 --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S
index 516cde11459..3ab21e3a586 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 e97d51bb264..afbf13a230b 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