diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strcasestr-c.c | 3 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strstr-c.c | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index ceba0157b0..7192970335 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-10-06 Roland McGrath <roland@redhat.com> + * sysdeps/x86_64/multiarch/strstr-c.c + [! SHARED]: Omit libc_hidden_builtin_def fiddling. + + * sysdeps/x86_64/multiarch/strcasestr-c.c: Remove + libc_hidden_builtin_def fiddling, does not apply to strcasestr at all. + * sysdeps/x86_64/multiarch/init-arch.h [NOT_IN_libc] (__get_cpu_features): Define it as a macro. (HAS_CPU_FEATURE): New macro. diff --git a/sysdeps/x86_64/multiarch/strcasestr-c.c b/sysdeps/x86_64/multiarch/strcasestr-c.c index 3cb5557b67..551492d8f5 100644 --- a/sysdeps/x86_64/multiarch/strcasestr-c.c +++ b/sysdeps/x86_64/multiarch/strcasestr-c.c @@ -1,9 +1,6 @@ #include "init-arch.h" #define STRCASESTR __strcasestr_sse2 -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strcasestr_sse2, __GI_strcasestr, __strcasestr_sse2); #include "string/strcasestr.c" diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c index d593089a87..b8ed3161d5 100644 --- a/sysdeps/x86_64/multiarch/strstr-c.c +++ b/sysdeps/x86_64/multiarch/strstr-c.c @@ -1,9 +1,11 @@ #include "init-arch.h" #define STRSTR __strstr_sse2 -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) \ +#ifdef SHARED +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) \ __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); +#endif #include "string/strstr.c" |