diff options
| author | Sam James <sam@gentoo.org> | 2024-05-04 13:28:54 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-05-04 13:28:54 +0100 |
| commit | 5141d4d83c17406f0eaea3e345ef2b52e10f386e (patch) | |
| tree | e4327fc30bb2f980f58d4f983384bbebfa6aa86b /sysdeps | |
| parent | c16871e662cd0f3370173d916864b19e69f1bc9a (diff) | |
| download | glibc-5141d4d83c17406f0eaea3e345ef2b52e10f386e.tar.gz glibc-5141d4d83c17406f0eaea3e345ef2b52e10f386e.tar.xz glibc-5141d4d83c17406f0eaea3e345ef2b52e10f386e.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>
Diffstat (limited to 'sysdeps')
| -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) |