blob: 91e59d14eda6379099b39b80cb1243a898c725b4 [file] [log] [blame]
Andrew Geissler475cb722020-07-10 16:00:51 -05001From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 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
9Upstream-Status: Inappropriate [configuration]
Andrew Geissler82c905d2020-04-13 13:39:40 -050010Signed-off-by: Alistair Francis <alistair@alistair23.me>
Brad Bishop6dbb3162019-11-25 09:41:34 -050011
12---
13 meson.build | 2 +-
14 meson_options.txt | 6 ++++++
15 2 files changed, 7 insertions(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
Andrew Geissler475cb722020-07-10 16:00:51 -050018index 261b588..311436e 100644
Brad Bishop6dbb3162019-11-25 09:41:34 -050019--- a/meson.build
20+++ b/meson.build
Andrew Geissler475cb722020-07-10 16:00:51 -050021@@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
Brad Bishop6dbb3162019-11-25 09:41:34 -050022 endif
23
24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
Andrew Geissler82c905d2020-04-13 13:39:40 -050025-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
Brad Bishop6dbb3162019-11-25 09:41:34 -050026+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
27 pre_args += '-DUSE_ELF_TLS'
28 endif
29
30diff --git a/meson_options.txt b/meson_options.txt
Andrew Geissler475cb722020-07-10 16:00:51 -050031index ab43150..d7b1555 100644
Brad Bishop6dbb3162019-11-25 09:41:34 -050032--- a/meson_options.txt
33+++ b/meson_options.txt
Andrew Geissler475cb722020-07-10 16:00:51 -050034@@ -355,6 +355,12 @@ option(
Brad Bishop6dbb3162019-11-25 09:41:34 -050035 value : true,
36 description : 'Enable direct rendering in GLX and EGL for DRI',
37 )
38+option(
39+ 'elf-tls',
40+ type : 'boolean',
41+ value : true,
42+ description : 'Enable TLS support in ELF',
43+)
44 option(
Andrew Geissler475cb722020-07-10 16:00:51 -050045 'prefer-iris',
Brad Bishop6dbb3162019-11-25 09:41:34 -050046 type : 'boolean',