diff mbox series

[RFC,10/23] hurd: Only init early static TLS if it's used to store stack or pointer guards

Message ID 20240103171502.1358371-11-bugaevc@gmail.com (mailing list archive)
State Committed
Commit 4145de65f696ae06be72fadd67967be556c31ac2
Headers
Series aarch64-gnu port |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm fail Patch failed to apply
redhat-pt-bot/TryBot-still_applies warning Patch no longer applies to master

Commit Message

Sergey Bugaev Jan. 3, 2024, 5:14 p.m. UTC 
  This is the case on both x86 architectures, but not on AArch64.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
 sysdeps/mach/hurd/init-first.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Comments

Samuel Thibault Jan. 4, 2024, 10:48 p.m. UTC | #1 
Applied, thanks!

Sergey Bugaev, le mer. 03 janv. 2024 20:14:43 +0300, a ecrit:
> This is the case on both x86 architectures, but not on AArch64.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  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 85261916..26ccd37e 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
>  
> -- 
> 2.43.0
> 
>
diff mbox series

Patch

diff --git a/sysdeps/mach/hurd/init-first.c b/sysdeps/mach/hurd/init-first.c
index 85261916..26ccd37e 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