summary refs log tree commit diff
diff options
context:
space:
mode:
authorNoah Goldstein <goldstein.w.n@gmail.com>2022-07-12 12:28:05 -0700
committerNoah Goldstein <goldstein.w.n@gmail.com>2022-07-13 14:55:31 -0700
commit30e57e0a21cc50eead14f729a29a5604a6b23e18 (patch)
treee71644bfda9d4313826d5910e79407bd61114977
parentf27e5e21787abc9f719879af47687221aa1027b3 (diff)
downloadglibc-30e57e0a21cc50eead14f729a29a5604a6b23e18.tar.gz
glibc-30e57e0a21cc50eead14f729a29a5604a6b23e18.tar.xz
glibc-30e57e0a21cc50eead14f729a29a5604a6b23e18.zip
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.
-rw-r--r--sysdeps/x86_64/multiarch/strcmp-avx2.S6
-rw-r--r--sysdeps/x86_64/multiarch/strcmp-evex.S6
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