From d39fe6c9fbb3296ce58cd3625cd51c02ef678dae Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 29 Sep 2025 17:08:51 -0600
Subject: [PATCH] Make sure TLS modules are aligned to 16 bytes for SSE

---
 src/ld_so/dso.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ld_so/dso.rs b/src/ld_so/dso.rs
index b1639de7ab..ad242104a7 100644
--- a/src/ld_so/dso.rs
+++ b/src/ld_so/dso.rs
@@ -604,7 +604,8 @@ impl DSO {
                     tcb_master = Some(Master {
                         ptr,
                         len: ph.p_filesz(endian) as usize,
-                        offset: tls_offset + vsize,
+                        //TODO: TLS is aligned manually to 16 bytes for SSE instruction safety
+                        offset: tls_offset + vsize.next_multiple_of(16),
                     });
                     trace!("  tcb master {:x?}", tcb_master);
                 }