Skip to content

Commit 86edcb5

Browse files
fda0igcbot
authored andcommitted
Fix Vulkan Frontend symbol exporting in Linux builds
Previous change d4ba7fb restricted which symbols are exported by libigc.so. This commits adds symbols from Vulkan Frontend component to the exported symbols list.
1 parent 9fa575d commit 86edcb5

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

IGC/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,7 @@ if(UNIX)
15031503
set(IGC_BUILD__PROJ_BIF_LIBRARY_NAME "null")
15041504
set(IGC_BUILD__PROJ_DX10_LIBRARY_NAME "null")
15051505
set(IGC_BUILD__PROJ_DXIL_LIBRARY_NAME "null")
1506+
set(IGC_BUILD__PROJ_VULKAN_FE_LIBRARY_NAME "null")
15061507

15071508
endif()
15081509

@@ -1715,10 +1716,14 @@ if(UNIX)
17151716
set(IGC_BUILD__PROJ_BIF_LIBRARY_NAME "$<TARGET_FILE:${IGC_BUILD__PROJ__BiFLib_OCL}>")
17161717
endif()
17171718

1719+
if(TARGET ${IGC_BUILD__PROJ__VulkanFrontend})
1720+
set(IGC_BUILD__PROJ_VULKAN_FE_LIBRARY_NAME "$<TARGET_FILE:${IGC_BUILD__PROJ__VulkanFrontend}>")
1721+
endif()
1722+
17181723
add_custom_command(
17191724
TARGET "${IGC_BUILD__PROJ__igc_dll}"
17201725
PRE_LINK
1721-
COMMAND ${IGC_BUILD__PROJ_SYMBOL_SCRIPT_COPY_PATH} ${IGC_BUILD__PROJ_LINKER_SCRIPT_NAME} ${IGC_BUILD__PROJ_BIF_LIBRARY_NAME} ${IGC_BUILD__PROJ_DX10_LIBRARY_NAME} ${IGC_BUILD__PROJ_DXIL_LIBRARY_NAME} $<TARGET_OBJECTS:${IGC_BUILD__PROJ__igc_dll}> --
1726+
COMMAND ${IGC_BUILD__PROJ_SYMBOL_SCRIPT_COPY_PATH} ${IGC_BUILD__PROJ_LINKER_SCRIPT_NAME} ${IGC_BUILD__PROJ_BIF_LIBRARY_NAME} ${IGC_BUILD__PROJ_DX10_LIBRARY_NAME} ${IGC_BUILD__PROJ_DXIL_LIBRARY_NAME} ${IGC_BUILD__PROJ_VULKAN_FE_LIBRARY_NAME} $<TARGET_OBJECTS:${IGC_BUILD__PROJ__igc_dll}> --
17221727
COMMAND_EXPAND_LISTS
17231728
COMMENT "Creating linker script for custom symbol exporting"
17241729
)

IGC/Scripts/igc_create_linker_script.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ readonly LINKER_SCRIPT=$1
1010
readonly BIF_LIBRARY=$2
1111
readonly DX10_LIBRARY=$3
1212
readonly DXIL_LIBRARY=$4
13+
readonly VULKAN_FE_LIBRARY=$5
1314

1415
shift
1516

@@ -32,6 +33,17 @@ if [[ "$BIF_LIBRARY" != "null" ]]; then
3233
formatAndWriteSymbols "$symbolsBIF"
3334
fi
3435

36+
if [[ "$VULKAN_FE_LIBRARY" != "null" ]]; then
37+
symbolsVFE=$(objdump -t $VULKAN_FE_LIBRARY | grep " F " | grep " g " | grep -v hidden)
38+
formatAndWriteSymbols "$symbolsVFE"
39+
40+
symbolsVFE=$(objdump -t $VULKAN_FE_LIBRARY | grep " w " | grep -v hidden)
41+
formatAndWriteSymbols "$symbolsVFE"
42+
43+
symbolsVFE=$(objdump -t $VULKAN_FE_LIBRARY | grep " W " | grep -v hidden)
44+
formatAndWriteSymbols "$symbolsVFE"
45+
fi
46+
3547
for obj_file in "$@"; do
3648
if [[ $obj_file == *.o ]]; then
3749
symbols=$(objdump -t $obj_file | grep " F " | grep " g " | grep -v hidden)

0 commit comments

Comments
 (0)