blob: df2346d3362e870d0a1dae3e6ba0ee5bd3eac1cc [file] [log] [blame]
Andrew Geissler95ac1b82021-03-31 14:34:31 -05001From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 13:08:31 -0800
Brad Bishop6dbb3162019-11-25 09:41:34 -05004Subject: [PATCH] meson.build: make TLS ELF optional
5
6USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
7TLS GLX optional again" patch updated to the latest mesa.
8
Andrew Geisslerd1e89492021-02-12 15:35:20 -06009For details, see:
10https://gitlab.freedesktop.org/mesa/mesa/-/issues/966
11
12This prevents runtime segfault on musl:
13
14Traceback (most recent call last):
15 File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f
16 return func(*args, **kwargs)
17 File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs
18 self.assertEqual(errcount, 0, msg=self.msg)
19AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log
20-----------------------
21Central error: [ 10.477] (EE) Failed to load /usr/lib/xorg/modules/extensions/libglx.so: Error relocating /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic definition in /usr/lib/libGL.so.1
22***********************
23
Brad Bishop6dbb3162019-11-25 09:41:34 -050024Upstream-Status: Inappropriate [configuration]
Andrew Geissler82c905d2020-04-13 13:39:40 -050025Signed-off-by: Alistair Francis <alistair@alistair23.me>
Brad Bishop6dbb3162019-11-25 09:41:34 -050026
27---
28 meson.build | 2 +-
29 meson_options.txt | 6 ++++++
30 2 files changed, 7 insertions(+), 1 deletion(-)
31
32diff --git a/meson.build b/meson.build
Andrew Geissler95ac1b82021-03-31 14:34:31 -050033index efc6171..8450968 100644
Brad Bishop6dbb3162019-11-25 09:41:34 -050034--- a/meson.build
35+++ b/meson.build
Andrew Geissler95ac1b82021-03-31 14:34:31 -050036@@ -448,7 +448,7 @@ endif
Brad Bishop6dbb3162019-11-25 09:41:34 -050037
38 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
Andrew Geissler6ce62a22020-11-30 19:58:47 -060039 use_elf_tls = false
Andrew Geissler95ac1b82021-03-31 14:34:31 -050040-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
41+if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
Brad Bishop6dbb3162019-11-25 09:41:34 -050042 pre_args += '-DUSE_ELF_TLS'
Andrew Geissler6ce62a22020-11-30 19:58:47 -060043 use_elf_tls = true
Brad Bishop6dbb3162019-11-25 09:41:34 -050044 endif
Brad Bishop6dbb3162019-11-25 09:41:34 -050045diff --git a/meson_options.txt b/meson_options.txt
Andrew Geissler95ac1b82021-03-31 14:34:31 -050046index fc73f6e..d7482c0 100644
Brad Bishop6dbb3162019-11-25 09:41:34 -050047--- a/meson_options.txt
48+++ b/meson_options.txt
Andrew Geissler95ac1b82021-03-31 14:34:31 -050049@@ -420,6 +420,12 @@ option(
Brad Bishop6dbb3162019-11-25 09:41:34 -050050 value : true,
51 description : 'Enable direct rendering in GLX and EGL for DRI',
52 )
53+option(
54+ 'elf-tls',
55+ type : 'boolean',
56+ value : true,
57+ description : 'Enable TLS support in ELF',
58+)
59 option(
Andrew Geissler475cb722020-07-10 16:00:51 -050060 'prefer-iris',
Brad Bishop6dbb3162019-11-25 09:41:34 -050061 type : 'boolean',