summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-09-03 06:44:22 -0700
committerUlrich Drepper <drepper@redhat.com>2009-09-03 06:44:22 -0700
commit04ef416adc346e7e09fca7b27c4b6307b427e95b (patch)
tree0a0788e64c4a6e7d2059e64c4ba7365717b565b3
parent01034d7590f0db29a689d0037cf9b837e38e7482 (diff)
downloadglibc-04ef416adc346e7e09fca7b27c4b6307b427e95b.tar.gz
glibc-04ef416adc346e7e09fca7b27c4b6307b427e95b.tar.xz
glibc-04ef416adc346e7e09fca7b27c4b6307b427e95b.zip
Fix IA-32 strstr in multiarch configuration as well.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/i686/multiarch/strstr-c.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 01e7c91f81..486c6c5243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/i686/multiarch/strstr-c.c (__strstr_sse42,
+	__strstr_ia32): Add attribute_hidden.
+
 2009-09-01  Andreas Schwab  <schwab@redhat.com>
 
 	* hesiod/nss_hesiod/hesiod-grp.c (internal_gid_from_group): Fix
diff --git a/sysdeps/i386/i686/multiarch/strstr-c.c b/sysdeps/i386/i686/multiarch/strstr-c.c
index 7ef1157ce4..efa9f78f81 100644
--- a/sysdeps/i386/i686/multiarch/strstr-c.c
+++ b/sysdeps/i386/i686/multiarch/strstr-c.c
@@ -7,6 +7,7 @@
 
 #include "string/strstr.c"
 
-extern char *__strstr_sse42 (const char *, const char *);
+extern char *__strstr_sse42 (const char *, const char *) attribute_hidden;
+extern __typeof (__strstr_ia32) __strstr_ia32 attribute_hidden;
 
 libc_ifunc (strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_ia32);