34 lines
950 B
Diff
34 lines
950 B
Diff
Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
|
|
Status: Not fixed upstream
|
|
--- a/meson.build 2022-05-02 16:58:59.796354436 -0400
|
|
+++ b/meson.build 2022-05-02 17:07:49.628310289 -0400
|
|
@@ -490,8 +490,11 @@
|
|
pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
|
|
endforeach
|
|
|
|
-use_elf_tls = true
|
|
-pre_args += '-DUSE_ELF_TLS'
|
|
+#use_elf_tls = true
|
|
+use_elf_tls = get_option('use-elf-tls')
|
|
+if use_elf_tls
|
|
+ pre_args += '-DUSE_ELF_TLS'
|
|
+endif
|
|
|
|
if with_platform_android and get_option('platform-sdk-version') >= 29
|
|
# By default the NDK compiler, at least, emits emutls references instead of
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -446,6 +446,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',
|