about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2009-10-06 20:01:23 -0700
committerRoland McGrath <roland@redhat.com>2009-10-06 20:01:23 -0700
commitb0f3a2e43fb9de9a4a2f4dfbdb84b98994752bc4 (patch)
tree2e9e8c162fc705ee964639aca5ecd0cca527127e
parent9d6982d5d2520fa714ad5de6a9a178fdd8ece92d (diff)
downloadglibc-b0f3a2e43fb9de9a4a2f4dfbdb84b98994752bc4.tar.gz
glibc-b0f3a2e43fb9de9a4a2f4dfbdb84b98994752bc4.tar.xz
glibc-b0f3a2e43fb9de9a4a2f4dfbdb84b98994752bc4.zip
Clean up unnecessary libc_hidden_builtin_def fiddling in x86 multiarch definitions.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/x86_64/multiarch/strcasestr-c.c3
-rw-r--r--sysdeps/x86_64/multiarch/strstr-c.c6
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"