Quash a warning in strstr-c.c built for static.

diff --git a/ChangeLog b/ChangeLog
index 55390de..33b5755 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-14  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/i386/i686/multiarch/strstr-c.c (libc_hidden_builtin_def):
+       Conditionalize redefinition on [SHARED && DO_VERSIONING && !NO_HIDDEN].
+
        * configure.in (-z relro check): Adjust test code to add a large
        writable data section after it.
        * configure: Regenerated.

diff --git a/sysdeps/i386/i686/multiarch/strstr-c.c b/sysdeps/i386/i686/multiarch/strstr-c.c
index efa9f78..1fcb00e 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strstr-c.c
+++ b/sysdeps/i386/i686/multiarch/strstr-c.c
@@ -1,9 +1,11 @@
 #include "init-arch.h"
 
 #define STRSTR __strstr_ia32
+#if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name) \
   __hidden_ver1 (__strstr_ia32, __GI_strstr, __strstr_ia32);
+#endif
 
 #include "string/strstr.c"