blob: 803fa3707a3b5c7d09defdecf4d20494ba9f9616 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
--- mesa-21.3.8/meson.build.old 2022-03-18 14:26:47.000000000 -0500
+++ mesa-21.3.8/meson.build 2022-05-30 00:00:21.689085198 -0500
@@ -508,22 +508,7 @@
error('-Degl-native-platform does not specify an enabled platform')
endif
-# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
use_elf_tls = false
-if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
- (not with_platform_android or get_option('platform-sdk-version') >= 29) and
- (not with_platform_windows or not with_shared_glapi))
- pre_args += '-DUSE_ELF_TLS'
- use_elf_tls = true
-
- if with_platform_android
- # By default the NDK compiler, at least, emits emutls references instead of
- # ELF TLS, even when building targeting newer API levels. Make it actually do
- # ELF TLS instead.
- c_args += '-fno-emulated-tls'
- cpp_args += '-fno-emulated-tls'
- endif
-endif
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
|
