Mesa (master): meson: Do not enable USE_ELF_TLS for FreeBSD

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 2 01:22:41 UTC 2020


Module: Mesa
Branch: master
Commit: 708db983dd08984b0cade15be576497661ef154c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=708db983dd08984b0cade15be576497661ef154c

Author: Emmanuel <manu at FreeBSD.org>
Date:   Fri Jan 24 22:31:47 2020 +0100

meson: Do not enable USE_ELF_TLS for FreeBSD

Compiling with this option result in too much TLS usage and FreeBSD
cannot handle that.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Signed-off-by: Emmanuel <manu at FreeBSD.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3559>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 60c50c21dc1..7d0373f3753 100644
--- a/meson.build
+++ b/meson.build
@@ -422,7 +422,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
 endif
 
 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
   pre_args += '-DUSE_ELF_TLS'
 endif
 



More information about the mesa-commit mailing list