OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hasvk: add missing linker arguments

Browse Source 
vulkan_icd_link_args was added for other vulkan drivers but not hasvk.
Without it, statically linked json-c symbols are wrongly exported.

Ref: 2b1e9b0fd6 ("anv: add linker script to fix android symbols")
Fixes: 78578a6ddb ("vk: move radv's linker symbols scripts for use in all drivers")
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27540>
(cherry picked from commit fb7240bef9)
This commit is contained in:
Mark Janes
2024-01-03 12:19:49 -08:00
committed by Eric Engestrom
parent 5d81698c55
commit 37cc347118
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -2174,7 +2174,7 @@
"description": "hasvk: add missing linker arguments", "description": "hasvk: add missing linker arguments",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "78578a6ddb4a7faee3b1e20d6ba1ce34e9dd58ba", "because_sha": "78578a6ddb4a7faee3b1e20d6ba1ce34e9dd58ba",
"notes": null "notes": null

4
src/intel/vulkan_hasvk/meson.build
View File

@@ -199,7 +199,9 @@ libvulkan_intel_hasvk = shared_library(
], ],
c_args : anv_flags, c_args : anv_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], link_args : [vulkan_icd_link_args, ld_args_build_id,
ld_args_bsymbolic, ld_args_gc_sections],
link_depends : vulkan_icd_link_depends,
install : true, install : true,
) )