35 lines
2.0 KiB
Diff
35 lines
2.0 KiB
Diff
|
commit 8323a83abd73446dc434aceff66219712c09140b
|
||
|
|
Author: Gabi Falk <gabifalk@gmx.com>
|
||
|
|
Date: Tue Apr 30 20:05:02 2024 +0000
|
||
|
|
|
||
|
|
i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk
|
||
|
|
|
||
|
|
/home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk':
|
||
|
|
/home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple definition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__mempcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: multiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here
|
||
|
|
|
||
|
|
After this change, the static library built for i586, regardless of PIC
|
||
|
|
options, contains implementations of these functions respectively from
|
||
|
|
sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures
|
||
|
|
that memcpy and mempcpy won't pull in __chk_fail and the routines it
|
||
|
|
calls.
|
||
|
|
|
||
|
|
Reported-by: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Signed-off-by: Gabi Falk <gabifalk@gmx.com>
|
||
|
|
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
|
||
|
|
Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>
|
||
|
|
(cherry picked from commit 0fdf4ba48ccce5abf567340b0ab8fa8ed8a9bc6e)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
|
||
|
|
index 3e26f112d685e148..79856d498af90f66 100644
|
||
|
|
--- a/sysdeps/i386/i586/memcpy.S
|
||
|
|
+++ b/sysdeps/i386/i586/memcpy.S
|
||
|
|
@@ -26,7 +26,7 @@
|
||
|
|
#define LEN SRC+4
|
||
|
|
|
||
|
|
.text
|
||
|
|
-#if defined PIC && IS_IN (libc)
|
||
|
|
+#if defined SHARED && IS_IN (libc)
|
||
|
|
ENTRY (__memcpy_chk)
|
||
|
|
movl 12(%esp), %eax
|
||
|
|
cmpl %eax, 16(%esp)
|