public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Only init early static TLS if it's used to store stack or pointer guards Date: Thu, 4 Jan 2024 22:49:48 +0000 (GMT) [thread overview] Message-ID: <20240104224948.5A612386F82F@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4145de65f696ae06be72fadd67967be556c31ac2 commit 4145de65f696ae06be72fadd67967be556c31ac2 Author: Sergey Bugaev <bugaevc@gmail.com> Date: Wed Jan 3 20:14:43 2024 +0300 hurd: Only init early static TLS if it's used to store stack or pointer guards This is the case on both x86 architectures, but not on AArch64. Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> Message-ID: <20240103171502.1358371-11-bugaevc@gmail.com> Diff: --- sysdeps/mach/hurd/init-first.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sysdeps/mach/hurd/init-first.c b/sysdeps/mach/hurd/init-first.c index 8526191692..26ccd37e55 100644 --- a/sysdeps/mach/hurd/init-first.c +++ b/sysdeps/mach/hurd/init-first.c @@ -38,7 +38,16 @@ extern int __libc_argc attribute_hidden; extern char **__libc_argv attribute_hidden; extern char **_dl_argv; -#ifndef SHARED +#if !defined (SHARED) && (defined (THREAD_SET_STACK_GUARD) || defined (THREAD_SET_POINTER_GUARD)) +/* In the static case, we need to set up TLS early so that the stack + protection guard can be read at from TLS by the GCC-generated snippets, + on architectures that store the guard in TLS and not globally. */ +# define USE_INIT1_TCBHEAD 1 +#else +# define USE_INIT1_TCBHEAD 0 +#endif + +#if USE_INIT1_TCBHEAD static tcbhead_t __init1_tcbhead; #endif @@ -153,9 +162,7 @@ first_init (void) /* Initialize data structures so we can do RPCs. */ __mach_init (); -#ifndef SHARED - /* In the static case, we need to set up TLS early so that the stack - protection guard can be read at from TLS by the GCC-generated snippets. */ +#if USE_INIT1_TCBHEAD _hurd_tls_init (&__init1_tcbhead, 0); #endif
reply other threads:[~2024-01-04 22:49 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240104224948.5A612386F82F@sourceware.org \ --to=sthibaul@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).