AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-14 01:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

i386: Remove memset_chk-nonshared.S

Browse Source 
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>
This commit is contained in:
Adhemerval Zanella Netto 2023-07-25 12:16:39 -03:00 committed by Adhemerval Zanella
parent f8f9a27257
commit 0b1a76c577
4 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysdeps/i386/i686/memset.S
View File

@ -27,7 +27,7 @@
#define LEN CHR+4
.text
#if defined SHARED && IS_IN (libc)
#if defined PIC && IS_IN (libc)
ENTRY_CHK (__memset_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)

4
sysdeps/i386/i686/multiarch/Makefile
View File

@ -44,7 +44,3 @@ libm-sysdep_routines += s_fma-fma s_fmaf-fma
CFLAGS-s_fma-fma.c += -mavx -mfpmath=sse
CFLAGS-s_fmaf-fma.c += -mavx -mfpmath=sse
endif
ifeq ($(subdir),debug)
sysdep_routines += memset_chk-nonshared
endif

9
sysdeps/i386/i686/multiarch/memset-ia32.S
View File

@ -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>

21
sysdeps/i386/i686/multiarch/memset_chk-nonshared.S
View File

@ -1,21 +0,0 @@
/* Non-shared version of memset_chk for i686.
Copyright (C) 2017-2023 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#if IS_IN (libc) && !defined SHARED
# include <sysdeps/i386/memset_chk.S>
#endif