From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 802203858D20; Wed, 12 Jul 2023 12:38:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 802203858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689165528; bh=eBPol9/kthIAYl5BoFyw/ahVSX6ck42bbwBSihMAm2k=; h=From:To:Subject:Date:From; b=FO8Tc5Dw5zNhrrGu5YIuzneB7M6StvBmZ7/wwbwww+OrlkxPCRTs4PeYgVy1M+F9S 22JHEFWKs0GD7iKiBnkd6uvYxYoJUhEx7iQGzxxqAszrB/Hlusu4tHf+CqAsseABEZ m5BrSclThHuXchnaL3fats4gVzHwSKy7TiWq3hLY= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc] i386: make debug wrappers compatible with static PIE X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/master X-Git-Oldrev: 0e1324e655f3ba9fd3f8ad24678b93b35eee2618 X-Git-Newrev: ca230f5833d699a35778f83b3ab646ba37f6f66c Message-Id: <20230712123848.802203858D20@sourceware.org> Date: Wed, 12 Jul 2023 12:38:48 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ca230f5833d699a35778f83b3ab646ba37f6f66c commit ca230f5833d699a35778f83b3ab646ba37f6f66c Author: Andreas Schwab Date: Wed Jul 12 11:29:34 2023 +0200 i386: make debug wrappers compatible with static PIE Static PIE requires the use of PLT relocation. Diff: --- sysdeps/i386/memcpy_chk.S | 4 ++-- sysdeps/i386/memmove_chk.S | 4 ++-- sysdeps/i386/mempcpy_chk.S | 4 ++-- sysdeps/i386/memset_chk.S | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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