[4/7,PowerPC64] Tidy strcasecmp_l-power7.S symbols

Message ID b44ecbe3a1c811116671071ca4cbe8f16a701480.1508908224.git.amodra@gmail.com
State Committed
Delegated to: Adhemerval Zanella Netto
Headers

Commit Message

Alan Modra Oct. 25, 2017, 7:36 a.m. UTC
  The routine being assembled here is strcasecmp_l, so ask for that via
__STRCMP and STRCMP defines.  That change means tweaking the power7
override.  Needed for later powerpc64le changes where we want the base
symbols, not just a power7 variant.

	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S:
	(__STRCMP, STRCMP, __strcasecmp_l): Define.
	(__strcasecmp): Don't define.
  

Comments

Adhemerval Zanella Oct. 30, 2017, 11:53 a.m. UTC | #1
On 25/10/2017 05:36, Alan Modra wrote:
> The routine being assembled here is strcasecmp_l, so ask for that via
> __STRCMP and STRCMP defines.  That change means tweaking the power7
> override.  Needed for later powerpc64le changes where we want the base
> symbols, not just a power7 variant.
> 
> 	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S:
> 	(__STRCMP, STRCMP, __strcasecmp_l): Define.
> 	(__strcasecmp): Don't define.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> 
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> index da4c405..72121bc 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
> @@ -18,7 +18,7 @@
>  
>  #include <sysdep.h>
>  
> -#define __strcasecmp __strcasecmp_l_power7
> +#define __strcasecmp_l __strcasecmp_l_power7
>  
>  #undef weak_alias
>  #define weak_alias(name, alias)
> @@ -27,5 +27,7 @@
>  #define libc_hidden_builtin_def(name)
>  
>  #define USE_IN_EXTENDED_LOCALE_MODEL
> +#define __STRCMP __strcasecmp_l
> +#define STRCMP   strcasecmp_l
>  
>  #include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S>
>
  

Patch

diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
index da4c405..72121bc 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
@@ -18,7 +18,7 @@ 
 
 #include <sysdep.h>
 
-#define __strcasecmp __strcasecmp_l_power7
+#define __strcasecmp_l __strcasecmp_l_power7
 
 #undef weak_alias
 #define weak_alias(name, alias)
@@ -27,5 +27,7 @@ 
 #define libc_hidden_builtin_def(name)
 
 #define USE_IN_EXTENDED_LOCALE_MODEL
+#define __STRCMP __strcasecmp_l
+#define STRCMP   strcasecmp_l
 
 #include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S>