From 8574fe7204c7de59d699c83127b4eb50a37d6018 Mon Sep 17 00:00:00 2001 From: Butta Date: Mon, 9 Nov 2020 14:19:30 +0530 Subject: [PATCH] [build] Remove remaining dependencies on libatomic, for Android, BSD and Haiku Follow suit from linux, #29581, tested on Android. --- stdlib/cmake/modules/AddSwiftStdlib.cmake | 4 ++-- stdlib/public/core/CMakeLists.txt | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake index f60c67c1368cf..e35637f696cf7 100644 --- a/stdlib/cmake/modules/AddSwiftStdlib.cmake +++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake @@ -402,10 +402,10 @@ function(_add_target_variant_link_flags) list(APPEND library_search_directories ${CMAKE_BINARY_DIR}/winsdk_lib_${LFLAGS_ARCH}_symlinks) elseif("${LFLAGS_SDK}" STREQUAL "HAIKU") - list(APPEND link_libraries "bsd" "atomic") + list(APPEND link_libraries "bsd") list(APPEND result "-Wl,-Bsymbolic") elseif("${LFLAGS_SDK}" STREQUAL "ANDROID") - list(APPEND link_libraries "dl" "log" "atomic") + list(APPEND link_libraries "dl" "log") # We need to add the math library, which is linked implicitly by libc++ list(APPEND result "-lm") diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt index 0f84659f09296..b3d8a857a2044 100644 --- a/stdlib/public/core/CMakeLists.txt +++ b/stdlib/public/core/CMakeLists.txt @@ -259,19 +259,13 @@ else() endif() endif() -if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL ANDROID) - # workaround for libatomic needing to be after object files for swiftCore.so - list(APPEND swift_core_private_link_libraries atomic) -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN) +if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN) # TODO(compnerd) cache this variable to permit re-configuration execute_process(COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT}" OUTPUT_VARIABLE ENV_SYSTEMROOT) list(APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT}/system32/psapi.dll") elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD) find_library(EXECINFO_LIBRARY execinfo) list(APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY}) - # workaround for libatomic needing to be after object files for swiftCore.so - list(APPEND swift_core_private_link_libraries - ${SWIFTLIB_DIR}/clang/lib/freebsd/libclang_rt.builtins-${SWIFT_PRIMARY_VARIANT_ARCH}.a) elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX) if(SWIFT_BUILD_STATIC_STDLIB) list(APPEND swift_core_private_link_libraries)