Merge pull request #5453 from lplewa/update

miniasync update
pmem · May 23, 2022 · 9edb9e1 · 9edb9e1
2 parents 98d28b3 + 3b4a482
commit 9edb9e1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/src/deps/miniasync/ChangeLog b/src/deps/miniasync/ChangeLog
@@ -1,4 +1,4 @@
-Wed Apr 22 2022 Weronika Lewandowska <[email protected]>
+Fri May 20 2022 Weronika Lewandowska <[email protected]>
 
 	* Version 0.1.0
 

diff --git a/src/deps/miniasync/src/CMakeLists.txt b/src/deps/miniasync/src/CMakeLists.txt
@@ -46,7 +46,8 @@ set(CORE_DEPS ${CORE_DEPS}
 add_library(cores STATIC ${CORE_DEPS})
 add_library(miniasync SHARED ${SOURCES} miniasync.def)
 set_property(TARGET cores PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_link_libraries(miniasync PRIVATE cores)
+target_link_libraries(miniasync PRIVATE
+	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/miniasync.map cores)
 
 target_include_directories(miniasync PRIVATE . include)
 target_include_directories(cores PRIVATE . include)
@@ -58,8 +59,9 @@ if(WIN32)
 	target_include_directories(cores PRIVATE ${MINIASYNC_INCLUDE_DIR_WIN})
 endif()
 
+# SOVERSION is an ABI version
 set_target_properties(miniasync PROPERTIES
-	SOVERSION 0.1.0-rc1
+	SOVERSION 0
 	PUBLIC_HEADER ${MINIASYNC_INCLUDE_DIR}/libminiasync.h
 )
 

diff --git a/src/deps/miniasync/src/miniasync.def b/src/deps/miniasync/src/miniasync.def
@@ -10,4 +10,7 @@ EXPORTS
     data_mover_threads_new
     data_mover_threads_default
     data_mover_threads_get_vdm
+    data_mover_threads_set_memcpy_fn
+    data_mover_threads_set_memmove_fn
+    data_mover_threads_set_memset_fn
     data_mover_threads_delete
diff --git a/src/deps/miniasync/src/miniasync.map b/src/deps/miniasync/src/miniasync.map
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2022, Intel Corporation
+#
+# src/miniasync.map -- linker map file for miniasync
+#
+LIBMINIASYNC_1.0 {
+	global:
+            runtime_new;
+            runtime_delete;
+            runtime_wait_multiple;
+            runtime_wait;
+            data_mover_sync_new;
+            data_mover_sync_get_vdm;
+            data_mover_sync_delete;
+            data_mover_threads_new;
+            data_mover_threads_default;
+            data_mover_threads_get_vdm;
+            data_mover_threads_set_memcpy_fn;
+            data_mover_threads_set_memmove_fn;
+            data_mover_threads_set_memset_fn;
+            data_mover_threads_delete;
+	local:
+		*;
+};