Skip to content

CMake bitcode dependency fix #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neboat merged 2 commits into from
Feb 25, 2026
Merged

CMake bitcode dependency fix #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779e13e
[csi] Resolve unused variable compiler warning.
neboat Feb 22, 2026
ce6b897
[cmake] When cheetah is a CMake target, add cheetah bitcode ABI file …
neboat Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions cmake/Modules/AddCilktools.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,16 @@ function(add_cilktools_runtime name type)
format_object_libs(sources_${libname} ${os} ${LIB_OBJECT_LIBS})
get_cilktools_output_dir(${CILKTOOLS_DEFAULT_TARGET_ARCH} output_dir_${libname})
get_cilktools_install_dir(${CILKTOOLS_DEFAULT_TARGET_ARCH} install_dir_${libname})
if ("-fopencilk" IN_LIST LIB_CFLAGS AND TARGET cheetah)
foreach(arch ${LIB_ARCHS_${libname}})
foreach(src ${LIB_SOURCES})
# Add the OpenCilk ABI bitcode file as a source object dependency, so that
# this library will be rebuilt if the bitcode file changes.
set_property(SOURCE ${src} APPEND PROPERTY
OBJECT_DEPENDS ${output_dir_${libname}}/libopencilk-abi_${os}-${arch}.bc)
endforeach()
endforeach()
endif()
endif()
endforeach()
else()
Expand Down Expand Up @@ -249,6 +259,14 @@ function(add_cilktools_runtime name type)
set(extra_cflags_${libname} ${TARGET_${arch}_CFLAGS} ${NO_LTO_FLAGS} ${LIB_CFLAGS})
get_cilktools_output_dir(${arch} output_dir_${libname})
get_cilktools_install_dir(${arch} install_dir_${libname})
if ("-fopencilk" IN_LIST LIB_CFLAGS AND TARGET cheetah)
foreach(src ${LIB_SOURCES})
# Add the OpenCilk ABI bitcode file as a source object dependency, so that
# this library will be rebuilt if the bitcode file changes.
set_property(SOURCE ${src} APPEND PROPERTY
OBJECT_DEPENDS ${output_dir_${libname}}/libopencilk-abi.bc)
endforeach()
endif()
endforeach()
endif()

Expand Down Expand Up @@ -434,16 +452,24 @@ function(add_cilktools_bitcode name)
if(HAS_EXTRA_CFLAGS AND NOT "${os}" MATCHES "^(osx)$")
list(REMOVE_ITEM LIB_CFLAGS "-msse3")
endif()
set(libname "${name}_${os}")
list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)
if(LIB_ARCHS_${libname})
list(APPEND libnames ${libname})
set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS} ${LIB_CFLAGS})
set(libnamebase "${name}_${os}")
list_intersect(LIB_ARCHS_${libnamebase} DARWIN_${os}_ARCHS LIB_ARCHS)
foreach(arch ${LIB_ARCHS_${libnamebase}})
set(libname "${libnamebase}-${arch}")
set(output_name_${libname} ${libname}${CILKTOOLS_OS_SUFFIX})
set(sources_${libname} ${LIB_SOURCES})
list(APPEND libnames ${libname})
set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS} ${LIB_CFLAGS})
set(${libname}_arch ${arch})
get_cilktools_output_dir(${CILKTOOLS_DEFAULT_TARGET_ARCH} output_dir_${libname})
get_cilktools_install_dir(${CILKTOOLS_DEFAULT_TARGET_ARCH} install_dir_${libname})
endif()
# Handle the dependence on cheetah specially
if ("-fopencilk" IN_LIST LIB_CFLAGS AND TARGET cheetah)
# Add the OpenCilk ABI bitcode file as a source object dependency, so that
# this library will be rebuilt if the bitcode file changes.
set(opencilk_abi_dep_${libname} ${output_dir_${libname}}/libopencilk-abi_${os}-${arch}.bc)
endif()
endforeach()
endforeach()
else()
foreach(arch ${LIB_ARCHS})
Expand All @@ -459,6 +485,12 @@ function(add_cilktools_bitcode name)
set(extra_cflags_${libname} ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
get_cilktools_output_dir(${arch} output_dir_${libname})
get_cilktools_install_dir(${arch} install_dir_${libname})
# Handle the dependence on cheetah specially
if ("-fopencilk" IN_LIST LIB_CFLAGS AND TARGET cheetah)
# Add the OpenCilk ABI bitcode file as a source object dependency, so that
# this library will be rebuilt if the bitcode file changes.
set(opencilk_abi_dep_${libname} ${output_dir_${libname}}/libopencilk-abi.bc)
endif()
endforeach()
endif()

Expand All @@ -483,7 +515,6 @@ function(add_cilktools_bitcode name)
else()
set(COMPONENT_OPTION COMPONENT ${libname})
endif()
set(output_file_${libname} ${output_name_${libname}}.bc)
# Add compile command for bitcode file.
add_library(${libname}_compile OBJECT ${LIB_SOURCES})
target_include_directories(${libname}_compile PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
Expand All @@ -502,7 +533,7 @@ function(add_cilktools_bitcode name)
add_custom_command(
OUTPUT ${output_dir_${libname}}/${output_file_${libname}}
COMMAND ${LLVM_LINK} -o ${output_dir_${libname}}/${output_file_${libname}} $<TARGET_OBJECTS:${libname}_compile>
DEPENDS ${libname}_compile $<TARGET_OBJECTS:${libname}_compile>
DEPENDS ${libname}_compile $<TARGET_OBJECTS:${libname}_compile> ${opencilk_abi_dep_${libname}}
COMMENT "Building bitcode ${output_file_${libname}}"
VERBATIM COMMAND_EXPAND_LISTS)
add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
Expand Down
3 changes: 2 additions & 1 deletion csi/csirt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ CSIRT_API void __csirt_unit_init(

acquired = 1;
assert(lock == acquired);
int res = atomic_compare_exchange_strong(&lock, &acquired, 0);
int res __attribute__((unused)) =
atomic_compare_exchange_strong(&lock, &acquired, 0);
assert(res);
}

Expand Down
Loading