Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966 Status: Not fixed upstream diff --git meson.build meson.build index 932eb13..1d1a4be 100644 --- a/meson.build +++ b/meson.build @@ -448,7 +448,8 @@ 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', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) +with_use_elf_tls = get_option('use-elf-tls') +if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git meson_options.txt meson_options.txt index fc73f6e..2d9e4a2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -445,6 +445,12 @@ option( value : 25, description : 'Android Platform SDK version. Default: Nougat version.' ) +option( + 'use-elf-tls', + type : 'boolean', + value : true, + description : 'Build support for initial-exec TLS model' +) option( 'zstd', type : 'combo',