From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sun, 19 Sep 2021 18:46:59 +0000 (+0100)
Subject: local-tls-ie-align
X-Git-Tag: archive/raspbian/2.32-4+rpi1~1^2~53
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38f21cbc9ef833d461df0a81d8ae261638aed90c;p=glibc.git

local-tls-ie-align

The elf/tst-tls-ie* tests try to load modules with 8-byte-aligned TLS data that
will get allocated in the static TLS area, so we need at least 8-byte alignment.
8-byte alignment requirement is not that uncommon on i386 anyway.

And upstream happens to have 32-byte alignment from
0c76fc3c2b34 ('Linux: Perform rseq registration at C startup and thread
creation') which just rounds up max_align to 32 anyway.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name local-tls-ie-align.diff
---

diff --git a/sysdeps/mach/hurd/tls.h b/sysdeps/mach/hurd/tls.h
index a0d70c202..40685828b 100644
--- a/sysdeps/mach/hurd/tls.h
+++ b/sysdeps/mach/hurd/tls.h
@@ -25,6 +25,7 @@
 # include <stdint.h>
 # include <stdbool.h>
 # include <sysdep.h>
+# include <sys/param.h>
 # include <mach/mig_errors.h>
 # include <mach.h>
 # include <atomic.h>
@@ -34,7 +35,7 @@
 # define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
 
 /* Alignment requirements for the initial TCB.  */
-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+# define TLS_INIT_TCB_ALIGN MAX(__alignof__ (tcbhead_t), 8)
 
 /* This is the size of the TCB.  */
 # define TLS_TCB_SIZE TLS_INIT_TCB_SIZE	/* XXX */