diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-10 04:44:24 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2017-07-10 04:44:38 -0700 |
commit | 7a499756abdd4ec56658e319c0cee4220a320652 (patch) | |
tree | 49446010e64b29f82e8a50dc822eedcd6ec6dadf | |
parent | 5fa205d48516019481b316013a088d516f551a7a (diff) | |
download | glibc-7a499756abdd4ec56658e319c0cee4220a320652.tar.gz glibc-7a499756abdd4ec56658e319c0cee4220a320652.tar.xz glibc-7a499756abdd4ec56658e319c0cee4220a320652.zip |
x86-64: Test memmove_chk and memset_chk only in libc.so [BZ #21741]
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/x86_64/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only in libc.so.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sysdeps/x86_64/multiarch/ifunc-impl-list.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index ff4816ef51..75dd6dfa63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-07-10 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #21741] + * sysdeps/x86_64/multiarch/ifunc-impl-list.c + (__libc_ifunc_impl_list): Test memmove_chk and memset_chk only + in libc.so. + 2017-07-09 John David Anglin <danglin@gcc.gnu.org> * sysdeps/hppa/fpu/libm-test-ulps: Update. diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index 6d59e3fde2..b761e70a2e 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -57,6 +57,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memcmp_ssse3) IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_sse2)) +#ifdef SHARED /* Support sysdeps/x86_64/multiarch/memmove_chk.c. */ IFUNC_IMPL (i, name, __memmove_chk, IFUNC_IMPL_ADD (array, i, __memmove_chk, @@ -86,6 +87,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memmove_chk_sse2_unaligned_erms) IFUNC_IMPL_ADD (array, i, __memmove_chk, 1, __memmove_chk_erms)) +#endif /* Support sysdeps/x86_64/multiarch/memmove.c. */ IFUNC_IMPL (i, name, memmove, @@ -121,6 +123,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memrchr_avx2) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_sse2)) +#ifdef SHARED /* Support sysdeps/x86_64/multiarch/memset_chk.c. */ IFUNC_IMPL (i, name, __memset_chk, IFUNC_IMPL_ADD (array, i, __memset_chk, 1, @@ -145,6 +148,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, HAS_ARCH_FEATURE (AVX512F_Usable), __memset_chk_avx512_no_vzeroupper) ) +#endif /* Support sysdeps/x86_64/multiarch/memset.c. */ IFUNC_IMPL (i, name, memset, |