From 91b8f76b5126b7ea073a41c0558dec90e36231af Mon Sep 17 00:00:00 2001
From: Igor Chorazewicz <igor.chorazewicz@intel.com>
Date: Mon, 29 Jul 2024 17:29:39 +0000
Subject: [PATCH] Avoid using non-existing symbols in .map

to fix:

"ld.lld: error: version script assignment of 'UMF_1.0' to symbol
'umfLevelZeroMemoryProviderOps' failed: symbol not defined"

when using lld linker
---
 CMakeLists.txt                    | 23 ++++++++++++-----------
 cmake/helpers.cmake               |  9 +++++++++
 src/CMakeLists.txt                | 23 ++++++++++++++++++++++-
 src/libumf.def.in                 |  3 +--
 src/{libumf.map => libumf.map.in} |  8 +-------
 5 files changed, 45 insertions(+), 21 deletions(-)
 rename src/{libumf.map => libumf.map.in} (87%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf245ce10..2c6d05d41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -390,6 +390,18 @@ else()
     )
 endif()
 
+set(UMF_OPTIONAL_SYMBOLS_LINUX "")
+set(UMF_OPTIONAL_SYMBOLS_WINDOWS "")
+
+# Conditional configuration for Level Zero provider
+if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
+    add_optional_symbol(umfLevelZeroMemoryProviderOps)
+endif()
+
+if(NOT UMF_DISABLE_HWLOC)
+    add_optional_symbol(umfOsMemoryProviderOps)
+endif()
+
 add_subdirectory(src)
 
 if(UMF_BUILD_TESTS)
@@ -408,17 +420,6 @@ if(UMF_BUILD_EXAMPLES)
     endif()
 endif()
 
-# Conditional configuration for Level Zero provider
-if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
-    set(OPTIONAL_SYMBOLS "umfLevelZeroMemoryProviderOps")
-else()
-    set(OPTIONAL_SYMBOLS "")
-endif()
-
-# Configure the DEF file based on whether Level Zero provider is built
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/libumf.def.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/src/libumf.def" @ONLY)
-
 if(UMF_FORMAT_CODE_STYLE)
     find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0
                                     clang-format)
diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake
index 0e226d679..a4f59a763 100644
--- a/cmake/helpers.cmake
+++ b/cmake/helpers.cmake
@@ -417,3 +417,12 @@ macro(add_sanitizer_flag flag)
 
     set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS})
 endmacro()
+
+function(add_optional_symbol symbol)
+    set(UMF_OPTIONAL_SYMBOLS_WINDOWS
+        "${UMF_OPTIONAL_SYMBOLS_WINDOWS} \n    ${symbol}"
+        PARENT_SCOPE)
+    set(UMF_OPTIONAL_SYMBOLS_LINUX
+        "${UMF_OPTIONAL_SYMBOLS_LINUX} \n    ${symbol};"
+        PARENT_SCOPE)
+endfunction()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1ecfa359f..7d2f151f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -112,8 +112,29 @@ if(NOT UMF_DISABLE_HWLOC)
         provider/provider_os_memory_windows.c)
 
     set(UMF_LIBS ${UMF_LIBS} ${LIBHWLOC_LIBRARIES})
+
+    if(NOT WINDOWS)
+        add_optional_symbol(umfMemspaceCreateFromNumaArray)
+        add_optional_symbol(umfMemspaceHighestBandwidthGet)
+        add_optional_symbol(umfMemspaceHighestCapacityGet)
+        add_optional_symbol(umfMemspaceHostAllGet)
+        add_optional_symbol(umfMemspaceLowestLatencyGet)
+    endif()
 endif()
 
+if(WINDOWS)
+    message(STATUS "UMF_OPTIONAL_SYMBOLS: ${UMF_OPTIONAL_SYMBOLS_WINDOWS}")
+else()
+    message(STATUS "UMF_OPTIONAL_SYMBOLS: ${UMF_OPTIONAL_SYMBOLS_LINUX}")
+endif()
+
+# Configure the DEF file based on whether Level Zero provider is built
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libumf.def.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/libumf.def" @ONLY)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libumf.map.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/libumf.map" @ONLY)
+
 set(UMF_PRIVATE_LIBRARY_DIRS ${UMF_PRIVATE_LIBRARY_DIRS}
                              ${LIBHWLOC_LIBRARY_DIRS})
 
@@ -140,7 +161,7 @@ if(UMF_BUILD_SHARED_LIBRARY)
         TYPE SHARED
         SRCS ${UMF_SOURCES}
         LIBS ${UMF_LIBS} ${HWLOC_LIB}
-        LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
+        LINUX_MAP_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.map
         WINDOWS_DEF_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.def)
     set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
                                        "UMF_SHARED_LIBRARY")
diff --git a/src/libumf.def.in b/src/libumf.def.in
index 00a1995ae..cb8d4d74c 100644
--- a/src/libumf.def.in
+++ b/src/libumf.def.in
@@ -45,7 +45,6 @@ EXPORTS
     umfMemspaceMemtargetGet
     umfMemtargetGetType
     umfOpenIPCHandle    
-    umfOsMemoryProviderOps
     umfPoolAlignedMalloc
     umfPoolByPtr
     umfPoolCalloc
@@ -62,4 +61,4 @@ EXPORTS
     umfProxyPoolOps
     umfPutIPCHandle
     umfScalablePoolOps
-    @OPTIONAL_SYMBOLS@
+    @UMF_OPTIONAL_SYMBOLS_WINDOWS@
diff --git a/src/libumf.map b/src/libumf.map.in
similarity index 87%
rename from src/libumf.map
rename to src/libumf.map.in
index 2dc6956c9..7c2002a1f 100644
--- a/src/libumf.map
+++ b/src/libumf.map.in
@@ -11,7 +11,6 @@ UMF_1.0 {
         umfFree;
         umfGetIPCHandle;
         umfGetLastFailedMemoryProvider;
-        umfLevelZeroMemoryProviderOps;
         umfMemoryTrackerGetAllocInfo;
         umfMemoryProviderAlloc;
         umfMemoryProviderAllocationMerge;
@@ -35,17 +34,11 @@ UMF_1.0 {
         umfMempolicyDestroy;
         umfMempolicySetCustomSplitPartitions;
         umfMempolicySetInterleavePartSize;
-        umfMemspaceCreateFromNumaArray;
         umfMemspaceDestroy;
         umfMemspaceMemtargetNum;
         umfMemspaceMemtargetGet;
-        umfMemspaceHighestBandwidthGet;
-        umfMemspaceHighestCapacityGet;
-        umfMemspaceHostAllGet;
-        umfMemspaceLowestLatencyGet;
         umfMemtargetGetType;
         umfOpenIPCHandle;
-        umfOsMemoryProviderOps;
         umfPoolAlignedMalloc;
         umfPoolByPtr;
         umfPoolCalloc;
@@ -62,6 +55,7 @@ UMF_1.0 {
         umfProxyPoolOps;
         umfPutIPCHandle;
         umfScalablePoolOps;
+        @UMF_OPTIONAL_SYMBOLS_LINUX@
     local:
         *;
 };