Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
12 changes: 8 additions & 4 deletions compiler-rt/cmake/Modules/CompilerRTUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,14 @@ function(filter_builtin_sources inout_var name)
# and ensure that it is removed from the file list.
get_filename_component(_name ${_file} NAME)
string(REGEX REPLACE "\\.S$" ".c" _cname "${_name}")
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_cname}")
message(STATUS "For ${name} builtins preferring ${_file} to ${_cname}")
list(REMOVE_ITEM intermediate ${_cname})
endif()
get_property(_cnames SOURCE ${_file} PROPERTY crt_supersedes)
set(_cnames ${_cname} ${_cnames})
foreach(_cname ${_cnames})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_cname}")
message(STATUS "For ${name} builtins preferring ${_file} to ${_cname}")
list(REMOVE_ITEM intermediate ${_cname})
endif()
endforeach()
endif()
endforeach()
set(${inout_var} ${intermediate} PARENT_SCOPE)
Expand Down
3 changes: 3 additions & 0 deletions compiler-rt/lib/builtins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,11 @@ set(thumb1_base_SOURCES
arm/udivsi3.S
arm/comparesf2.S
arm/addsf3.S
arm/fnan2.c
${GENERIC_SOURCES}
)
# arm/addsf3.S implements both addition and subtraction via cross-branching
set_property(SOURCE arm/addsf3.S PROPERTY crt_supersedes subsf3.c)

set(arm_EABI_RT_SOURCES
arm/aeabi_cdcmp.S
Expand Down
Loading
Loading