From 8b06537d92e3ab59694453154f17f51cce594cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sun, 11 Oct 2026 09:21:19 +0200
Subject: [PATCH] compiler_rt.elf.tls: fix AbiTcb for arc and csky

Also simplify the logic since it turns out to really just depend on the variant.
---
 lib/compiler_rt/elf/tls.zig | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/lib/compiler_rt/elf/tls.zig b/lib/compiler_rt/elf/tls.zig
index 75dda8d300ec7e079979528af638fdc3e8e90347..fd1bdb381d7eca0a038c967bdb48c0fff10cbec5 100644
--- a/lib/compiler_rt/elf/tls.zig
+++ b/lib/compiler_rt/elf/tls.zig
@@ -158,30 +158,12 @@ const current_dtv_offset = switch (native_arch) {
 
 /// Per-thread storage for the ELF TLS ABI.
 const AbiTcb = switch (current_variant) {
-    .I_original, .I_modified => switch (native_arch) {
-        .aarch64,
-        .aarch64_be,
-        .alpha,
-        .arm,
-        .armeb,
-        .hppa,
-        .microblaze,
-        .microblazeel,
-        .sh,
-        .sheb,
-        .thumb,
-        .thumbeb,
-        .xtensa,
-        .xtensaeb,
-        => extern struct {
-            /// This is offset by `current_dtv_offset`.
-            dtv: usize,
-            _reserved: ?*anyopaque,
-        },
-        else => extern struct {
-            /// This is offset by `current_dtv_offset`.
-            dtv: usize,
-        },
+    .I_original => extern struct {
+        dtv: usize,
+        _reserved: ?*anyopaque,
+    },
+    .I_modified => extern struct {
+        dtv: usize,
     },
     .II => extern struct {
         /// This is self-referential.
-- 
2.54.0