diff options
| author | Sam James <sam@gentoo.org> | 2022-10-19 20:09:34 +0100 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-11-10 17:04:34 -0800 |
| commit | 4c3d83810ad7bde70b2665df9a15947695e92adb (patch) | |
| tree | 90d1d0816631b99a2b737ffdb7dc43e92d0c0b0f | |
| parent | d75ae21044ad893572855cefb0c0898a771b2094 (diff) | |
| download | llvm-4c3d83810ad7bde70b2665df9a15947695e92adb.tar.gz | |
Link liblldCOFF against libatomic when necessary
Also simplify code for liblldCommon using the new LLVM_ATOMIC_LIB variable.
Depends on D136280.
Bug: https://bugs.gentoo.org/832675
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Tested-by: erhard_f@mailbox.org <erhard_f@mailbox.org>
Differential Revision: https://reviews.llvm.org/D136281
(cherry picked from commit f0b451c77f14947e3e7d314f048679fa2f5c6298)
| -rw-r--r-- | lld/COFF/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lld/Common/CMakeLists.txt | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lld/COFF/CMakeLists.txt b/lld/COFF/CMakeLists.txt index d289bd591034..55aec26854c8 100644 --- a/lld/COFF/CMakeLists.txt +++ b/lld/COFF/CMakeLists.txt @@ -44,6 +44,7 @@ add_lld_library(lldCOFF LINK_LIBS lldCommon ${LLVM_PTHREAD_LIB} + ${LLVM_ATOMIC_LIB} DEPENDS COFFOptionsTableGen diff --git a/lld/Common/CMakeLists.txt b/lld/Common/CMakeLists.txt index 1ae7da1f5f7f..9c23ed395223 100644 --- a/lld/Common/CMakeLists.txt +++ b/lld/Common/CMakeLists.txt @@ -1,9 +1,3 @@ -set(LLD_SYSTEM_LIBS ${LLVM_PTHREAD_LIB}) - -if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) - list(APPEND LLD_SYSTEM_LIBS atomic) -endif() - find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc) find_first_existing_vc_file("${LLD_SOURCE_DIR}" lld_vc) @@ -54,7 +48,8 @@ add_lld_library(lldCommon Target LINK_LIBS - ${LLD_SYSTEM_LIBS} + ${LLVM_PTHREAD_LIB} + ${LLVM_ATOMIC_LIB} DEPENDS intrinsics_gen |