diff options
| author |   Sam James <sam@gentoo.org> | 2024-05-04 13:28:54 +0100 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-05-04 14:36:30 +0200 |
| commit | 54b19e9905d3e152bf685ef4eb4e9a027ebc1ea7 (patch) | |
| tree | b1a135b1b0a37c05304d6cde341e195ed10f9312 | |
| parent | Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk" (diff) | |
| download | glibc-54b19e9905d3e152bf685ef4eb4e9a027ebc1ea7.tar.gz glibc-54b19e9905d3e152bf685ef4eb4e9a027ebc1ea7.tar.bz2 glibc-54b19e9905d3e152bf685ef4eb4e9a027ebc1ea7.zip | |
Revert "i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk"
This reverts commit 3148714ab61ad61281bae5a30f530d637034ac3b.
I had the wrong cherry-pick reference (the commit content is right; it's
just referring to a base that isn't upstream), but let's revert and reapply
for clarity.
Signed-off-by: Sam James <sam@gentoo.org>
(cherry picked from commit 5141d4d83c17406f0eaea3e345ef2b52e10f386e)
| -rw-r--r-- | sysdeps/i386/i586/memcpy.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S index 79856d498a..3e26f112d6 100644 --- a/sysdeps/i386/i586/memcpy.S +++ b/sysdeps/i386/i586/memcpy.S @@ -26,7 +26,7 @@ #define LEN SRC+4 .text -#if defined SHARED && IS_IN (libc) +#if defined PIC && IS_IN (libc) ENTRY (__memcpy_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) |