From 636766e62039493d149e46da089bcfafa7c1c3a6 Mon Sep 17 00:00:00 2001 From: Code7R Date: Sun, 20 Aug 2017 08:37:52 +0200 Subject: [PATCH] link with libatomic (#387) * link with libatomic when available * Use --as-needed flag to avoid libatomic reference where not required --- CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bceacec..c7a79c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,23 @@ check_cxx_source_compiles ("#include int main() { getxattr(0,0,0,0,0,0); return 1; } " XATTR_ADD_OPT) +# If awailable on current architecture (typically embedded 32-bit), link with it explicitly; +# GCC autodetection is faulty, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 and +# find_libray is no great help here since it is sometimes(!) not in standard paths. +set(CMAKE_REQUIRED_FLAGS "-latomic") +CHECK_CXX_SOURCE_COMPILES("int main() {return 0;}" COMPILER_NEEDS_LATOMIC) +if(COMPILER_NEEDS_LATOMIC) + set(ATOMIC_LIBRARY atomic) +endif() +# compensate the effect of extra linking of libatomic on platforms where intrinsics are used +set(CMAKE_REQUIRED_FLAGS "-Wl,--as-needed") +CHECK_CXX_SOURCE_COMPILES("int main() {return 0;}" LINKER_SUPPORTS_WLASNEEDED) +if(LINKER_SUPPORTS_WLASNEEDED) + list(APPEND EXTRA_LINKER_FLAGS "-Wl,--as-needed") +endif() + +set(CMAKE_REQUIRED_FLAGS) + # Check if we have some standard functions. include (CheckFuncs) check_function_exists_glibc (lchmod HAVE_LCHMOD) @@ -214,12 +231,14 @@ set_target_properties(encfs PROPERTIES VERSION ${ENCFS_VERSION} SOVERSION ${ENCFS_SOVERSION}) target_link_libraries(encfs + ${EXTRA_LINKER_FLAGS} ${FUSE_LIBRARIES} ${OPENSSL_LIBRARIES} ${TINYXML_LIBRARIES} ${EASYLOGGING_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Intl_LIBRARIES} + ${ATOMIC_LIBRARY} ) if (INSTALL_LIBENCFS) install (TARGETS encfs DESTINATION ${LIB_INSTALL_DIR})