public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] sh: Fix static build with --enable-fortify
@ 2024-01-16 16:54 Adhemerval Zanella
  2024-01-22 13:04 ` Adhemerval Zanella Netto
  0 siblings, 1 reply; 3+ messages in thread
From: Adhemerval Zanella @ 2024-01-16 16:54 UTC (permalink / raw)
  To: libc-alpha

For static the internal symbols should not be prepended with the
internal __GI_.

Checked with a make check for sh4-linux-gnu.
---
 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
 
-- 
2.34.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sh: Fix static build with --enable-fortify
  2024-01-16 16:54 [PATCH] sh: Fix static build with --enable-fortify Adhemerval Zanella
@ 2024-01-22 13:04 ` Adhemerval Zanella Netto
  2024-01-22 14:46   ` Andreas K. Huettel
  0 siblings, 1 reply; 3+ messages in thread
From: Adhemerval Zanella Netto @ 2024-01-22 13:04 UTC (permalink / raw)
  To: libc-alpha



On 16/01/24 13:54, Adhemerval Zanella wrote:
> For static the internal symbols should not be prepended with the
> internal __GI_.
> 
> Checked with a make check for sh4-linux-gnu.

I will commit this shortly if no one opposes it.

> ---
>  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
>  

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sh: Fix static build with --enable-fortify
  2024-01-22 13:04 ` Adhemerval Zanella Netto
@ 2024-01-22 14:46   ` Andreas K. Huettel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Huettel @ 2024-01-22 14:46 UTC (permalink / raw)
  To: libc-alpha

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Am Montag, 22. Januar 2024, 14:04:32 CET schrieb Adhemerval Zanella Netto:
> 
> On 16/01/24 13:54, Adhemerval Zanella wrote:
> > For static the internal symbols should not be prepended with the
> > internal __GI_.
> > 
> > Checked with a make check for sh4-linux-gnu.
> 
> I will commit this shortly if no one opposes it.
> 
please do

-- 
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer
(council, toolchain, base-system, perl, libreoffice)

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-01-22 14:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-16 16:54 [PATCH] sh: Fix static build with --enable-fortify Adhemerval Zanella
2024-01-22 13:04 ` Adhemerval Zanella Netto
2024-01-22 14:46   ` Andreas K. Huettel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).