From c364608261d17d2d6aa0ff64085bcf908b8fb5a0 Mon Sep 17 00:00:00 2001
From: "R. Christian McDonald" <rcm@rcm.sh>
Date: Thu, 9 Nov 2023 21:22:21 +0100
Subject: [PATCH] libc: enable initial-exec (IE) as default thread-local
 storage model on arm

As suggested by jrtc27@ in https://reviews.freebsd.org/D42415, this
patch enables IE as default thread-local storage model in libc on arm.

Reviewed by:	kib
Approved by:    kp (mentor)
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D42445

(cherry picked from commit 6e5b1ff71e01bd48172483cb6df921f84300ea3a)
---
 lib/libc/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 9ea1f38d4076..5601b5432592 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -55,11 +55,7 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
 
 # Use a more efficient TLS model for libc since we can reasonably assume that
 # it will be loaded during program startup.
-.if ${LIBC_ARCH} == "aarch64" || ${LIBC_ARCH} == "amd64" || \
-    ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "riscv" || \
-    ${LIBC_ARCH:Mpowerpc*} != ""
 CFLAGS+= -ftls-model=initial-exec
-.endif
 
 #
 # Link with static libcompiler_rt.a.