[patch] patch

0001-gallium-Fix-link-with-LLD-17.patch (text/plain), 2.80 KB, created by Violet Purcell on 2023-10-01 21:54:46 UTC

From e1322acbb78e1b3983d83c749d603870002f22b6 Mon Sep 17 00:00:00 2001
From: Violet Purcell <[e-mail]>
Date: Sun, 1 Oct 2023 17:35:00 -0400
Subject: [PATCH] gallium: Fix link with LLD 17

Signed-off-by: Violet Purcell <[e-mail]>
---
 src/gallium/targets/dri/dri.sym     | 12 ------------
 src/gallium/targets/dri/dri.sym.in  | 11 +++++++++++
 src/gallium/targets/dri/meson.build | 20 ++++++++++++++++++--
 3 files changed, 29 insertions(+), 14 deletions(-)
 delete mode 100644 src/gallium/targets/dri/dri.sym
 create mode 100644 src/gallium/targets/dri/dri.sym.in

diff --git a/src/gallium/targets/dri/dri.sym b/src/gallium/targets/dri/dri.sym
deleted file mode 100644
index d4ffb588e05..00000000000
--- a/src/gallium/targets/dri/dri.sym
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	global:
-		__driDriverExtensions;
-		__driDriverGetExtensions*;
-		nouveau_drm_screen_create;
-		radeon_drm_winsys_create;
-		amdgpu_winsys_create;
-		fd_drm_screen_create_renderonly;
-		ac_init_shared_llvm_once;
-	local:
-		*;
-};
diff --git a/src/gallium/targets/dri/dri.sym.in b/src/gallium/targets/dri/dri.sym.in
new file mode 100644
index 00000000000..b43cf80020d
--- /dev/null
+++ b/src/gallium/targets/dri/dri.sym.in
@@ -0,0 +1,11 @@
+{
+	global:
+		__driDriverGetExtensions*;
+		@nouveau_drm_screen_create@
+		@radeon_drm_winsys_create@
+		@amdgpu_winsys_create@
+		@fd_drm_screen_create_renderonly@
+		@ac_init_shared_llvm_once@
+	local:
+		*;
+};
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 66619bba0db..fdecf08e35b 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -28,9 +28,25 @@ gallium_dri_ld_args = []
 gallium_dri_link_depends = []
 gallium_dri_drivers = []
 
+dri_sym_config = configuration_data()
+
+foreach d : [[with_gallium_r300 or with_gallium_radeonsi or with_gallium_r600, 'radeon_drm_winsys_create'],
+             [with_gallium_radeonsi, 'amdgpu_winsys_create'],
+             [with_gallium_nouveau, 'nouveau_drm_screen_create'],
+             [with_gallium_freedreno, 'fd_drm_screen_create_renderonly'],
+             [with_llvm, 'ac_init_shared_llvm_once']]
+  if d[0]
+    dri_sym_config.set(d[1], d[1] + ';')
+  else
+    dri_sym_config.set(d[1], '')
+  endif
+endforeach
+
+dri_sym = configure_file(input : 'dri.sym.in', output : 'dri.sym', configuration : dri_sym_config)
+
 if with_ld_version_script
-  gallium_dri_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'dri.sym')]
-  gallium_dri_link_depends += files('dri.sym')
+  gallium_dri_ld_args += ['-Wl,--version-script', join_paths(meson.current_build_dir(), 'dri.sym')]
+  gallium_dri_link_depends += dri_sym
 endif
 if with_ld_dynamic_list
   gallium_dri_ld_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri.dyn')]
-- 
2.42.0