diff options
author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2013-04-09 12:02:04 -0500 |
---|---|---|
committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2013-04-09 12:04:28 -0500 |
commit | f3bbf938200e09554b415c12c38d6b7fa1d485c9 (patch) | |
tree | ca7ff70f6c899b11856a5019f60703301375cfda | |
parent | 003dad78402c0256c1d98fa13f441e7ab8d661c2 (diff) | |
download | glibc-f3bbf938200e09554b415c12c38d6b7fa1d485c9.tar glibc-f3bbf938200e09554b415c12c38d6b7fa1d485c9.tar.gz glibc-f3bbf938200e09554b415c12c38d6b7fa1d485c9.tar.bz2 glibc-f3bbf938200e09554b415c12c38d6b7fa1d485c9.zip |
PowerPC: strcasecmp ifunc cleaning
-rw-r--r-- | sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c | 16 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/multiarch/strcasecmp_l.c | 18 |
2 files changed, 6 insertions, 28 deletions
diff --git a/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc32/multiarch/strcasecmp.c index b932f51293..b74386f746 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 71e37cfdd4..8cef4b496a 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 |