Mesa (main): meson: Remove usage of use_elf_tls

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Jul 30 02:03:35 UTC 2022


Module: Mesa
Branch: main
Commit: c8d296ae4b9ce3c6f122d5dd6bd4295a7d0459bc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8d296ae4b9ce3c6f122d5dd6bd4295a7d0459bc

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Tue Jun 21 15:33:07 2022 +0800

meson: Remove usage of use_elf_tls

After c47fd3dc006 ("windows: Use TLS context/dispatch with shared-glapi")

use_elf_tls are always setting to true, so we can remove it safety

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17213>

---

 meson.build     | 1 -
 src/meson.build | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 1e9dc44bd60..8da10d9fe00 100644
--- a/meson.build
+++ b/meson.build
@@ -504,7 +504,6 @@ foreach platform : _platforms
   pre_args += '-DHAVE_ at 0@_PLATFORM'.format(platform.to_upper())
 endforeach
 
-use_elf_tls = true
 pre_args += '-DUSE_ELF_TLS'
 
 if with_platform_android and get_option('platform-sdk-version') >= 29
diff --git a/src/meson.build b/src/meson.build
index 8700088e54b..1e9a39b52df 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -152,7 +152,7 @@ if with_glx != 'disabled' and not with_glvnd
     libraries : libgl,
     libraries_private : gl_priv_libs,
     requires_private : gl_priv_reqs,
-    variables : ['glx_tls=@0@'.format(use_elf_tls ? 'yes' : 'no')],
+    variables : ['glx_tls=yes'],
   )
 endif
 



More information about the mesa-commit mailing list