1*4882a593SmuzhiyunFrom f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Mingli Yu <mingli.yu@windriver.com> 3*4882a593SmuzhiyunDate: Thu, 9 Apr 2020 14:07:19 +0800 4*4882a593SmuzhiyunSubject: [PATCH] build_rocksdb.cmake: fix atomic support on arm 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCheck to link with libatomic to enable C11 atomics support 7*4882a593Smuzhiyunto fix below build error on arm: 8*4882a593Smuzhiyun| /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)': 9*4882a593Smuzhiyun| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8' 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Pending 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun storage/rocksdb/build_rocksdb.cmake | 3 +++ 16*4882a593Smuzhiyun 1 file changed, 3 insertions(+) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake 19*4882a593Smuzhiyunindex d7895b0..3bcd52a 100644 20*4882a593Smuzhiyun--- a/storage/rocksdb/build_rocksdb.cmake 21*4882a593Smuzhiyun+++ b/storage/rocksdb/build_rocksdb.cmake 22*4882a593Smuzhiyun@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) 25*4882a593Smuzhiyun target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) 26*4882a593Smuzhiyun+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) 27*4882a593Smuzhiyun+ TARGET_LINK_LIBRARIES(rocksdblib atomic) 28*4882a593Smuzhiyun+ENDIF() 29*4882a593Smuzhiyun IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") 30*4882a593Smuzhiyun set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error") 31*4882a593Smuzhiyun endif() 32*4882a593Smuzhiyun-- 33*4882a593Smuzhiyun2.7.4 34*4882a593Smuzhiyun 35