[5/7,PowerPC64] strncase_l-power7.c should use strncase_l.c

Message ID ab3f7479e301c56395c1685585cdf977d67a828e.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
  This is another one where we'll be wanting the base symbols for
powerpc64le rather than just a power7 variant.

	* sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c: Include
	string/strncase_l.c, not string/strncase.c.
	(USE_IN_EXTENDED_LOCALE_MODEL): Don't define.
	(libc_hidden_def): Redefine.
  

Comments

Adhemerval Zanella Netto Oct. 30, 2017, 11:54 a.m. UTC | #1
On 25/10/2017 05:36, Alan Modra wrote:
> This is another one where we'll be wanting the base symbols for
> powerpc64le rather than just a power7 variant.
> 
> 	* sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c: Include
> 	string/strncase_l.c, not string/strncase.c.
> 	(USE_IN_EXTENDED_LOCALE_MODEL): Don't define.
> 	(libc_hidden_def): Redefine.

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

> 
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
> index f87ff6c..73b967d 100644
> --- a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
> +++ b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
> @@ -18,8 +18,10 @@
>  #include <string.h>
>  
>  #define __strncasecmp_l __strncasecmp_l_power7
> -#define USE_IN_EXTENDED_LOCALE_MODEL    1
> +
> +#undef libc_hidden_def
> +#define libc_hidden_def(name)
>  
>  extern __typeof (strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
>  
> -#include <string/strncase.c>
> +#include <string/strncase_l.c>
>
  

Patch

diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
index f87ff6c..73b967d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
@@ -18,8 +18,10 @@ 
 #include <string.h>
 
 #define __strncasecmp_l __strncasecmp_l_power7
-#define USE_IN_EXTENDED_LOCALE_MODEL    1
+
+#undef libc_hidden_def
+#define libc_hidden_def(name)
 
 extern __typeof (strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
 
-#include <string/strncase.c>
+#include <string/strncase_l.c>