Skip to content

Commit b26b32b

Browse files
committed
lld: link libatomic if needed for Timer
D80298 made Timer::total atomic, but this requires linking libatomic on some targets. Reviewed By: aaronpuchert Differential Revision: https://reviews.llvm.org/D85691
1 parent f55ad39 commit b26b32b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lld/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
5454
include(AddLLVM)
5555
include(TableGen)
5656
include(HandleLLVMOptions)
57+
include(CheckAtomic)
5758

5859
if(LLVM_INCLUDE_TESTS)
5960
if(CMAKE_VERSION VERSION_LESS 3.12)

lld/Common/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
set(LLD_SYSTEM_LIBS ${LLVM_PTHREAD_LIB})
2+
3+
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
4+
list(APPEND LLD_SYSTEM_LIBS atomic)
5+
endif()
6+
17
find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc)
28
find_first_existing_vc_file("${LLD_SOURCE_DIR}" lld_vc)
39

@@ -50,7 +56,7 @@ add_lld_library(lldCommon
5056
Target
5157

5258
LINK_LIBS
53-
${LLVM_PTHREAD_LIB}
59+
${LLD_SYSTEM_LIBS}
5460

5561
DEPENDS
5662
intrinsics_gen

0 commit comments

Comments
 (0)