From 86ba53b592aca0dd7928f7fe5d706db385fcf6cf Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 2 Sep 2020 15:28:50 -0500 Subject: [PATCH] meson.build: make TLS ELF optional USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make TLS GLX optional again" patch updated to the latest mesa. Upstream-Status: Inappropriate [configuration] Signed-off-by: Alistair Francis --- meson.build | 2 +- meson_options.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 08a4793b63e..70962fbb3f4 100644 --- a/meson.build +++ b/meson.build @@ -450,7 +450,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. use_elf_tls = false -if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) +if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git a/meson_options.txt b/meson_options.txt index 6810602ead9..057e3bebe32 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -414,6 +414,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) +option( + 'elf-tls', + type : 'boolean', + value : true, + description : 'Enable TLS support in ELF', +) option( 'prefer-iris', type : 'boolean',