about summary refs log tree commit diff
path: root/sysdeps/i386/i686/multiarch/memset-ia32.S
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2023-07-25 12:16:39 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-07-26 09:45:55 -0300
commit0b1a76c57782a03685f405ee53e6d5f691d69298 (patch)
tree2b4e25d11310bd11ffef16b6303d3de16af9ebad /sysdeps/i386/i686/multiarch/memset-ia32.S
parentf8f9a272573a4074c5b13ec69522945695d5d3f2 (diff)
downloadglibc-0b1a76c57782a03685f405ee53e6d5f691d69298.tar.gz
glibc-0b1a76c57782a03685f405ee53e6d5f691d69298.tar.xz
glibc-0b1a76c57782a03685f405ee53e6d5f691d69298.zip
i386: Remove memset_chk-nonshared.S
Similar to memcpy, mempcpy, and memmove there is no need for an
specific memset_chk-nonshared.S.  It can be provided by
memset-ia32.S itself for static library.

Checked on i686-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/i386/i686/multiarch/memset-ia32.S')
-rw-r--r--sysdeps/i386/i686/multiarch/memset-ia32.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/i386/i686/multiarch/memset-ia32.S b/sysdeps/i386/i686/multiarch/memset-ia32.S
index ac57e456d4..a1b3919a19 100644
--- a/sysdeps/i386/i686/multiarch/memset-ia32.S
+++ b/sysdeps/i386/i686/multiarch/memset-ia32.S
@@ -18,16 +18,17 @@
 
 #if IS_IN (libc)
 # define memset __memset_ia32
-# define __memset_chk __memset_chk_ia32
 
 # ifdef SHARED
-#  undef libc_hidden_builtin_def
+#  define __memset_chk __memset_chk_ia32
+# endif
+
+# undef libc_hidden_builtin_def
 /* IFUNC doesn't work with the hidden functions in shared library since
    they will be called without setting up EBX needed for PLT which is
    used by IFUNC.  */
-#  define libc_hidden_builtin_def(name) \
+# define libc_hidden_builtin_def(name) \
 	.globl __GI_memset; __GI_memset = memset
-# endif
 #endif
 
 #include <sysdeps/i386/i686/memset.S>