From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- mfbt/ThreadLocal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mfbt/ThreadLocal.h') diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h index 55c9fbcac6..891b2cdd5d 100644 --- a/mfbt/ThreadLocal.h +++ b/mfbt/ThreadLocal.h @@ -240,7 +240,7 @@ inline void ThreadLocal::set(const T aValue) { # define MOZ_THREAD_LOCAL(TYPE) \ thread_local ::mozilla::detail::ThreadLocal< \ TYPE, ::mozilla::detail::ThreadLocalNativeStorage> -#elif defined(HAVE_THREAD_TLS_KEYWORD) +#elif defined(HAVE_THREAD_TLS_KEYWORD) && !defined(MOZ_LINKER) # define MOZ_THREAD_LOCAL(TYPE) \ __thread ::mozilla::detail::ThreadLocal< \ TYPE, ::mozilla::detail::ThreadLocalNativeStorage> -- cgit v1.2.3