]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
i386: Test memmove_chk and memset_chk only in libc.so [BZ #21741]
authorH.J. Lu <hjl.tools@gmail.com>
Wed, 19 Jul 2017 15:39:18 +0000 (08:39 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Wed, 19 Jul 2017 15:39:18 +0000 (08:39 -0700)
Since there are no multiarch versions of memmove_chk and memset_chk,
test multiarch versions of memmove_chk and memset_chk only in libc.so.

[BZ #21741]
* sysdeps/i386/i686/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Test memmove_chk and memset_chk only
in libc.so.

ChangeLog
sysdeps/i386/i686/multiarch/ifunc-impl-list.c

index b9dc70573bf8c9dbc91ca19972e3caa31102261f..d514f08b530684dbbb039ed985dcd8a465ddae77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-07-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #21741]
+       * sysdeps/i386/i686/multiarch/ifunc-impl-list.c
+       (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only
+       in libc.so.
+
 2017-07-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #21740]
index e8026a2a78d9ed811ea2747dfae41788822bc037..6e20cffb04f0053bf78b1129a4b211f006feb6b7 100644 (file)
@@ -70,6 +70,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
                              __memcmp_ssse3)
              IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ia32))
 
+#ifdef SHARED
   /* Support sysdeps/i386/i686/multiarch/memmove_chk.S.  */
   IFUNC_IMPL (i, name, __memmove_chk,
              IFUNC_IMPL_ADD (array, i, __memmove_chk,
@@ -83,6 +84,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
                              __memmove_chk_sse2_unaligned)
              IFUNC_IMPL_ADD (array, i, __memmove_chk, 1,
                              __memmove_chk_ia32))
+#endif
 
   /* Support sysdeps/i386/i686/multiarch/memmove.S.  */
   IFUNC_IMPL (i, name, memmove,
@@ -102,6 +104,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
                              __memrchr_sse2)
              IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_ia32))
 
+#ifdef SHARED
   /* Support sysdeps/i386/i686/multiarch/memset_chk.S.  */
   IFUNC_IMPL (i, name, __memset_chk,
              IFUNC_IMPL_ADD (array, i, __memset_chk,
@@ -112,6 +115,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
                              __memset_chk_sse2)
              IFUNC_IMPL_ADD (array, i, __memset_chk, 1,
                              __memset_chk_ia32))
+#endif
 
   /* Support sysdeps/i386/i686/multiarch/memset.S.  */
   IFUNC_IMPL (i, name, memset,