x86: Remove __memset_zero_constant_len_parameter [BZ #21790]

__memset_zero_constant_len_parameter should be removed by

commit 61062f56304750c367c5c1533351621353c112a7
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Tue Mar 1 00:35:23 2005 +0000

    2005-02-24  Roland McGrath  <roland@redhat.com>

            * debug/Versions (libc: GLIBC_2.4): Remove
            __memset_zero_constant_len_parameter.
            * sysdeps/generic/memset_chk.c: Remove alias and warning.
            * misc/sys/cdefs.h (__warndecl): New macro.
            * debug/warning-nop.c: New file.
            * string/bits/string3.h (memset): Call __warn_memset_zero_len with no
            arguments, instead of calling __memset_zero_constant_len_parameter.
            Use __warndecl for __warn_memset_zero_len.
            * debug/Makefile (routines): Add $(static-only-routines).
            (static-only-routines): New variable.

This patch removes the last emaining pieces of it.  Tested it on i586,
i686 and x86-64.

	[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.

diff --git a/ChangeLog b/ChangeLog
index 1d336afb258a2c04f5209be7fba1942df4f85571..768334115004f7d37de3ddee8bb885e31fcd2338 100644 (file)
--- 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 4f8f1bcf94d4526e2fe4c9cfeb9e23ab7fb111a9..a55e8c68cf25c4aeb67b359b4d55ab54574bb883 100644 (file)
--- 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 24d06178d2c89e5947e5a873a4fcb194c478914b..a29b87ba093260e7c28e4a4212397b0747df20c9 100644 (file)
--- 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 573cf4208a218d20d705ae1f8ac31d7131cc0a36..0580991ce4b8a2f06c2f299bd3c653dde3245352 100644 (file)
--- 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 41278787fe81f8a6d72c83e9a60ff9d974c53a45..f1245aec60b187dbf5fedf2a89ea3cd2986918b5 100644 (file)
--- 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