Intermediate changes

448 files changed, 297 insertions, 297 deletions

diff --git a/contrib/libs/CMakeLists.darwin.txt b/contrib/libs/CMakeLists.darwin-x86_64.txt
index 8f27501754..8f27501754 100644
--- a/contrib/libs/CMakeLists.darwin.txt
+++ b/contrib/libs/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/CMakeLists.linux.txt b/contrib/libs/CMakeLists.linux-x86_64.txt
index 797ac4fd05..797ac4fd05 100644
--- a/contrib/libs/CMakeLists.linux.txt
+++ b/contrib/libs/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/CMakeLists.txt b/contrib/libs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/CMakeLists.txt
+++ b/contrib/libs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin-x86_64.txt
index 8818693c62..8818693c62 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux-x86_64.txt
index e8fba8e636..e8fba8e636 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/arrow/CMakeLists.darwin.txt b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
index dba4c90c1f..dba4c90c1f 100644
--- a/contrib/libs/apache/arrow/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/arrow/CMakeLists.linux.txt b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
index b638c396ed..b638c396ed 100644
--- a/contrib/libs/apache/arrow/CMakeLists.linux.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/avro/CMakeLists.darwin.txt b/contrib/libs/apache/avro/CMakeLists.darwin-x86_64.txt
index 303febcc15..303febcc15 100644
--- a/contrib/libs/apache/avro/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/avro/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/avro/CMakeLists.linux.txt b/contrib/libs/apache/avro/CMakeLists.linux-x86_64.txt
index 214360c135..214360c135 100644
--- a/contrib/libs/apache/avro/CMakeLists.linux.txt
+++ b/contrib/libs/apache/avro/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/avro/CMakeLists.txt b/contrib/libs/apache/avro/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/avro/CMakeLists.txt
+++ b/contrib/libs/apache/avro/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/orc/CMakeLists.darwin.txt b/contrib/libs/apache/orc/CMakeLists.darwin-x86_64.txt
index 45e01d7a29..45e01d7a29 100644
--- a/contrib/libs/apache/orc/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/orc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/orc/CMakeLists.linux.txt b/contrib/libs/apache/orc/CMakeLists.linux-x86_64.txt
index 1a7d3d48e7..1a7d3d48e7 100644
--- a/contrib/libs/apache/orc/CMakeLists.linux.txt
+++ b/contrib/libs/apache/orc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin-x86_64.txt
index 0330c951be..0330c951be 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux-x86_64.txt
index fc60527db3..fc60527db3 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin-x86_64.txt
index 1b1705649a..1b1705649a 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux-x86_64.txt
index 114aa69426..114aa69426 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/avx2/CMakeLists.darwin.txt b/contrib/libs/base64/avx2/CMakeLists.darwin-x86_64.txt
index b2e29c7a01..b2e29c7a01 100644
--- a/contrib/libs/base64/avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/avx2/CMakeLists.linux.txt b/contrib/libs/base64/avx2/CMakeLists.linux-x86_64.txt
index b528c1f599..b528c1f599 100644
--- a/contrib/libs/base64/avx2/CMakeLists.linux.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/avx2/CMakeLists.txt b/contrib/libs/base64/avx2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/avx2/CMakeLists.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/neon32/CMakeLists.darwin.txt b/contrib/libs/base64/neon32/CMakeLists.darwin-x86_64.txt
index a7ec94e9d0..a7ec94e9d0 100644
--- a/contrib/libs/base64/neon32/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/neon32/CMakeLists.linux.txt b/contrib/libs/base64/neon32/CMakeLists.linux-x86_64.txt
index 2b3ad9b62d..2b3ad9b62d 100644
--- a/contrib/libs/base64/neon32/CMakeLists.linux.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/neon32/CMakeLists.txt b/contrib/libs/base64/neon32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/neon32/CMakeLists.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/neon64/CMakeLists.darwin.txt b/contrib/libs/base64/neon64/CMakeLists.darwin-x86_64.txt
index 732c4dd375..732c4dd375 100644
--- a/contrib/libs/base64/neon64/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/neon64/CMakeLists.linux.txt b/contrib/libs/base64/neon64/CMakeLists.linux-x86_64.txt
index e4923670c8..e4923670c8 100644
--- a/contrib/libs/base64/neon64/CMakeLists.linux.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/neon64/CMakeLists.txt b/contrib/libs/base64/neon64/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/neon64/CMakeLists.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/plain32/CMakeLists.darwin.txt b/contrib/libs/base64/plain32/CMakeLists.darwin-x86_64.txt
index d06a76d91a..d06a76d91a 100644
--- a/contrib/libs/base64/plain32/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/plain32/CMakeLists.linux.txt b/contrib/libs/base64/plain32/CMakeLists.linux-x86_64.txt
index edca2dcad4..edca2dcad4 100644
--- a/contrib/libs/base64/plain32/CMakeLists.linux.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/plain32/CMakeLists.txt b/contrib/libs/base64/plain32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/plain32/CMakeLists.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/plain64/CMakeLists.darwin.txt b/contrib/libs/base64/plain64/CMakeLists.darwin-x86_64.txt
index 9ccfdf670c..9ccfdf670c 100644
--- a/contrib/libs/base64/plain64/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/plain64/CMakeLists.linux.txt b/contrib/libs/base64/plain64/CMakeLists.linux-x86_64.txt
index 722ac9fd40..722ac9fd40 100644
--- a/contrib/libs/base64/plain64/CMakeLists.linux.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/plain64/CMakeLists.txt b/contrib/libs/base64/plain64/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/plain64/CMakeLists.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/ssse3/CMakeLists.darwin.txt b/contrib/libs/base64/ssse3/CMakeLists.darwin-x86_64.txt
index e1d78be6e0..e1d78be6e0 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/ssse3/CMakeLists.linux.txt b/contrib/libs/base64/ssse3/CMakeLists.linux-x86_64.txt
index f019ec569f..f019ec569f 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.linux.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/ssse3/CMakeLists.txt b/contrib/libs/base64/ssse3/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/common/CMakeLists.darwin.txt b/contrib/libs/brotli/common/CMakeLists.darwin-x86_64.txt
index 0acd28e7cd..0acd28e7cd 100644
--- a/contrib/libs/brotli/common/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/common/CMakeLists.linux.txt b/contrib/libs/brotli/common/CMakeLists.linux-x86_64.txt
index f40a7896b9..f40a7896b9 100644
--- a/contrib/libs/brotli/common/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/common/CMakeLists.txt b/contrib/libs/brotli/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/common/CMakeLists.txt
+++ b/contrib/libs/brotli/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/dec/CMakeLists.darwin.txt b/contrib/libs/brotli/dec/CMakeLists.darwin-x86_64.txt
index 5d11acad56..5d11acad56 100644
--- a/contrib/libs/brotli/dec/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/dec/CMakeLists.linux.txt b/contrib/libs/brotli/dec/CMakeLists.linux-x86_64.txt
index 6283846aef..6283846aef 100644
--- a/contrib/libs/brotli/dec/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/dec/CMakeLists.txt b/contrib/libs/brotli/dec/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/dec/CMakeLists.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/enc/CMakeLists.darwin.txt b/contrib/libs/brotli/enc/CMakeLists.darwin-x86_64.txt
index 297dae7533..297dae7533 100644
--- a/contrib/libs/brotli/enc/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/enc/CMakeLists.linux.txt b/contrib/libs/brotli/enc/CMakeLists.linux-x86_64.txt
index 1fd39e4120..1fd39e4120 100644
--- a/contrib/libs/brotli/enc/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/enc/CMakeLists.txt b/contrib/libs/brotli/enc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/enc/CMakeLists.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cctz/CMakeLists.darwin.txt b/contrib/libs/cctz/CMakeLists.darwin-x86_64.txt
index a4e9994f8a..a4e9994f8a 100644
--- a/contrib/libs/cctz/CMakeLists.darwin.txt
+++ b/contrib/libs/cctz/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cctz/CMakeLists.linux.txt b/contrib/libs/cctz/CMakeLists.linux-x86_64.txt
index 5d6f6aabc8..5d6f6aabc8 100644
--- a/contrib/libs/cctz/CMakeLists.linux.txt
+++ b/contrib/libs/cctz/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cctz/CMakeLists.txt b/contrib/libs/cctz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cctz/CMakeLists.txt
+++ b/contrib/libs/cctz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.darwin.txt b/contrib/libs/cctz/tzdata/CMakeLists.darwin-x86_64.txt
index 86cdc28b8f..86cdc28b8f 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.darwin.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.linux.txt b/contrib/libs/cctz/tzdata/CMakeLists.linux-x86_64.txt
index e6a5c8c8a5..e6a5c8c8a5 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.linux.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.txt b/contrib/libs/cctz/tzdata/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/crcutil/CMakeLists.darwin.txt b/contrib/libs/crcutil/CMakeLists.darwin-x86_64.txt
index 0f492532e9..0f492532e9 100644
--- a/contrib/libs/crcutil/CMakeLists.darwin.txt
+++ b/contrib/libs/crcutil/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/crcutil/CMakeLists.linux.txt b/contrib/libs/crcutil/CMakeLists.linux-x86_64.txt
index 24b6c4fac2..24b6c4fac2 100644
--- a/contrib/libs/crcutil/CMakeLists.linux.txt
+++ b/contrib/libs/crcutil/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/crcutil/CMakeLists.txt b/contrib/libs/crcutil/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/crcutil/CMakeLists.txt
+++ b/contrib/libs/crcutil/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/curl/CMakeLists.darwin.txt b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt
index 7a5fb60835..7a5fb60835 100644
--- a/contrib/libs/curl/CMakeLists.darwin.txt
+++ b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/curl/CMakeLists.linux.txt b/contrib/libs/curl/CMakeLists.linux-x86_64.txt
index 5609bd43b3..5609bd43b3 100644
--- a/contrib/libs/curl/CMakeLists.linux.txt
+++ b/contrib/libs/curl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/curl/CMakeLists.txt
+++ b/contrib/libs/curl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/CMakeLists.darwin-x86_64.txt
index 231e81c8ee..231e81c8ee 100644
--- a/contrib/libs/cxxsupp/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/CMakeLists.linux.txt b/contrib/libs/cxxsupp/CMakeLists.linux-x86_64.txt
index ea5f7a2498..ea5f7a2498 100644
--- a/contrib/libs/cxxsupp/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/CMakeLists.txt b/contrib/libs/cxxsupp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.darwin-x86_64.txt
index dfe59125b5..dfe59125b5 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.linux.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.linux-x86_64.txt
index b4d38acc9d..b4d38acc9d 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin-x86_64.txt
index b1aef2a37a..b1aef2a37a 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.linux-x86_64.txt
index edaf849b79..edaf849b79 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin-x86_64.txt
index 22f534fcdd..22f534fcdd 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux-x86_64.txt
index 144c793693..144c793693 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin-x86_64.txt
index 1a5dff5718..1a5dff5718 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux-x86_64.txt
index e6b6dbf847..e6b6dbf847 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/double-conversion/CMakeLists.darwin.txt b/contrib/libs/double-conversion/CMakeLists.darwin-x86_64.txt
index 69a5bc6b49..69a5bc6b49 100644
--- a/contrib/libs/double-conversion/CMakeLists.darwin.txt
+++ b/contrib/libs/double-conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/double-conversion/CMakeLists.linux.txt b/contrib/libs/double-conversion/CMakeLists.linux-x86_64.txt
index 7599b38c4d..7599b38c4d 100644
--- a/contrib/libs/double-conversion/CMakeLists.linux.txt
+++ b/contrib/libs/double-conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/double-conversion/CMakeLists.txt b/contrib/libs/double-conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/double-conversion/CMakeLists.txt
+++ b/contrib/libs/double-conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/expat/CMakeLists.darwin.txt b/contrib/libs/expat/CMakeLists.darwin-x86_64.txt
index 374256f11f..374256f11f 100644
--- a/contrib/libs/expat/CMakeLists.darwin.txt
+++ b/contrib/libs/expat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/expat/CMakeLists.linux.txt b/contrib/libs/expat/CMakeLists.linux-x86_64.txt
index 6962df9bdb..6962df9bdb 100644
--- a/contrib/libs/expat/CMakeLists.linux.txt
+++ b/contrib/libs/expat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/expat/CMakeLists.txt b/contrib/libs/expat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/expat/CMakeLists.txt
+++ b/contrib/libs/expat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/CMakeLists.darwin.txt b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt
index aeb7bb29c0..aeb7bb29c0 100644
--- a/contrib/libs/farmhash/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/CMakeLists.linux.txt b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt
index e4fa621f99..e4fa621f99 100644
--- a/contrib/libs/farmhash/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/CMakeLists.txt b/contrib/libs/farmhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/CMakeLists.txt
+++ b/contrib/libs/farmhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin-x86_64.txt
index 921c50874e..921c50874e 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.linux-x86_64.txt
index d39e6b6a78..d39e6b6a78 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin-x86_64.txt
index 92f77b4d9a..92f77b4d9a 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.linux-x86_64.txt
index a9197f9c43..a9197f9c43 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin-x86_64.txt
index c73d04f960..c73d04f960 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux-x86_64.txt
index b0bb6a5860..b0bb6a5860 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/fastlz/CMakeLists.darwin.txt b/contrib/libs/fastlz/CMakeLists.darwin-x86_64.txt
index eab41c060a..eab41c060a 100644
--- a/contrib/libs/fastlz/CMakeLists.darwin.txt
+++ b/contrib/libs/fastlz/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/fastlz/CMakeLists.linux.txt b/contrib/libs/fastlz/CMakeLists.linux-x86_64.txt
index e6a67c5372..e6a67c5372 100644
--- a/contrib/libs/fastlz/CMakeLists.linux.txt
+++ b/contrib/libs/fastlz/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/fastlz/CMakeLists.txt b/contrib/libs/fastlz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/fastlz/CMakeLists.txt
+++ b/contrib/libs/fastlz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/fmt/CMakeLists.darwin.txt b/contrib/libs/fmt/CMakeLists.darwin-x86_64.txt
index a9d78d7599..a9d78d7599 100644
--- a/contrib/libs/fmt/CMakeLists.darwin.txt
+++ b/contrib/libs/fmt/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/fmt/CMakeLists.linux.txt b/contrib/libs/fmt/CMakeLists.linux-x86_64.txt
index 0bff6a51f6..0bff6a51f6 100644
--- a/contrib/libs/fmt/CMakeLists.linux.txt
+++ b/contrib/libs/fmt/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/fmt/CMakeLists.txt b/contrib/libs/fmt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/fmt/CMakeLists.txt
+++ b/contrib/libs/fmt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.darwin.txt b/contrib/libs/googleapis-common-protos/CMakeLists.darwin-x86_64.txt
index a88074fd9d..a88074fd9d 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.darwin.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.linux.txt b/contrib/libs/googleapis-common-protos/CMakeLists.linux-x86_64.txt
index a98aba7303..a98aba7303 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.linux.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.txt b/contrib/libs/googleapis-common-protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/CMakeLists.darwin.txt b/contrib/libs/grpc/CMakeLists.darwin-x86_64.txt
index 011ef6a6c8..011ef6a6c8 100644
--- a/contrib/libs/grpc/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/CMakeLists.linux.txt b/contrib/libs/grpc/CMakeLists.linux-x86_64.txt
index f8cfeeb41d..f8cfeeb41d 100644
--- a/contrib/libs/grpc/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/CMakeLists.txt b/contrib/libs/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin-x86_64.txt
index c075387f00..c075387f00 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux-x86_64.txt
index 5d50080edc..5d50080edc 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin-x86_64.txt
index 769add5f8b..769add5f8b 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux-x86_64.txt
index 5df7d10867..5df7d10867 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.darwin.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.darwin-x86_64.txt
index 2978b68ec9..2978b68ec9 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.linux.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.linux-x86_64.txt
index 61de386d30..61de386d30 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hdr_histogram/CMakeLists.darwin.txt b/contrib/libs/hdr_histogram/CMakeLists.darwin-x86_64.txt
index 8cc336fdd1..8cc336fdd1 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.darwin.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hdr_histogram/CMakeLists.linux.txt b/contrib/libs/hdr_histogram/CMakeLists.linux-x86_64.txt
index baa66b76fe..baa66b76fe 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.linux.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/CMakeLists.darwin.txt b/contrib/libs/highwayhash/CMakeLists.darwin-x86_64.txt
index 984a14ba7c..984a14ba7c 100644
--- a/contrib/libs/highwayhash/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/CMakeLists.linux.txt b/contrib/libs/highwayhash/CMakeLists.linux-x86_64.txt
index 8cffe39028..8cffe39028 100644
--- a/contrib/libs/highwayhash/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/CMakeLists.txt b/contrib/libs/highwayhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/highwayhash/CMakeLists.txt
+++ b/contrib/libs/highwayhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/CMakeLists.darwin-x86_64.txt
index 3877a3a7da..3877a3a7da 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/CMakeLists.linux-x86_64.txt
index 3877a3a7da..3877a3a7da 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.txt b/contrib/libs/highwayhash/arch/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin-x86_64.txt
index d98bd38fb8..d98bd38fb8 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux-x86_64.txt
index 502e383f49..502e383f49 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin-x86_64.txt
index 644e629a9c..644e629a9c 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux-x86_64.txt
index 52b6a35b11..52b6a35b11 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/CMakeLists.darwin.txt b/contrib/libs/hyperscan/CMakeLists.darwin-x86_64.txt
index 8576e86aab..8576e86aab 100644
--- a/contrib/libs/hyperscan/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/CMakeLists.linux.txt b/contrib/libs/hyperscan/CMakeLists.linux-x86_64.txt
index 06e680fc7e..06e680fc7e 100644
--- a/contrib/libs/hyperscan/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/CMakeLists.txt b/contrib/libs/hyperscan/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/CMakeLists.txt
+++ b/contrib/libs/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin-x86_64.txt
index 85764417b7..85764417b7 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux-x86_64.txt
index 8bae602102..8bae602102 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin-x86_64.txt
index e11134a46a..e11134a46a 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux-x86_64.txt
index 411a9453a3..411a9453a3 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin-x86_64.txt
index 63b5a33989..63b5a33989 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux-x86_64.txt
index 9bb42a05f9..9bb42a05f9 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin-x86_64.txt
index c3088fa842..c3088fa842 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux-x86_64.txt
index c1878d2ffc..c1878d2ffc 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/icu/CMakeLists.darwin.txt b/contrib/libs/icu/CMakeLists.darwin-x86_64.txt
index 6e164c5f6a..6e164c5f6a 100644
--- a/contrib/libs/icu/CMakeLists.darwin.txt
+++ b/contrib/libs/icu/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/icu/CMakeLists.linux.txt b/contrib/libs/icu/CMakeLists.linux-x86_64.txt
index 420ab30dd3..420ab30dd3 100644
--- a/contrib/libs/icu/CMakeLists.linux.txt
+++ b/contrib/libs/icu/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/icu/CMakeLists.txt b/contrib/libs/icu/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/icu/CMakeLists.txt
+++ b/contrib/libs/icu/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/jemalloc/CMakeLists.darwin.txt b/contrib/libs/jemalloc/CMakeLists.darwin-x86_64.txt
index 8e041153f2..8e041153f2 100644
--- a/contrib/libs/jemalloc/CMakeLists.darwin.txt
+++ b/contrib/libs/jemalloc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/jemalloc/CMakeLists.linux.txt b/contrib/libs/jemalloc/CMakeLists.linux-x86_64.txt
index e06c0a57bd..e06c0a57bd 100644
--- a/contrib/libs/jemalloc/CMakeLists.linux.txt
+++ b/contrib/libs/jemalloc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/jemalloc/CMakeLists.txt b/contrib/libs/jemalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/jemalloc/CMakeLists.txt
+++ b/contrib/libs/jemalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/jwt-cpp/CMakeLists.darwin.txt b/contrib/libs/jwt-cpp/CMakeLists.darwin-x86_64.txt
index 84e3c97df1..84e3c97df1 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.darwin.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/jwt-cpp/CMakeLists.linux.txt b/contrib/libs/jwt-cpp/CMakeLists.linux-x86_64.txt
index 26b43ddf09..26b43ddf09 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.linux.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libbz2/CMakeLists.darwin.txt b/contrib/libs/libbz2/CMakeLists.darwin-x86_64.txt
index f5bcb4e658..f5bcb4e658 100644
--- a/contrib/libs/libbz2/CMakeLists.darwin.txt
+++ b/contrib/libs/libbz2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libbz2/CMakeLists.linux.txt b/contrib/libs/libbz2/CMakeLists.linux-x86_64.txt
index 865cd53d18..865cd53d18 100644
--- a/contrib/libs/libbz2/CMakeLists.linux.txt
+++ b/contrib/libs/libbz2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libbz2/CMakeLists.txt b/contrib/libs/libbz2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libbz2/CMakeLists.txt
+++ b/contrib/libs/libbz2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libc_compat/CMakeLists.darwin.txt b/contrib/libs/libc_compat/CMakeLists.darwin-x86_64.txt
index 536ee46c8b..536ee46c8b 100644
--- a/contrib/libs/libc_compat/CMakeLists.darwin.txt
+++ b/contrib/libs/libc_compat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libc_compat/CMakeLists.linux.txt b/contrib/libs/libc_compat/CMakeLists.linux-x86_64.txt
index 66727f3e3e..66727f3e3e 100644
--- a/contrib/libs/libc_compat/CMakeLists.linux.txt
+++ b/contrib/libs/libc_compat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libc_compat/CMakeLists.txt b/contrib/libs/libc_compat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libc_compat/CMakeLists.txt
+++ b/contrib/libs/libc_compat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/CMakeLists.darwin.txt b/contrib/libs/libevent/CMakeLists.darwin-x86_64.txt
index 6b663371d0..6b663371d0 100644
--- a/contrib/libs/libevent/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/CMakeLists.linux.txt b/contrib/libs/libevent/CMakeLists.linux-x86_64.txt
index c718ec93e5..c718ec93e5 100644
--- a/contrib/libs/libevent/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/CMakeLists.txt b/contrib/libs/libevent/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/CMakeLists.txt
+++ b/contrib/libs/libevent/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_core/CMakeLists.darwin.txt b/contrib/libs/libevent/event_core/CMakeLists.darwin-x86_64.txt
index 76257b1032..76257b1032 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_core/CMakeLists.linux.txt b/contrib/libs/libevent/event_core/CMakeLists.linux-x86_64.txt
index 58dc143881..58dc143881 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_core/CMakeLists.txt b/contrib/libs/libevent/event_core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.darwin.txt b/contrib/libs/libevent/event_extra/CMakeLists.darwin-x86_64.txt
index 18fe1e7a8b..18fe1e7a8b 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.linux.txt b/contrib/libs/libevent/event_extra/CMakeLists.linux-x86_64.txt
index 04bb8460ed..04bb8460ed 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.txt b/contrib/libs/libevent/event_extra/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.darwin.txt b/contrib/libs/libevent/event_openssl/CMakeLists.darwin-x86_64.txt
index 09f088478d..09f088478d 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.linux.txt b/contrib/libs/libevent/event_openssl/CMakeLists.linux-x86_64.txt
index 12cc167e6b..12cc167e6b 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.darwin.txt b/contrib/libs/libevent/event_thread/CMakeLists.darwin-x86_64.txt
index 0cbd83fbf4..0cbd83fbf4 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.linux.txt b/contrib/libs/libevent/event_thread/CMakeLists.linux-x86_64.txt
index 27fc1b32f5..27fc1b32f5 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.txt b/contrib/libs/libevent/event_thread/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libfyaml/CMakeLists.darwin.txt b/contrib/libs/libfyaml/CMakeLists.darwin-x86_64.txt
index 0dc91909d1..0dc91909d1 100644
--- a/contrib/libs/libfyaml/CMakeLists.darwin.txt
+++ b/contrib/libs/libfyaml/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libfyaml/CMakeLists.linux.txt b/contrib/libs/libfyaml/CMakeLists.linux-x86_64.txt
index f1c72fcd21..f1c72fcd21 100644
--- a/contrib/libs/libfyaml/CMakeLists.linux.txt
+++ b/contrib/libs/libfyaml/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libfyaml/CMakeLists.txt b/contrib/libs/libfyaml/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libfyaml/CMakeLists.txt
+++ b/contrib/libs/libfyaml/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libunwind/CMakeLists.darwin.txt b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt
index 47aedfab8f..47aedfab8f 100644
--- a/contrib/libs/libunwind/CMakeLists.darwin.txt
+++ b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libunwind/CMakeLists.linux.txt b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt
index 80a28161e0..80a28161e0 100644
--- a/contrib/libs/libunwind/CMakeLists.linux.txt
+++ b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libunwind/CMakeLists.txt b/contrib/libs/libunwind/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libunwind/CMakeLists.txt
+++ b/contrib/libs/libunwind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/liburing/CMakeLists.linux.txt b/contrib/libs/liburing/CMakeLists.linux-x86_64.txt
index 63d62ff3ed..63d62ff3ed 100644
--- a/contrib/libs/liburing/CMakeLists.linux.txt
+++ b/contrib/libs/liburing/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/liburing/CMakeLists.txt b/contrib/libs/liburing/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/liburing/CMakeLists.txt
+++ b/contrib/libs/liburing/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libxml/CMakeLists.darwin.txt b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt
index d593318062..d593318062 100644
--- a/contrib/libs/libxml/CMakeLists.darwin.txt
+++ b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libxml/CMakeLists.linux.txt b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt
index b607fa620b..b607fa620b 100644
--- a/contrib/libs/libxml/CMakeLists.linux.txt
+++ b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libxml/CMakeLists.txt b/contrib/libs/libxml/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libxml/CMakeLists.txt
+++ b/contrib/libs/libxml/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linux-headers/CMakeLists.linux.txt b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt
index 550534bb10..550534bb10 100644
--- a/contrib/libs/linux-headers/CMakeLists.linux.txt
+++ b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linux-headers/CMakeLists.txt b/contrib/libs/linux-headers/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/linux-headers/CMakeLists.txt
+++ b/contrib/libs/linux-headers/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linuxvdso/CMakeLists.darwin.txt b/contrib/libs/linuxvdso/CMakeLists.darwin-x86_64.txt
index a8dd8f11c1..a8dd8f11c1 100644
--- a/contrib/libs/linuxvdso/CMakeLists.darwin.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/linuxvdso/CMakeLists.linux.txt b/contrib/libs/linuxvdso/CMakeLists.linux-x86_64.txt
index 5d4a882319..5d4a882319 100644
--- a/contrib/libs/linuxvdso/CMakeLists.linux.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linuxvdso/CMakeLists.txt b/contrib/libs/linuxvdso/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/linuxvdso/CMakeLists.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linuxvdso/original/CMakeLists.linux.txt b/contrib/libs/linuxvdso/original/CMakeLists.linux-x86_64.txt
index 92603f7489..92603f7489 100644
--- a/contrib/libs/linuxvdso/original/CMakeLists.linux.txt
+++ b/contrib/libs/linuxvdso/original/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linuxvdso/original/CMakeLists.txt b/contrib/libs/linuxvdso/original/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/linuxvdso/original/CMakeLists.txt
+++ b/contrib/libs/linuxvdso/original/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/CMakeLists.darwin.txt b/contrib/libs/llvm12/CMakeLists.darwin-x86_64.txt
index 953c61faac..953c61faac 100644
--- a/contrib/libs/llvm12/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/CMakeLists.linux.txt b/contrib/libs/llvm12/CMakeLists.linux-x86_64.txt
index 21e1679e2d..21e1679e2d 100644
--- a/contrib/libs/llvm12/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/CMakeLists.txt b/contrib/libs/llvm12/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/CMakeLists.txt
+++ b/contrib/libs/llvm12/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/include/CMakeLists.darwin.txt b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt
index 7ea3024199..7ea3024199 100644
--- a/contrib/libs/llvm12/include/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/include/CMakeLists.linux.txt b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt
index 468c652df5..468c652df5 100644
--- a/contrib/libs/llvm12/include/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/include/CMakeLists.txt b/contrib/libs/llvm12/include/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/include/CMakeLists.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin-x86_64.txt
index 2ba11227e1..2ba11227e1 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux-x86_64.txt
index 753119c17f..753119c17f 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin-x86_64.txt
index 36839293f4..36839293f4 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux-x86_64.txt
index 558f82cd5d..558f82cd5d 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin-x86_64.txt
index 96149cac1f..96149cac1f 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux-x86_64.txt
index a10c5f413a..a10c5f413a 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin-x86_64.txt
index 39b2ea7c63..39b2ea7c63 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux-x86_64.txt
index 88a0842ef9..88a0842ef9 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin-x86_64.txt
index 60790bac2e..60790bac2e 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux-x86_64.txt
index 7bab4525b2..7bab4525b2 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin-x86_64.txt
index 99a4a604d6..99a4a604d6 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux-x86_64.txt
index 421708b1ee..421708b1ee 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin-x86_64.txt
index bcefc411a0..bcefc411a0 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux-x86_64.txt
index 8a9a46ad09..8a9a46ad09 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin-x86_64.txt
index 8e35eefddb..8e35eefddb 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux-x86_64.txt
index ab68b24331..ab68b24331 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin-x86_64.txt
index 27309bf40c..27309bf40c 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux-x86_64.txt
index 356c3e6fed..356c3e6fed 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin-x86_64.txt
index 4e4dec12da..4e4dec12da 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux-x86_64.txt
index a29c8b0bd7..a29c8b0bd7 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin-x86_64.txt
index 2d33903161..2d33903161 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux-x86_64.txt
index 8069320e81..8069320e81 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin-x86_64.txt
index 2b5a8b0bd7..2b5a8b0bd7 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux-x86_64.txt
index 99bb6435ef..99bb6435ef 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin-x86_64.txt
index 333a23b759..333a23b759 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux-x86_64.txt
index 0afe1e70f0..0afe1e70f0 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin-x86_64.txt
index 499426d8b6..499426d8b6 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux-x86_64.txt
index e5b50385a4..e5b50385a4 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin-x86_64.txt
index 39a3b7dec0..39a3b7dec0 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux-x86_64.txt
index dff4e05e8d..dff4e05e8d 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin-x86_64.txt
index 8ce23b0d3b..8ce23b0d3b 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux-x86_64.txt
index 91665dd594..91665dd594 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin-x86_64.txt
index 8822271bb6..8822271bb6 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux-x86_64.txt
index 0b5d23d06f..0b5d23d06f 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin-x86_64.txt
index 5404346e22..5404346e22 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux-x86_64.txt
index e2731cdb21..e2731cdb21 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux-x86_64.txt
index 99bf1810a2..99bf1810a2 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin-x86_64.txt
index a55dda54ce..a55dda54ce 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux-x86_64.txt
index f79d0d9af0..f79d0d9af0 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt
index ff198fe772..ff198fe772 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt
index 879a65a6cb..879a65a6cb 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.darwin-x86_64.txt
index 39523b06af..39523b06af 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.linux-x86_64.txt
index 1ec678d8d5..1ec678d8d5 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin-x86_64.txt
index bea3fbc885..bea3fbc885 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux-x86_64.txt
index 2fc3d6c781..2fc3d6c781 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin-x86_64.txt
index 1b6e260057..1b6e260057 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.linux-x86_64.txt
index 0008227988..0008227988 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.darwin-x86_64.txt
index a873c2d122..a873c2d122 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.linux-x86_64.txt
index 62a27d359d..62a27d359d 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin-x86_64.txt
index a2bee93bc4..a2bee93bc4 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux-x86_64.txt
index a6713624c1..a6713624c1 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin-x86_64.txt
index e947a4a7c4..e947a4a7c4 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux-x86_64.txt
index 5385e415dd..5385e415dd 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.darwin-x86_64.txt
index f1207f4b5d..f1207f4b5d 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.linux-x86_64.txt
index 45fb57f72c..45fb57f72c 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin-x86_64.txt
index 3e79d53db2..3e79d53db2 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux-x86_64.txt
index 8dbd3c6d65..8dbd3c6d65 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin-x86_64.txt
index edd1e0fe35..edd1e0fe35 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux-x86_64.txt
index ab39010290..ab39010290 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.darwin-x86_64.txt
index e00be62440..e00be62440 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.linux-x86_64.txt
index 89974d62a5..89974d62a5 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin-x86_64.txt
index 6f2ec53956..6f2ec53956 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux-x86_64.txt
index 13e6f13167..13e6f13167 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.darwin-x86_64.txt
index d8ccbcb7dc..d8ccbcb7dc 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.linux-x86_64.txt
index cf814ae947..cf814ae947 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin-x86_64.txt
index 122aabfd9c..122aabfd9c 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux-x86_64.txt
index 30cd4e60a5..30cd4e60a5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin-x86_64.txt
index aaa8d6337d..aaa8d6337d 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux-x86_64.txt
index 982a7323e1..982a7323e1 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin-x86_64.txt
index 9aeb4c5140..9aeb4c5140 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux-x86_64.txt
index eecb1b3d5f..eecb1b3d5f 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin-x86_64.txt
index d38e0dc78b..d38e0dc78b 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux-x86_64.txt
index 8f818b1bf0..8f818b1bf0 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin-x86_64.txt
index f8e6afeb96..f8e6afeb96 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux-x86_64.txt
index 776f51f91d..776f51f91d 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin-x86_64.txt
index 507d58e59b..507d58e59b 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux-x86_64.txt
index 4914b7d4f3..4914b7d4f3 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin-x86_64.txt
index 5ca07fe1bc..5ca07fe1bc 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux-x86_64.txt
index b1a4c8817a..b1a4c8817a 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin-x86_64.txt
index bdf9095525..bdf9095525 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux-x86_64.txt
index ee458414a0..ee458414a0 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin-x86_64.txt
index a703571757..a703571757 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux-x86_64.txt
index 00fbb651b8..00fbb651b8 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin-x86_64.txt
index 1d62defbb4..1d62defbb4 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux-x86_64.txt
index 870556286d..870556286d 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin-x86_64.txt
index bf742c3572..bf742c3572 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux-x86_64.txt
index 1c1b924cc4..1c1b924cc4 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin-x86_64.txt
index b69d2408d2..b69d2408d2 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux-x86_64.txt
index 17250eafec..17250eafec 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin-x86_64.txt
index 85fbc1b9a9..85fbc1b9a9 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux-x86_64.txt
index b8137e772b..b8137e772b 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin-x86_64.txt
index 85ed4a4c6d..85ed4a4c6d 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux-x86_64.txt
index f9c59ee4c3..f9c59ee4c3 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin-x86_64.txt
index d45ba449fd..d45ba449fd 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux-x86_64.txt
index b0d2491235..b0d2491235 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin-x86_64.txt
index ef39d6fd6e..ef39d6fd6e 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-x86_64.txt
index d8d6dc0ce5..d8d6dc0ce5 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin-x86_64.txt
index 7ab180f92f..7ab180f92f 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux-x86_64.txt
index bb006dd12d..bb006dd12d 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lua/CMakeLists.darwin.txt b/contrib/libs/lua/CMakeLists.darwin-x86_64.txt
index b8bb770b44..b8bb770b44 100644
--- a/contrib/libs/lua/CMakeLists.darwin.txt
+++ b/contrib/libs/lua/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lua/CMakeLists.linux.txt b/contrib/libs/lua/CMakeLists.linux-x86_64.txt
index c9c201999b..c9c201999b 100644
--- a/contrib/libs/lua/CMakeLists.linux.txt
+++ b/contrib/libs/lua/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lua/CMakeLists.txt b/contrib/libs/lua/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lua/CMakeLists.txt
+++ b/contrib/libs/lua/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lz4/CMakeLists.darwin.txt b/contrib/libs/lz4/CMakeLists.darwin-x86_64.txt
index 970c719b71..970c719b71 100644
--- a/contrib/libs/lz4/CMakeLists.darwin.txt
+++ b/contrib/libs/lz4/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lz4/CMakeLists.linux.txt b/contrib/libs/lz4/CMakeLists.linux-x86_64.txt
index 696aaa0056..696aaa0056 100644
--- a/contrib/libs/lz4/CMakeLists.linux.txt
+++ b/contrib/libs/lz4/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lz4/CMakeLists.txt b/contrib/libs/lz4/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lz4/CMakeLists.txt
+++ b/contrib/libs/lz4/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lzma/CMakeLists.darwin.txt b/contrib/libs/lzma/CMakeLists.darwin-x86_64.txt
index d525ab738b..d525ab738b 100644
--- a/contrib/libs/lzma/CMakeLists.darwin.txt
+++ b/contrib/libs/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lzma/CMakeLists.linux.txt b/contrib/libs/lzma/CMakeLists.linux-x86_64.txt
index 1be6e4f2c7..1be6e4f2c7 100644
--- a/contrib/libs/lzma/CMakeLists.linux.txt
+++ b/contrib/libs/lzma/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lzma/CMakeLists.txt b/contrib/libs/lzma/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lzma/CMakeLists.txt
+++ b/contrib/libs/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lzmasdk/CMakeLists.darwin.txt b/contrib/libs/lzmasdk/CMakeLists.darwin-x86_64.txt
index fa5ab87a58..fa5ab87a58 100644
--- a/contrib/libs/lzmasdk/CMakeLists.darwin.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lzmasdk/CMakeLists.linux.txt b/contrib/libs/lzmasdk/CMakeLists.linux-x86_64.txt
index 446f28a8ed..446f28a8ed 100644
--- a/contrib/libs/lzmasdk/CMakeLists.linux.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lzmasdk/CMakeLists.txt b/contrib/libs/lzmasdk/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lzmasdk/CMakeLists.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/miniselect/CMakeLists.darwin.txt b/contrib/libs/miniselect/CMakeLists.darwin-x86_64.txt
index f51760c82e..f51760c82e 100644
--- a/contrib/libs/miniselect/CMakeLists.darwin.txt
+++ b/contrib/libs/miniselect/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/miniselect/CMakeLists.linux.txt b/contrib/libs/miniselect/CMakeLists.linux-x86_64.txt
index ff3e8d2dd3..ff3e8d2dd3 100644
--- a/contrib/libs/miniselect/CMakeLists.linux.txt
+++ b/contrib/libs/miniselect/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/miniselect/CMakeLists.txt b/contrib/libs/miniselect/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/miniselect/CMakeLists.txt
+++ b/contrib/libs/miniselect/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/nayuki_md5/CMakeLists.darwin.txt b/contrib/libs/nayuki_md5/CMakeLists.darwin-x86_64.txt
index aa5e1ba2a7..aa5e1ba2a7 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.darwin.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/nayuki_md5/CMakeLists.linux.txt b/contrib/libs/nayuki_md5/CMakeLists.linux-x86_64.txt
index 805840b5cd..805840b5cd 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.linux.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/nayuki_md5/CMakeLists.txt b/contrib/libs/nayuki_md5/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/nghttp2/CMakeLists.darwin.txt b/contrib/libs/nghttp2/CMakeLists.darwin-x86_64.txt
index e6d5bc3ea1..e6d5bc3ea1 100644
--- a/contrib/libs/nghttp2/CMakeLists.darwin.txt
+++ b/contrib/libs/nghttp2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/nghttp2/CMakeLists.linux.txt b/contrib/libs/nghttp2/CMakeLists.linux-x86_64.txt
index 3224ad6131..3224ad6131 100644
--- a/contrib/libs/nghttp2/CMakeLists.linux.txt
+++ b/contrib/libs/nghttp2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/nghttp2/CMakeLists.txt b/contrib/libs/nghttp2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/nghttp2/CMakeLists.txt
+++ b/contrib/libs/nghttp2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/CMakeLists.darwin.txt b/contrib/libs/pcre/CMakeLists.darwin-x86_64.txt
index d217f5c0b3..d217f5c0b3 100644
--- a/contrib/libs/pcre/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/CMakeLists.linux.txt b/contrib/libs/pcre/CMakeLists.linux-x86_64.txt
index 3051404f46..3051404f46 100644
--- a/contrib/libs/pcre/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/CMakeLists.txt b/contrib/libs/pcre/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/CMakeLists.txt
+++ b/contrib/libs/pcre/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.darwin.txt b/contrib/libs/pcre/pcre16/CMakeLists.darwin-x86_64.txt
index 5f646dba67..5f646dba67 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.linux.txt b/contrib/libs/pcre/pcre16/CMakeLists.linux-x86_64.txt
index 22abfadba3..22abfadba3 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.txt b/contrib/libs/pcre/pcre16/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.darwin.txt b/contrib/libs/pcre/pcre32/CMakeLists.darwin-x86_64.txt
index 2be6098116..2be6098116 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.linux.txt b/contrib/libs/pcre/pcre32/CMakeLists.linux-x86_64.txt
index f8269b2859..f8269b2859 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.txt b/contrib/libs/pcre/pcre32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pdqsort/CMakeLists.darwin.txt b/contrib/libs/pdqsort/CMakeLists.darwin-x86_64.txt
index 7041694f05..7041694f05 100644
--- a/contrib/libs/pdqsort/CMakeLists.darwin.txt
+++ b/contrib/libs/pdqsort/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pdqsort/CMakeLists.linux.txt b/contrib/libs/pdqsort/CMakeLists.linux-x86_64.txt
index 9824fa0017..9824fa0017 100644
--- a/contrib/libs/pdqsort/CMakeLists.linux.txt
+++ b/contrib/libs/pdqsort/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pdqsort/CMakeLists.txt b/contrib/libs/pdqsort/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pdqsort/CMakeLists.txt
+++ b/contrib/libs/pdqsort/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Crypto/CMakeLists.darwin.txt b/contrib/libs/poco/Crypto/CMakeLists.darwin-x86_64.txt
index 431de24a13..431de24a13 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Crypto/CMakeLists.linux.txt b/contrib/libs/poco/Crypto/CMakeLists.linux-x86_64.txt
index 0638e0d219..0638e0d219 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Foundation/CMakeLists.darwin.txt b/contrib/libs/poco/Foundation/CMakeLists.darwin-x86_64.txt
index 8b1e0a65b5..8b1e0a65b5 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Foundation/CMakeLists.linux.txt b/contrib/libs/poco/Foundation/CMakeLists.linux-x86_64.txt
index 781a72b811..781a72b811 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/JSON/CMakeLists.darwin.txt b/contrib/libs/poco/JSON/CMakeLists.darwin-x86_64.txt
index 403b3bc5c6..403b3bc5c6 100644
--- a/contrib/libs/poco/JSON/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/JSON/CMakeLists.linux.txt b/contrib/libs/poco/JSON/CMakeLists.linux-x86_64.txt
index 03b67f2fd7..03b67f2fd7 100644
--- a/contrib/libs/poco/JSON/CMakeLists.linux.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/JSON/CMakeLists.txt b/contrib/libs/poco/JSON/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/JSON/CMakeLists.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Net/CMakeLists.darwin.txt b/contrib/libs/poco/Net/CMakeLists.darwin-x86_64.txt
index 4dd5878c21..4dd5878c21 100644
--- a/contrib/libs/poco/Net/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Net/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Net/CMakeLists.linux.txt b/contrib/libs/poco/Net/CMakeLists.linux-x86_64.txt
index cf62029e71..cf62029e71 100644
--- a/contrib/libs/poco/Net/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Net/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Net/CMakeLists.txt b/contrib/libs/poco/Net/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Net/CMakeLists.txt
+++ b/contrib/libs/poco/Net/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin-x86_64.txt
index 4d7e2f17c0..4d7e2f17c0 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux-x86_64.txt
index 7eab9ec512..7eab9ec512 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Util/CMakeLists.darwin.txt b/contrib/libs/poco/Util/CMakeLists.darwin-x86_64.txt
index 813912d18d..813912d18d 100644
--- a/contrib/libs/poco/Util/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Util/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Util/CMakeLists.linux.txt b/contrib/libs/poco/Util/CMakeLists.linux-x86_64.txt
index 56c49ac4c6..56c49ac4c6 100644
--- a/contrib/libs/poco/Util/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Util/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Util/CMakeLists.txt b/contrib/libs/poco/Util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Util/CMakeLists.txt
+++ b/contrib/libs/poco/Util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/XML/CMakeLists.darwin.txt b/contrib/libs/poco/XML/CMakeLists.darwin-x86_64.txt
index 5e02faf42f..5e02faf42f 100644
--- a/contrib/libs/poco/XML/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/XML/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/XML/CMakeLists.linux.txt b/contrib/libs/poco/XML/CMakeLists.linux-x86_64.txt
index 803edf0122..803edf0122 100644
--- a/contrib/libs/poco/XML/CMakeLists.linux.txt
+++ b/contrib/libs/poco/XML/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/XML/CMakeLists.txt b/contrib/libs/poco/XML/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/XML/CMakeLists.txt
+++ b/contrib/libs/poco/XML/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/protobuf/CMakeLists.darwin.txt b/contrib/libs/protobuf/CMakeLists.darwin-x86_64.txt
index 940e5e3a99..940e5e3a99 100644
--- a/contrib/libs/protobuf/CMakeLists.darwin.txt
+++ b/contrib/libs/protobuf/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/protobuf/CMakeLists.linux.txt b/contrib/libs/protobuf/CMakeLists.linux-x86_64.txt
index af2c6d8404..af2c6d8404 100644
--- a/contrib/libs/protobuf/CMakeLists.linux.txt
+++ b/contrib/libs/protobuf/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/protobuf/CMakeLists.txt b/contrib/libs/protobuf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/protobuf/CMakeLists.txt
+++ b/contrib/libs/protobuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/protoc/CMakeLists.darwin.txt b/contrib/libs/protoc/CMakeLists.darwin-x86_64.txt
index 4cce10e7b9..4cce10e7b9 100644
--- a/contrib/libs/protoc/CMakeLists.darwin.txt
+++ b/contrib/libs/protoc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/protoc/CMakeLists.linux.txt b/contrib/libs/protoc/CMakeLists.linux-x86_64.txt
index b6a3dcc4bc..b6a3dcc4bc 100644
--- a/contrib/libs/protoc/CMakeLists.linux.txt
+++ b/contrib/libs/protoc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/protoc/CMakeLists.txt b/contrib/libs/protoc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/protoc/CMakeLists.txt
+++ b/contrib/libs/protoc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/rapidjson/CMakeLists.darwin.txt b/contrib/libs/rapidjson/CMakeLists.darwin-x86_64.txt
index eb8dce44f8..eb8dce44f8 100644
--- a/contrib/libs/rapidjson/CMakeLists.darwin.txt
+++ b/contrib/libs/rapidjson/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/rapidjson/CMakeLists.linux.txt b/contrib/libs/rapidjson/CMakeLists.linux-x86_64.txt
index a6f2faf478..a6f2faf478 100644
--- a/contrib/libs/rapidjson/CMakeLists.linux.txt
+++ b/contrib/libs/rapidjson/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/rapidjson/CMakeLists.txt b/contrib/libs/rapidjson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/rapidjson/CMakeLists.txt
+++ b/contrib/libs/rapidjson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/re2/CMakeLists.darwin.txt b/contrib/libs/re2/CMakeLists.darwin-x86_64.txt
index 0c93126cd1..0c93126cd1 100644
--- a/contrib/libs/re2/CMakeLists.darwin.txt
+++ b/contrib/libs/re2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/re2/CMakeLists.linux.txt b/contrib/libs/re2/CMakeLists.linux-x86_64.txt
index ed757c6e17..ed757c6e17 100644
--- a/contrib/libs/re2/CMakeLists.linux.txt
+++ b/contrib/libs/re2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/re2/CMakeLists.txt b/contrib/libs/re2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/re2/CMakeLists.txt
+++ b/contrib/libs/re2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/snappy/CMakeLists.darwin.txt b/contrib/libs/snappy/CMakeLists.darwin-x86_64.txt
index 5e20f5ea3d..5e20f5ea3d 100644
--- a/contrib/libs/snappy/CMakeLists.darwin.txt
+++ b/contrib/libs/snappy/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/snappy/CMakeLists.linux.txt b/contrib/libs/snappy/CMakeLists.linux-x86_64.txt
index 732c5e5474..732c5e5474 100644
--- a/contrib/libs/snappy/CMakeLists.linux.txt
+++ b/contrib/libs/snappy/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/snappy/CMakeLists.txt b/contrib/libs/snappy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/snappy/CMakeLists.txt
+++ b/contrib/libs/snappy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/sparsehash/CMakeLists.darwin.txt b/contrib/libs/sparsehash/CMakeLists.darwin-x86_64.txt
index 0de0e50d71..0de0e50d71 100644
--- a/contrib/libs/sparsehash/CMakeLists.darwin.txt
+++ b/contrib/libs/sparsehash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/sparsehash/CMakeLists.linux.txt b/contrib/libs/sparsehash/CMakeLists.linux-x86_64.txt
index ddcaf918dc..ddcaf918dc 100644
--- a/contrib/libs/sparsehash/CMakeLists.linux.txt
+++ b/contrib/libs/sparsehash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/sparsehash/CMakeLists.txt b/contrib/libs/sparsehash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/sparsehash/CMakeLists.txt
+++ b/contrib/libs/sparsehash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/t1ha/CMakeLists.darwin.txt b/contrib/libs/t1ha/CMakeLists.darwin-x86_64.txt
index cf6ef99511..cf6ef99511 100644
--- a/contrib/libs/t1ha/CMakeLists.darwin.txt
+++ b/contrib/libs/t1ha/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/t1ha/CMakeLists.linux.txt b/contrib/libs/t1ha/CMakeLists.linux-x86_64.txt
index 7f2893caa3..7f2893caa3 100644
--- a/contrib/libs/t1ha/CMakeLists.linux.txt
+++ b/contrib/libs/t1ha/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/t1ha/CMakeLists.txt b/contrib/libs/t1ha/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/t1ha/CMakeLists.txt
+++ b/contrib/libs/t1ha/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tbb/CMakeLists.darwin.txt b/contrib/libs/tbb/CMakeLists.darwin-x86_64.txt
index a34e19b4a0..a34e19b4a0 100644
--- a/contrib/libs/tbb/CMakeLists.darwin.txt
+++ b/contrib/libs/tbb/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tbb/CMakeLists.linux.txt b/contrib/libs/tbb/CMakeLists.linux-x86_64.txt
index 4e7404a3da..4e7404a3da 100644
--- a/contrib/libs/tbb/CMakeLists.linux.txt
+++ b/contrib/libs/tbb/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tbb/CMakeLists.txt b/contrib/libs/tbb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tbb/CMakeLists.txt
+++ b/contrib/libs/tbb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/CMakeLists.darwin.txt b/contrib/libs/tcmalloc/CMakeLists.darwin-x86_64.txt
index daf0950e7c..daf0950e7c 100644
--- a/contrib/libs/tcmalloc/CMakeLists.darwin.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tcmalloc/CMakeLists.linux.txt b/contrib/libs/tcmalloc/CMakeLists.linux-x86_64.txt
index 53fb70fafa..53fb70fafa 100644
--- a/contrib/libs/tcmalloc/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/CMakeLists.txt b/contrib/libs/tcmalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tcmalloc/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin-x86_64.txt
index ff72551b97..ff72551b97 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux-x86_64.txt
index 4fc12f623d..4fc12f623d 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux-x86_64.txt
index 7a19810cba..7a19810cba 100644
--- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
index 200be30d20..9e182254db 100644
--- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/utf8proc/CMakeLists.darwin.txt b/contrib/libs/utf8proc/CMakeLists.darwin-x86_64.txt
index da6056a44b..da6056a44b 100644
--- a/contrib/libs/utf8proc/CMakeLists.darwin.txt
+++ b/contrib/libs/utf8proc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/utf8proc/CMakeLists.linux.txt b/contrib/libs/utf8proc/CMakeLists.linux-x86_64.txt
index 321e8eac3f..321e8eac3f 100644
--- a/contrib/libs/utf8proc/CMakeLists.linux.txt
+++ b/contrib/libs/utf8proc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/utf8proc/CMakeLists.txt b/contrib/libs/utf8proc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/utf8proc/CMakeLists.txt
+++ b/contrib/libs/utf8proc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/xxhash/CMakeLists.darwin.txt b/contrib/libs/xxhash/CMakeLists.darwin-x86_64.txt
index 2afaa79b4e..2afaa79b4e 100644
--- a/contrib/libs/xxhash/CMakeLists.darwin.txt
+++ b/contrib/libs/xxhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/xxhash/CMakeLists.linux.txt b/contrib/libs/xxhash/CMakeLists.linux-x86_64.txt
index 0bc17080e1..0bc17080e1 100644
--- a/contrib/libs/xxhash/CMakeLists.linux.txt
+++ b/contrib/libs/xxhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/xxhash/CMakeLists.txt b/contrib/libs/xxhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/xxhash/CMakeLists.txt
+++ b/contrib/libs/xxhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/yaml-cpp/CMakeLists.darwin.txt b/contrib/libs/yaml-cpp/CMakeLists.darwin-x86_64.txt
index e5b20eefab..e5b20eefab 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.darwin.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/yaml-cpp/CMakeLists.linux.txt b/contrib/libs/yaml-cpp/CMakeLists.linux-x86_64.txt
index 4daaa9883a..4daaa9883a 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.linux.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/yaml-cpp/CMakeLists.txt b/contrib/libs/yaml-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/zstd/CMakeLists.darwin.txt b/contrib/libs/zstd/CMakeLists.darwin-x86_64.txt
index f88c0aa5f3..f88c0aa5f3 100644
--- a/contrib/libs/zstd/CMakeLists.darwin.txt
+++ b/contrib/libs/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/zstd/CMakeLists.linux.txt b/contrib/libs/zstd/CMakeLists.linux-x86_64.txt
index 1945bc36fe..1945bc36fe 100644
--- a/contrib/libs/zstd/CMakeLists.linux.txt
+++ b/contrib/libs/zstd/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/zstd/CMakeLists.txt b/contrib/libs/zstd/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/zstd/CMakeLists.txt
+++ b/contrib/libs/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/zstd06/CMakeLists.darwin.txt b/contrib/libs/zstd06/CMakeLists.darwin-x86_64.txt
index b20e4ae1f5..b20e4ae1f5 100644
--- a/contrib/libs/zstd06/CMakeLists.darwin.txt
+++ b/contrib/libs/zstd06/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/zstd06/CMakeLists.linux.txt b/contrib/libs/zstd06/CMakeLists.linux-x86_64.txt
index 2934739ddc..2934739ddc 100644
--- a/contrib/libs/zstd06/CMakeLists.linux.txt
+++ b/contrib/libs/zstd06/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/zstd06/CMakeLists.txt b/contrib/libs/zstd06/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/zstd06/CMakeLists.txt
+++ b/contrib/libs/zstd06/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()