diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | sysdeps/i386/i586/memset.S | 7 | ||||
| -rw-r--r-- | sysdeps/i386/i686/memset.S | 7 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/memset_chk.S | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/memset.S | 6 |
5 files changed, 13 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog index 1d336afb25..7683341150 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2017-08-04 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #21790] + * sysdeps/i386/i586/memset.S + (__memset_zero_constant_len_parameter): Removed. + * sysdeps/i386/i686/memset.S + (__memset_zero_constant_len_parameter): Likewise. + * sysdeps/i386/i686/multiarch/memset_chk.S + (__memset_zero_constant_len_parameter): Likewise. + * sysdeps/x86_64/memset.S (__memset_zero_constant_len_parameter): + Likewise. + 2017-08-03 Aurelien Jarno <aurelien@aurel32.net> * stdlib/getentropy.c (getentropy): Change return type to int. diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S index 4f8f1bcf94..a55e8c68cf 100644 --- a/sysdeps/i386/i586/memset.S +++ b/sysdeps/i386/i586/memset.S @@ -112,10 +112,3 @@ L(2): shrl $2, %ecx /* convert byte count to longword count */ ret END (memset) libc_hidden_builtin_def (memset) - -#if defined SHARED && IS_IN (libc) && !defined __memset_chk \ - && !defined USE_AS_BZERO -strong_alias (__memset_chk, __memset_zero_constant_len_parameter) - .section .gnu.warning.__memset_zero_constant_len_parameter - .string "memset used with constant zero length parameter; this could be due to transposed parameters" -#endif diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S index 24d06178d2..a29b87ba09 100644 --- a/sysdeps/i386/i686/memset.S +++ b/sysdeps/i386/i686/memset.S @@ -91,10 +91,3 @@ ENTRY (memset) ret END (memset) libc_hidden_builtin_def (memset) - -#if defined SHARED && IS_IN (libc) && !defined __memset_chk \ - && !defined USE_AS_BZERO -strong_alias (__memset_chk, __memset_zero_constant_len_parameter) - .section .gnu.warning.__memset_zero_constant_len_parameter - .string "memset used with constant zero length parameter; this could be due to transposed parameters" -#endif diff --git a/sysdeps/i386/i686/multiarch/memset_chk.S b/sysdeps/i386/i686/multiarch/memset_chk.S index 573cf4208a..0580991ce4 100644 --- a/sysdeps/i386/i686/multiarch/memset_chk.S +++ b/sysdeps/i386/i686/multiarch/memset_chk.S @@ -37,11 +37,7 @@ ENTRY(__memset_chk) 2: ret END(__memset_chk) -# ifdef SHARED -strong_alias (__memset_chk, __memset_zero_constant_len_parameter) - .section .gnu.warning.__memset_zero_constant_len_parameter - .string "memset used with constant zero length parameter; this could be due to transposed parameters" -# else +# ifndef SHARED .text .type __memset_chk_sse2, @function .p2align 4; diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S index 41278787fe..f1245aec60 100644 --- a/sysdeps/x86_64/memset.S +++ b/sysdeps/x86_64/memset.S @@ -59,9 +59,3 @@ libc_hidden_def (__wmemset) weak_alias (__wmemset, wmemset) libc_hidden_weak (wmemset) #endif - -#if defined SHARED && IS_IN (libc) && !defined USE_MULTIARCH -strong_alias (__memset_chk, __memset_zero_constant_len_parameter) - .section .gnu.warning.__memset_zero_constant_len_parameter - .string "memset used with constant zero length parameter; this could be due to transposed parameters" -#endif |