diff options
| author |   Sam James <sam@gentoo.org> | 2024-05-04 13:28:51 +0100 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-05-04 14:36:13 +0200 |
| commit | a8b978125733c21199521993f6686063a6e5a3fe (patch) | |
| tree | ffeb1f3033c5a80d282b6060a3f2dade8386571a | |
| parent | Revert "Add a test to check for duplicate definitions in the static library" (diff) | |
| download | glibc-a8b978125733c21199521993f6686063a6e5a3fe.tar.gz glibc-a8b978125733c21199521993f6686063a6e5a3fe.tar.bz2 glibc-a8b978125733c21199521993f6686063a6e5a3fe.zip | |
Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk"
This reverts commit ad92c483a4bd34db1cfb3eb625212ea64848244f.
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 c16871e662cd0f3370173d916864b19e69f1bc9a)
| -rw-r--r-- | sysdeps/i386/i686/memmove.S | 2 | ||||
| -rw-r--r-- | sysdeps/i386/i686/memset.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S index effd958120..f230359ad6 100644 --- a/sysdeps/i386/i686/memmove.S +++ b/sysdeps/i386/i686/memmove.S @@ -29,7 +29,7 @@ #define SRC DEST+4 #define LEN SRC+4 -#if defined SHARED && IS_IN (libc) +#if defined PIC && IS_IN (libc) ENTRY_CHK (__memmove_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S index ab06771ea0..f02f5a6df7 100644 --- a/sysdeps/i386/i686/memset.S +++ b/sysdeps/i386/i686/memset.S @@ -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) |