7 files changed, 2 insertions, 46 deletions

diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index e0d993221e7e..664498126f13 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -40,13 +40,8 @@ __FBSDID("$FreeBSD$");
 #include "utxdb.h"
 #include "un-namespace.h"
 
-#ifdef __NO_TLS
-static FILE *uf = NULL;
-static int udb;
-#else
 static _Thread_local FILE *uf = NULL;
 static _Thread_local int udb;
-#endif
 
 int
 setutxdb(int db, const char *file)
diff --git a/lib/libc/gen/utxdb.c b/lib/libc/gen/utxdb.c
index f8dea105702c..3edccdbd2c2f 100644
--- a/lib/libc/gen/utxdb.c
+++ b/lib/libc/gen/utxdb.c
@@ -128,11 +128,7 @@ utx_to_futx(const struct utmpx *ut, struct futx *fu)
 struct utmpx *
 futx_to_utx(const struct futx *fu)
 {
-#ifdef __NO_TLS
-	static struct utmpx *ut;
-#else
 	static _Thread_local struct utmpx *ut;
-#endif
 
 	if (ut == NULL) {
 		ut = calloc(1, sizeof *ut);
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 2e6fed9466e4..551d32b7ab6a 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -56,12 +56,10 @@ __FBSDID("$FreeBSD$");
 
 #undef _CurrentRuneLocale
 extern _RuneLocale const *_CurrentRuneLocale;
-#ifndef __NO_TLS
 /*
  * A cached version of the runes for this thread.  Used by ctype.h
  */
 _Thread_local const _RuneLocale *_ThreadRuneLocale;
-#endif
 
 extern int __mb_sb_limit;
 
@@ -199,7 +197,6 @@ __wrap_setrunelocale(const char *locale)
 	return (_LDP_LOADED);
 }
 
-#ifndef __NO_TLS
 void
 __set_thread_rune_locale(locale_t loc)
 {
@@ -212,7 +209,6 @@ __set_thread_rune_locale(locale_t loc)
 		_ThreadRuneLocale = XLOCALE_CTYPE(loc)->runes;
 	}
 }
-#endif
 
 void *
 __ctype_load(const char *locale, locale_t unused __unused)
diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c
index fb674f86bbff..d64262da809e 100644
--- a/lib/libc/locale/xlocale.c
+++ b/lib/libc/locale/xlocale.c
@@ -55,12 +55,11 @@ extern struct xlocale_component __xlocale_global_messages;
 extern struct xlocale_component __xlocale_C_collate;
 extern struct xlocale_component __xlocale_C_ctype;
 
-#ifndef __NO_TLS
 /*
  * The locale for this thread.
  */
 _Thread_local locale_t __thread_locale;
-#endif
+
 /*
  * Flag indicating that one or more per-thread locales exist.
  */
@@ -143,16 +142,6 @@ get_thread_locale(void)
 		pthread_getspecific(locale_info_key));
 }
 
-#ifdef __NO_TLS
-locale_t
-__get_locale(void)
-{
-	locale_t l = get_thread_locale();
-	return (l ? l : &__xlocale_global_locale);
-
-}
-#endif
-
 static void
 set_thread_locale(locale_t loc)
 {
@@ -172,10 +161,8 @@ set_thread_locale(locale_t loc)
 	} else {
 		pthread_setspecific(locale_info_key, l);
 	}
-#ifndef __NO_TLS
 	__thread_locale = l;
 	__set_thread_rune_locale(loc);
-#endif
 }
 
 /**
diff --git a/lib/libc/locale/xlocale_private.h b/lib/libc/locale/xlocale_private.h
index 391e375bc03d..bc40f28fc9eb 100644
--- a/lib/libc/locale/xlocale_private.h
+++ b/lib/libc/locale/xlocale_private.h
@@ -185,7 +185,7 @@ void __set_thread_rune_locale(locale_t loc);
  * locale has ever been set, then we always use the global locale.
  */
 extern int __has_thread_locale;
-#ifndef __NO_TLS
+
 /**
  * The per-thread locale.  Avoids the need to use pthread lookup functions when
  * getting the per-thread locale.
@@ -206,9 +206,6 @@ static inline locale_t __get_locale(void)
 	}
 	return (__thread_locale ? __thread_locale : &__xlocale_global_locale);
 }
-#else
-locale_t __get_locale(void);
-#endif
 
 /**
  * Two magic values are allowed for locale_t objects.  NULL and -1.  This
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index 11b9701d968f..bb685e4f7dc9 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -128,16 +128,11 @@ strerror_r(int errnum, char *strerrbuf, size_t buflen)
 char *
 strerror_l(int num, locale_t locale)
 {
-#ifndef __NO_TLS
 	static _Thread_local char ebuf[NL_TEXTMAX];
 
 	if (strerror_rl(num, ebuf, sizeof(ebuf), locale) != 0)
 		errno = EINVAL;
 	return (ebuf);
-#else
-	errno = ENOTSUP;
-	return (NULL);
-#endif
 }
 
 char *
diff --git a/lib/libgssapi/gss_display_status.c b/lib/libgssapi/gss_display_status.c
index 55ca83ce9aa8..d0c3453a0d6b 100644
--- a/lib/libgssapi/gss_display_status.c
+++ b/lib/libgssapi/gss_display_status.c
@@ -174,16 +174,6 @@ supplementary_error(OM_uint32 v)
 	return msgs[v];
 }
 
-#if defined(__NO_TLS)
-
-/*
- * These platforms don't support TLS on FreeBSD - threads will just
- * have to step on each other's error values for now.
- */
-#define __thread
-
-#endif
-
 struct mg_thread_ctx {
     gss_OID mech;
     OM_uint32 maj_stat;