From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Tue, 9 Apr 2013 17:02:04 +0000 (-0500)
Subject: PowerPC: strcasecmp ifunc cleaning
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3bbf938200e09554b415c12c38d6b7fa1d485c9;p=thirdparty%2Fglibc.git

PowerPC: strcasecmp ifunc cleaning
---

diff --git a/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c
index b932f512935..b74386f7461 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c
+++ b/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c
@@ -17,20 +17,10 @@
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef NOT_IN_libc
-# ifdef SHARED
-#  undef libc_hidden_builtin_def
-#  define libc_hidden_builtin_def(name) \
-  __hidden_ver1 (__strcasecmp_ppc32, __GI_strcasecmp, __strcasecmp_ppc32);
-# endif
-
-# undef strcasecmp
-# define strcasecmp __redirect_strcasecmp
 # include <string.h>
-# undef strcasecmp
 # define strcasecmp __strcasecmp_ppc32
-
-extern __typeof (__redirect_strcasecmp) __strcasecmp_ppc32 attribute_hidden;
-extern __typeof (__redirect_strcasecmp) __strcasecmp_power7 attribute_hidden;
+extern __typeof (__strcasecmp) __strcasecmp_ppc32 attribute_hidden;
+extern __typeof (__strcasecmp) __strcasecmp_power7 attribute_hidden;
 #endif
 
 #include "string/strcasecmp.c"
@@ -42,7 +32,7 @@ extern __typeof (__redirect_strcasecmp) __strcasecmp_power7 attribute_hidden;
 
 /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
    ifunc symbol properly.  */
-extern __typeof (__redirect_strcasecmp) __libc_strcasecmp;
+extern __typeof (__strcasecmp) __libc_strcasecmp;
 libc_ifunc (__libc_strcasecmp,
 	    (hwcap & PPC_FEATURE_HAS_VSX)
             ? __strcasecmp_power7
diff --git a/sysdeps/powerpc/powerpc32/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc32/multiarch/strcasecmp_l.c
index 71e37cfdd44..8cef4b496aa 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/strcasecmp_l.c
+++ b/sysdeps/powerpc/powerpc32/multiarch/strcasecmp_l.c
@@ -17,22 +17,10 @@
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef NOT_IN_libc
-# ifdef SHARED
-#  undef libc_hidden_builtin_def
-#  define libc_hidden_builtin_def(name) \
-  __hidden_ver1 (__strcasecmp_l_ppc32, __GI_strcasecmp_l, __strcasecmp_l_ppc32);
-# endif
-
-/* Redefine memmove so that the compiler won't complain about the type
-   mismatch with the IFUNC selector in strong_alias, below.  */
-# undef strcasecmp_l
-# define strcasecmp_l __redirect_strcasecmp_l
 # include <string.h>
-# undef strcasecmp_l
 # define strcasecmp_l __strcasecmp_l_ppc32
-
-extern __typeof (__redirect_strcasecmp_l) __strcasecmp_l_ppc32 attribute_hidden;
-extern __typeof (__redirect_strcasecmp_l) __strcasecmp_l_power7 attribute_hidden;
+extern __typeof (__strcasecmp_l) __strcasecmp_l_ppc32 attribute_hidden;
+extern __typeof (__strcasecmp_l) __strcasecmp_l_power7 attribute_hidden;
 #endif
 
 #include "string/strcasecmp_l.c"
@@ -44,7 +32,7 @@ extern __typeof (__redirect_strcasecmp_l) __strcasecmp_l_power7 attribute_hidden
 
 /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
    ifunc symbol properly.  */
-extern __typeof (__redirect_strcasecmp_l) __libc_strcasecmp_l;
+extern __typeof (__strcasecmp_l) __libc_strcasecmp_l;
 libc_ifunc (__libc_strcasecmp_l,
 	    (hwcap & PPC_FEATURE_HAS_VSX)
             ? __strcasecmp_l_power7