32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
|
|
Status: Not fixed upstream
|
|
|
|
diff --git meson.build meson.build
|
|
index d228de0..972cd79 100644
|
|
--- meson.build
|
|
+++ meson.build
|
|
@@ -392,7 +392,8 @@ 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 not ['windows', 'freebsd'].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'].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'
|
|
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'
|
|
+)
|