From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 3F9073858293; Mon, 22 Jan 2024 13:28:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F9073858293 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1705930116; bh=FRy17gSTbv/MdQ4snSXKv7LTCUg6G/BD+Rv4fV9HnZg=; h=From:To:Subject:Date:From; b=tLMDp7T7laJT9MVDKnoL35vrSo7QrQmeVe0dIDcECTnE3h2jVRU38RwSxZvGqX19P w2cnT/MT266S5T5VHIOb1s/KEh5AXhtuCk7IRhvfj0UIbSMDX7KSxQbJ0Uvt88AmTt kGDJ7gT0dH0CNVj2QIq8z/+fh7Ktq3a75+RpZtC8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] sh: Fix static build with --enable-fortify X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 926a4bdbb5fc8955570208b5571b2d04c6ffbd1d X-Git-Newrev: bcf2abd43bbe6ffdd8b6a1e1e36cc67a9769e508 Message-Id: <20240122132836.3F9073858293@sourceware.org> Date: Mon, 22 Jan 2024 13:28:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bcf2abd43bbe6ffdd8b6a1e1e36cc67a9769e508 commit bcf2abd43bbe6ffdd8b6a1e1e36cc67a9769e508 Author: Adhemerval Zanella Date: Tue Jan 16 13:07:47 2024 -0300 sh: Fix static build with --enable-fortify For static the internal symbols should not be prepended with the internal __GI_. Checked with a make check for sh4-linux-gnu. Diff: --- sysdeps/unix/sysv/linux/sh/____longjmp_chk.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S index ede6551bcc..f61db0bc63 100644 --- a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S @@ -53,7 +53,7 @@ longjmp_msg: .Lstr: \ .long longjmp_msg@GOTOFF; \ .Lfail: \ - .long __GI___fortify_fail@PLT-(.Lfail0-.); \ + .long HIDDEN_JUMPTARGET(__fortify_fail)@PLT-(.Lfail0-.); \ cfi_restore_state; #else # define CALL_FAIL \ @@ -70,7 +70,7 @@ longjmp_msg: .Lstr: \ .long longjmp_msg; \ .Lfail: \ - .long __fortify_fail; \ + .long HIDDEN_JUMPTARGET(__fortify_fail); \ cfi_restore_state; #endif