diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3c2721a..162ce2be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,34 +242,42 @@ else()
     option(BUILD_FOR_NATIVE_CPU "Generate code for the compiling machine CPU" OFF)
   endif()
 
-  if(CMAKE_CONFIGURATION_TYPES OR NOT CMAKE_BUILD_TYPE_UPPERCASE STREQUAL "DEBUG")
-    set(INTERPROCEDURAL_OPTIMIZATION_DEFAULT ON)
-  else()
-    set(INTERPROCEDURAL_OPTIMIZATION_DEFAULT OFF)
-  endif()
-
   if(CMAKE_INTERPROCEDURAL_OPTIMIZATION_AVAILABLE
-      OR GCC_LTO_AVAILABLE OR MSVC_LTO_AVAILABLE OR
-      (CLANG_LTO_AVAILABLE AND
-        ((DEFINED MDBX_ENABLE_TESTS AND NOT MDBX_ENABLE_TESTS)
-        OR NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)))
-    option(INTERPROCEDURAL_OPTIMIZATION "Enable interprocedural/LTO optimization" ${INTERPROCEDURAL_OPTIMIZATION_DEFAULT})
-  else()
-    set(INTERPROCEDURAL_OPTIMIZATION OFF)
+      OR GCC_LTO_AVAILABLE OR MSVC_LTO_AVAILABLE OR CLANG_LTO_AVAILABLE)
+    if((CMAKE_CONFIGURATION_TYPES OR NOT CMAKE_BUILD_TYPE_UPPERCASE STREQUAL "DEBUG") AND
+        ((MSVC_LTO_AVAILABLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19) OR
+        (GCC_LTO_AVAILABLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7) OR
+        (CLANG_LTO_AVAILABLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5)))
+      set(INTERPROCEDURAL_OPTIMIZATION_DEFAULT ON)
+    else()
+      set(INTERPROCEDURAL_OPTIMIZATION_DEFAULT OFF)
+    endif()
+    option(INTERPROCEDURAL_OPTIMIZATION "Enable interprocedural/LTO optimization." ${INTERPROCEDURAL_OPTIMIZATION_DEFAULT})
   endif()
 
   if(INTERPROCEDURAL_OPTIMIZATION)
     if(GCC_LTO_AVAILABLE)
       set(LTO_ENABLED TRUE)
       set(CMAKE_AR ${CMAKE_GCC_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
+      set(CMAKE_C_COMPILER_AR ${CMAKE_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
+      set(CMAKE_CXX_COMPILER_AR ${CMAKE_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
       set(CMAKE_NM ${CMAKE_GCC_NM} CACHE PATH "Path to nm program with LTO-plugin" FORCE)
       set(CMAKE_RANLIB ${CMAKE_GCC_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
+      set(CMAKE_C_COMPILER_RANLIB ${CMAKE_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
+      set(CMAKE_CXX_COMPILER_RANLIB ${CMAKE_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
       message(STATUS "MDBX indulge Link-Time Optimization by GCC")
     elseif(CLANG_LTO_AVAILABLE)
       set(LTO_ENABLED TRUE)
+      if(CMAKE_CLANG_LD)
+        set(CMAKE_LINKER ${CMAKE_CLANG_LD} CACHE PATH "Path to lld or ld program with LTO-plugin" FORCE)
+      endif()
       set(CMAKE_AR ${CMAKE_CLANG_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
+      set(CMAKE_C_COMPILER_AR ${CMAKE_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
+      set(CMAKE_CXX_COMPILER_AR ${CMAKE_AR} CACHE PATH "Path to ar program with LTO-plugin" FORCE)
       set(CMAKE_NM ${CMAKE_CLANG_NM} CACHE PATH "Path to nm program with LTO-plugin" FORCE)
       set(CMAKE_RANLIB ${CMAKE_CLANG_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
+      set(CMAKE_C_COMPILER_RANLIB ${CMAKE_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
+      set(CMAKE_CXX_COMPILER_RANLIB ${CMAKE_RANLIB} CACHE PATH "Path to ranlib program with LTO-plugin" FORCE)
       message(STATUS "MDBX indulge Link-Time Optimization by CLANG")
     elseif(MSVC_LTO_AVAILABLE)
       set(LTO_ENABLED TRUE)
@@ -630,7 +638,7 @@ macro(libmdbx_setup_libs TARGET MODE)
     target_link_libraries(${TARGET} ${MODE} Threads::Threads)
   endif()
   if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    target_link_libraries(${TARGET} ${MODE} ntdll advapi32)
+    target_link_libraries(${TARGET} ${MODE} ntdll user32 kernel32 advapi32)
     if(MDBX_NTDLL_EXTRA_IMPLIB AND MDBX_WITHOUT_MSVC_CRT)
       target_link_libraries(${TARGET} ${MODE} ntdll_extra)
     endif()
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index cc894117..78a31946 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -205,9 +205,38 @@ endif()
 
 if(NOT CMAKE_SYSTEM_ARCH)
   if(CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_ARCHITECTURE_ID)
-    set(CMAKE_SYSTEM_ARCH "${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_ARCHITECTURE_ID}")
+    string(TOLOWER "${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_ARCHITECTURE_ID}" CMAKE_SYSTEM_ARCH)
+    if(CMAKE_SYSTEM_ARCH STREQUAL "x86")
+      set(X86_32 TRUE)
+    elseif(CMAKE_SYSTEM_ARCH STREQUAL "x86_64" OR CMAKE_SYSTEM_ARCH STREQUAL "x64")
+      set(X86_64 TRUE)
+      set(CMAKE_SYSTEM_ARCH "x86_64")
+    elseif(CMAKE_SYSTEM_ARCH MATCHES "^(aarch.*|arm.*)")
+      if(CMAKE_TARGET_BITNESS EQUAL 64)
+        set(AARCH64 TRUE)
+      else()
+        set(ARM32 TRUE)
+      endif()
+    endif()
   elseif(CMAKE_ANDROID_ARCH_ABI)
     set(CMAKE_SYSTEM_ARCH "${CMAKE_ANDROID_ARCH_ABI}")
+    if(CMAKE_SYSTEM_ARCH STREQUAL "x86")
+      set(X86_32 TRUE)
+    elseif(CMAKE_SYSTEM_ARCH STREQUAL "x86_64")
+      set(X86_64 TRUE)
+    elseif(CMAKE_SYSTEM_ARCH MATCHES "^(aarch.*|AARCH.*|arm.*|ARM.*)")
+      if(CMAKE_TARGET_BITNESS EQUAL 64)
+        set(AARCH64 TRUE)
+      else()
+        set(ARM32 TRUE)
+      endif()
+    elseif(CMAKE_SYSTEM_ARCH MATCHES "^(mips|MIPS).*")
+      if(CMAKE_TARGET_BITNESS EQUAL 64)
+        set(MIPS64 TRUE)
+      else()
+        set(MIPS32 TRUE)
+      endif()
+    endif()
   elseif(CMAKE_COMPILER_IS_ELBRUSC OR CMAKE_COMPILER_IS_ELBRUSCXX
       OR CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_ID STREQUAL "LCC"
       OR CMAKE_SYSTEM_PROCESSOR MATCHES "e2k.*|E2K.*|elbrus.*|ELBRUS.*")