diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-07-14 20:47:54 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-07-14 20:47:54 -0700 |
| commit | 661607b3dd9f0b10667d4040843c1a3dc40f0cc9 (patch) | |
| tree | a248f7f96d831ac7d014a12c552f1cd46b86346c | |
| parent | 4b3d3e282a1c8a755bf5e02dd451158bdabbfcd8 (diff) | |
| download | glibc-661607b3dd9f0b10667d4040843c1a3dc40f0cc9.zip glibc-661607b3dd9f0b10667d4040843c1a3dc40f0cc9.tar.gz glibc-661607b3dd9f0b10667d4040843c1a3dc40f0cc9.tar.bz2 | |
Quash a warning in strstr-c.c built for static.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strstr-c.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -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 --- 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" |