Mesa (staging/20.1): meson: Do not enable USE_ELF_TLS for FreeBSD

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: a6c29e347bf88018e8e9b8d6fba4cae1111068d0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6c29e347bf88018e8e9b8d6fba4cae1111068d0

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>
(cherry picked from commit 708db983dd08984b0cade15be576497661ef154c)

---

 .pick_status.json | 2 +-
 meson.build       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 940f11ae0a0..8c10c4234f9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -877,7 +877,7 @@
         "description": "meson: Do not enable USE_ELF_TLS for FreeBSD",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/meson.build b/meson.build
index 97de83796f3..d228de0de55 100644
--- a/meson.build
+++ b/meson.build
@@ -392,7 +392,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