rebase of the patches

This commit is contained in:
Sylvestre Ledru 2020-10-21 18:33:24 +02:00
parent fba767b767
commit bc00e66967

View File

@ -1,20 +1,32 @@
Index: llvm-toolchain-snapshot_12~++20201021113808+88241ffb563/lld/tools/lld/CMakeLists.txt
Index: llvm-toolchain-snapshot_12~++20201021061106+4b7dafd9046/lld/tools/lld/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_12~++20201021113808+88241ffb563.orig/lld/tools/lld/CMakeLists.txt
+++ llvm-toolchain-snapshot_12~++20201021113808+88241ffb563/lld/tools/lld/CMakeLists.txt
@@ -2,9 +2,14 @@ set(LLVM_LINK_COMPONENTS
--- llvm-toolchain-snapshot_12~++20201021061106+4b7dafd9046.orig/lld/tools/lld/CMakeLists.txt
+++ llvm-toolchain-snapshot_12~++20201021061106+4b7dafd9046/lld/tools/lld/CMakeLists.txt
@@ -1,10 +1,18 @@
+set(LLD_ATOMIC_LIB "")
+
set(LLVM_LINK_COMPONENTS
Support
)
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686" OR
+ CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64"
+ )
+ list(APPEND LLD_ATOMIC_LIB "atomic")
+endif()
+
add_lld_tool(lld
lld.cpp
-
+ ${LLD_ATOMIC_LIB}
SUPPORT_PLUGINS
)
export_executable_symbols_for_plugins(lld)
@@ -18,6 +26,7 @@ target_link_libraries(lld
lldMachO2
lldMinGW
lldWasm
+ ${LLD_ATOMIC_LIB}
)
install(TARGETS lld