Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966 Status: Not fixed upstream diff --git meson.build meson.build index 4afd8ca..ab9b365 100644 --- meson.build +++ meson.build @@ -387,7 +387,8 @@ 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) +with_use_elf_tls = get_option('use-elf-tls') +if host_machine.system() != 'windows' and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' endif diff --git meson_options.txt meson_options.txt index b768c15..2533220 100644 --- meson_options.txt +++ meson_options.txt @@ -366,3 +366,9 @@ 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' +)