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