From: Andreas Schwab <schwab@suse.de>
Date: Wed, 12 Jul 2023 09:29:34 +0000 (+0200)
Subject: i386: make debug wrappers compatible with static PIE
X-Git-Tag: upstream/2.39~595
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca230f5833d699a35778f83b3ab646ba37f6f66c;p=platform%2Fupstream%2Fglibc.git

i386: make debug wrappers compatible with static PIE

Static PIE requires the use of PLT relocation.
---

diff --git a/sysdeps/i386/memcpy_chk.S b/sysdeps/i386/memcpy_chk.S
index 7b12c12aba..1676de4fff 100644
--- a/sysdeps/i386/memcpy_chk.S
+++ b/sysdeps/i386/memcpy_chk.S
@@ -28,8 +28,8 @@
 ENTRY (__memcpy_chk)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
-	jb	__chk_fail
-	jmp	memcpy
+	jb	HIDDEN_JUMPTARGET (__chk_fail)
+	jmp	JUMPTARGET (memcpy)
 END (__memcpy_chk)
 libc_hidden_builtin_def (__memcpy_chk)
 #endif
diff --git a/sysdeps/i386/memmove_chk.S b/sysdeps/i386/memmove_chk.S
index 604aea8305..785b27373b 100644
--- a/sysdeps/i386/memmove_chk.S
+++ b/sysdeps/i386/memmove_chk.S
@@ -27,8 +27,8 @@
 ENTRY (__memmove_chk)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
-	jb	__chk_fail
-	jmp	memmove
+	jb	HIDDEN_JUMPTARGET (__chk_fail)
+	jmp	JUMPTARGET (memmove)
 END (__memmove_chk)
 libc_hidden_builtin_def (MEMMOVE_CHK)
 #endif
diff --git a/sysdeps/i386/mempcpy_chk.S b/sysdeps/i386/mempcpy_chk.S
index 276eab1e8a..f58ca96e16 100644
--- a/sysdeps/i386/mempcpy_chk.S
+++ b/sysdeps/i386/mempcpy_chk.S
@@ -27,8 +27,8 @@
 ENTRY (__mempcpy_chk)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
-	jb	__chk_fail
-	jmp	__mempcpy
+	jb	HIDDEN_JUMPTARGET (__chk_fail)
+	jmp	HIDDEN_JUMPTARGET (__mempcpy)
 END (__mempcpy_chk)
 libc_hidden_builtin_def (__mempcpy_chk)
 #endif
diff --git a/sysdeps/i386/memset_chk.S b/sysdeps/i386/memset_chk.S
index a2e9208e1c..9901ca6d52 100644
--- a/sysdeps/i386/memset_chk.S
+++ b/sysdeps/i386/memset_chk.S
@@ -27,8 +27,8 @@
 ENTRY (__memset_chk)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
-	jb	__chk_fail
-	jmp	memset
+	jb	HIDDEN_JUMPTARGET (__chk_fail)
+	jmp	JUMPTARGET (memset)
 END (__memset_chk)
 libc_hidden_builtin_def (__memset_chk)
 #endif