1*96e4b4e1SPatrick WilliamsFrom af4247cd24eab2d728fb3592f6e125ef5290361b Mon Sep 17 00:00:00 2001 219323693SBrad BishopFrom: Mingli Yu <mingli.yu@windriver.com> 382c905dcSAndrew GeisslerDate: Thu, 9 Apr 2020 14:07:19 +0800 419323693SBrad BishopSubject: [PATCH] build_rocksdb.cmake: fix atomic support on arm 519323693SBrad Bishop 619323693SBrad BishopCheck to link with libatomic to enable C11 atomics support 719323693SBrad Bishopto fix below build error on arm: 819323693SBrad Bishop| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)': 919323693SBrad Bishop| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8' 1019323693SBrad Bishop 1119323693SBrad BishopUpstream-Status: Pending 1219323693SBrad Bishop 1382c905dcSAndrew GeisslerSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 1419323693SBrad Bishop--- 1519323693SBrad Bishop storage/rocksdb/build_rocksdb.cmake | 3 +++ 1619323693SBrad Bishop 1 file changed, 3 insertions(+) 1719323693SBrad Bishop 1882c905dcSAndrew Geisslerdiff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake 19*96e4b4e1SPatrick Williamsindex e89dbfc0..acc6b48e 100644 2019323693SBrad Bishop--- a/storage/rocksdb/build_rocksdb.cmake 2119323693SBrad Bishop+++ b/storage/rocksdb/build_rocksdb.cmake 22*96e4b4e1SPatrick Williams@@ -490,6 +490,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) 2319323693SBrad Bishop 2419323693SBrad Bishop ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) 2519323693SBrad Bishop target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) 2619323693SBrad Bishop+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) 2719323693SBrad Bishop+ TARGET_LINK_LIBRARIES(rocksdblib atomic) 2819323693SBrad Bishop+ENDIF() 2919323693SBrad Bishop IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") 3082c905dcSAndrew Geissler set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error") 3119323693SBrad Bishop endif() 32