Intermediate changes

865 files changed, 575 insertions, 575 deletions

diff --git a/contrib/libs/CMakeLists.darwin.txt b/contrib/libs/CMakeLists.darwin-x86_64.txt
index 8f275017547..8f275017547 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 797ac4fd05b..797ac4fd05b 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 eee324bb607..8f8c04afe54 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 8818693c62b..8818693c62b 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 e8fba8e6367..e8fba8e6367 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 eee324bb607..8f8c04afe54 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 dba4c90c1f9..dba4c90c1f9 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 b638c396edd..b638c396edd 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 eee324bb607..8f8c04afe54 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 303febcc155..303febcc155 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 214360c135d..214360c135d 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 eee324bb607..8f8c04afe54 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 45e01d7a291..45e01d7a291 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 1a7d3d48e7c..1a7d3d48e7c 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 eee324bb607..8f8c04afe54 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 0330c951bee..0330c951bee 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 fc60527db38..fc60527db38 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 eee324bb607..8f8c04afe54 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 1b1705649a5..1b1705649a5 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 114aa69426b..114aa69426b 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 eee324bb607..8f8c04afe54 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 b2e29c7a011..b2e29c7a011 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 b528c1f5998..b528c1f5998 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 eee324bb607..8f8c04afe54 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 a7ec94e9d01..a7ec94e9d01 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 2b3ad9b62d4..2b3ad9b62d4 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 eee324bb607..8f8c04afe54 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 732c4dd3754..732c4dd3754 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 e4923670c8e..e4923670c8e 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 eee324bb607..8f8c04afe54 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 d06a76d91a2..d06a76d91a2 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 edca2dcad49..edca2dcad49 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 eee324bb607..8f8c04afe54 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 9ccfdf670c4..9ccfdf670c4 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 722ac9fd408..722ac9fd408 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 eee324bb607..8f8c04afe54 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 e1d78be6e02..e1d78be6e02 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 f019ec569f9..f019ec569f9 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 eee324bb607..8f8c04afe54 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 0acd28e7cdb..0acd28e7cdb 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 f40a7896b98..f40a7896b98 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 eee324bb607..8f8c04afe54 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 5d11acad56d..5d11acad56d 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 6283846aef3..6283846aef3 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 eee324bb607..8f8c04afe54 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 297dae75337..297dae75337 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 1fd39e41209..1fd39e41209 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 eee324bb607..8f8c04afe54 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 a4e9994f8ad..a4e9994f8ad 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 5d6f6aabc8a..5d6f6aabc8a 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 eee324bb607..8f8c04afe54 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 86cdc28b8f7..86cdc28b8f7 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 e6a5c8c8a5d..e6a5c8c8a5d 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 eee324bb607..8f8c04afe54 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 0f492532e9d..0f492532e9d 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 24b6c4fac2f..24b6c4fac2f 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 eee324bb607..8f8c04afe54 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 7a5fb608355..7a5fb608355 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 5609bd43b30..5609bd43b30 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 eee324bb607..8f8c04afe54 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 231e81c8eee..231e81c8eee 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 ea5f7a2498b..ea5f7a2498b 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 eee324bb607..8f8c04afe54 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 dfe59125b53..dfe59125b53 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 b4d38acc9dd..b4d38acc9dd 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 eee324bb607..8f8c04afe54 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 b1aef2a37a4..b1aef2a37a4 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 edaf849b79c..edaf849b79c 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 eee324bb607..8f8c04afe54 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 22f534fcdd5..22f534fcdd5 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 144c793693f..144c793693f 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 eee324bb607..8f8c04afe54 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 1a5dff57185..1a5dff57185 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 e6b6dbf847d..e6b6dbf847d 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 eee324bb607..8f8c04afe54 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 69a5bc6b49f..69a5bc6b49f 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 7599b38c4d9..7599b38c4d9 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 eee324bb607..8f8c04afe54 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 374256f11fb..374256f11fb 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 6962df9bdbb..6962df9bdbb 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 eee324bb607..8f8c04afe54 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 aeb7bb29c0e..aeb7bb29c0e 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 e4fa621f996..e4fa621f996 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 eee324bb607..8f8c04afe54 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 921c50874ea..921c50874ea 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 d39e6b6a78e..d39e6b6a78e 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 eee324bb607..8f8c04afe54 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 92f77b4d9a6..92f77b4d9a6 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 a9197f9c439..a9197f9c439 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 eee324bb607..8f8c04afe54 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 c73d04f960e..c73d04f960e 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 b0bb6a58601..b0bb6a58601 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 eee324bb607..8f8c04afe54 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 eab41c060a7..eab41c060a7 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 e6a67c5372d..e6a67c5372d 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 eee324bb607..8f8c04afe54 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 a9d78d75992..a9d78d75992 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 0bff6a51f6b..0bff6a51f6b 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 eee324bb607..8f8c04afe54 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 a88074fd9d9..a88074fd9d9 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 a98aba7303a..a98aba7303a 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 eee324bb607..8f8c04afe54 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 011ef6a6c86..011ef6a6c86 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 f8cfeeb41d8..f8cfeeb41d8 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 eee324bb607..8f8c04afe54 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 c075387f004..c075387f004 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 5d50080edc9..5d50080edc9 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 eee324bb607..8f8c04afe54 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 769add5f8b1..769add5f8b1 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 5df7d108675..5df7d108675 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 eee324bb607..8f8c04afe54 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 2978b68ec9e..2978b68ec9e 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 61de386d30b..61de386d30b 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 eee324bb607..8f8c04afe54 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 8cc336fdd1a..8cc336fdd1a 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 baa66b76fec..baa66b76fec 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 eee324bb607..8f8c04afe54 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 984a14ba7c6..984a14ba7c6 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 8cffe390288..8cffe390288 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 eee324bb607..8f8c04afe54 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 3877a3a7da6..3877a3a7da6 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 3877a3a7da6..3877a3a7da6 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 0f8cf0fb161..a603bef54ed 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 d98bd38fb80..d98bd38fb80 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 502e383f491..502e383f491 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 0f8cf0fb161..a603bef54ed 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 644e629a9cd..644e629a9cd 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 52b6a35b110..52b6a35b110 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 0f8cf0fb161..a603bef54ed 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 8576e86aab3..8576e86aab3 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 06e680fc7ee..06e680fc7ee 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 0f8cf0fb161..a603bef54ed 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 85764417b72..85764417b72 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 8bae6021022..8bae6021022 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 0f8cf0fb161..a603bef54ed 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 e11134a46a8..e11134a46a8 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 411a9453a3e..411a9453a3e 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 0f8cf0fb161..a603bef54ed 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 63b5a339891..63b5a339891 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 9bb42a05f96..9bb42a05f96 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 0f8cf0fb161..a603bef54ed 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 c3088fa842c..c3088fa842c 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 c1878d2ffcf..c1878d2ffcf 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 0f8cf0fb161..a603bef54ed 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 6e164c5f6a7..6e164c5f6a7 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 420ab30dd35..420ab30dd35 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 eee324bb607..8f8c04afe54 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 8e041153f28..8e041153f28 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 e06c0a57bd2..e06c0a57bd2 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 eee324bb607..8f8c04afe54 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 84e3c97df1d..84e3c97df1d 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 26b43ddf096..26b43ddf096 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 eee324bb607..8f8c04afe54 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 f5bcb4e6581..f5bcb4e6581 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 865cd53d18e..865cd53d18e 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 eee324bb607..8f8c04afe54 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 536ee46c8bb..536ee46c8bb 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 66727f3e3e8..66727f3e3e8 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 eee324bb607..8f8c04afe54 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 6b663371d0b..6b663371d0b 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 c718ec93e51..c718ec93e51 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 eee324bb607..8f8c04afe54 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 76257b1032e..76257b1032e 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 58dc1438819..58dc1438819 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 eee324bb607..8f8c04afe54 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 18fe1e7a8bb..18fe1e7a8bb 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 04bb8460edf..04bb8460edf 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 eee324bb607..8f8c04afe54 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 09f088478d2..09f088478d2 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 12cc167e6b6..12cc167e6b6 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 eee324bb607..8f8c04afe54 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 0cbd83fbf44..0cbd83fbf44 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 27fc1b32f58..27fc1b32f58 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 eee324bb607..8f8c04afe54 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 0dc91909d1b..0dc91909d1b 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 f1c72fcd211..f1c72fcd211 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 eee324bb607..8f8c04afe54 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 47aedfab8fa..47aedfab8fa 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 80a28161e0b..80a28161e0b 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 eee324bb607..8f8c04afe54 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 63d62ff3ed1..63d62ff3ed1 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 ba630c0cc43..4349073206f 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 d593318062c..d593318062c 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 b607fa620b1..b607fa620b1 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 eee324bb607..8f8c04afe54 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 550534bb102..550534bb102 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 ba630c0cc43..4349073206f 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 a8dd8f11c1e..a8dd8f11c1e 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 5d4a8823193..5d4a8823193 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 eee324bb607..8f8c04afe54 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 92603f7489a..92603f7489a 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 ba630c0cc43..4349073206f 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 953c61faacd..953c61faacd 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 21e1679e2d6..21e1679e2d6 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 eee324bb607..8f8c04afe54 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 7ea3024199a..7ea3024199a 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 468c652df5d..468c652df5d 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 eee324bb607..8f8c04afe54 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 2ba11227e11..2ba11227e11 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 753119c17f2..753119c17f2 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 eee324bb607..8f8c04afe54 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 36839293f43..36839293f43 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 558f82cd5d2..558f82cd5d2 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 eee324bb607..8f8c04afe54 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 96149cac1fd..96149cac1fd 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 a10c5f413a6..a10c5f413a6 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 eee324bb607..8f8c04afe54 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 39b2ea7c63f..39b2ea7c63f 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 88a0842ef99..88a0842ef99 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 eee324bb607..8f8c04afe54 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 60790bac2e3..60790bac2e3 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 7bab4525b28..7bab4525b28 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 eee324bb607..8f8c04afe54 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 99a4a604d61..99a4a604d61 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 421708b1eea..421708b1eea 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 eee324bb607..8f8c04afe54 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 bcefc411a02..bcefc411a02 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 8a9a46ad09e..8a9a46ad09e 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 eee324bb607..8f8c04afe54 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 8e35eefddb6..8e35eefddb6 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 ab68b24331a..ab68b24331a 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 eee324bb607..8f8c04afe54 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 27309bf40c1..27309bf40c1 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 356c3e6fed9..356c3e6fed9 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 eee324bb607..8f8c04afe54 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 4e4dec12dae..4e4dec12dae 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 a29c8b0bd72..a29c8b0bd72 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 eee324bb607..8f8c04afe54 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 2d339031612..2d339031612 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 8069320e816..8069320e816 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 eee324bb607..8f8c04afe54 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 2b5a8b0bd74..2b5a8b0bd74 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 99bb6435ef0..99bb6435ef0 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 eee324bb607..8f8c04afe54 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 333a23b759d..333a23b759d 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 0afe1e70f07..0afe1e70f07 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 eee324bb607..8f8c04afe54 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 499426d8b6e..499426d8b6e 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 e5b50385a40..e5b50385a40 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 eee324bb607..8f8c04afe54 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 39a3b7dec0f..39a3b7dec0f 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 dff4e05e8d7..dff4e05e8d7 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 eee324bb607..8f8c04afe54 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 8ce23b0d3bd..8ce23b0d3bd 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 91665dd594a..91665dd594a 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 eee324bb607..8f8c04afe54 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 8822271bb66..8822271bb66 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 0b5d23d06fb..0b5d23d06fb 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 eee324bb607..8f8c04afe54 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 5404346e22a..5404346e22a 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 e2731cdb216..e2731cdb216 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 eee324bb607..8f8c04afe54 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 99bf1810a22..99bf1810a22 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 ba630c0cc43..4349073206f 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 a55dda54ceb..a55dda54ceb 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 f79d0d9af0a..f79d0d9af0a 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 eee324bb607..8f8c04afe54 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 ff198fe772d..ff198fe772d 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 879a65a6cb4..879a65a6cb4 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 eee324bb607..8f8c04afe54 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 39523b06af8..39523b06af8 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 1ec678d8d5a..1ec678d8d5a 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 eee324bb607..8f8c04afe54 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 bea3fbc885b..bea3fbc885b 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 2fc3d6c7810..2fc3d6c7810 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 eee324bb607..8f8c04afe54 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 1b6e260057c..1b6e260057c 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 00082279885..00082279885 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 eee324bb607..8f8c04afe54 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 a873c2d122e..a873c2d122e 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 62a27d359de..62a27d359de 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 eee324bb607..8f8c04afe54 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 a2bee93bc46..a2bee93bc46 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 a6713624c13..a6713624c13 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 eee324bb607..8f8c04afe54 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 e947a4a7c41..e947a4a7c41 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 5385e415dda..5385e415dda 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 eee324bb607..8f8c04afe54 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 f1207f4b5d4..f1207f4b5d4 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 45fb57f72c4..45fb57f72c4 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 eee324bb607..8f8c04afe54 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 3e79d53db20..3e79d53db20 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 8dbd3c6d656..8dbd3c6d656 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 eee324bb607..8f8c04afe54 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 edd1e0fe350..edd1e0fe350 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 ab39010290b..ab39010290b 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 eee324bb607..8f8c04afe54 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 e00be62440f..e00be62440f 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 89974d62a5d..89974d62a5d 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 eee324bb607..8f8c04afe54 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 6f2ec53956d..6f2ec53956d 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 13e6f131676..13e6f131676 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 eee324bb607..8f8c04afe54 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 d8ccbcb7dc0..d8ccbcb7dc0 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 cf814ae9478..cf814ae9478 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 eee324bb607..8f8c04afe54 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 122aabfd9ca..122aabfd9ca 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 30cd4e60a5c..30cd4e60a5c 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 eee324bb607..8f8c04afe54 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 aaa8d6337da..aaa8d6337da 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 982a7323e16..982a7323e16 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 eee324bb607..8f8c04afe54 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 9aeb4c51407..9aeb4c51407 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 eecb1b3d5f8..eecb1b3d5f8 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 eee324bb607..8f8c04afe54 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 d38e0dc78bc..d38e0dc78bc 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 8f818b1bf04..8f818b1bf04 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 eee324bb607..8f8c04afe54 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 f8e6afeb960..f8e6afeb960 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 776f51f91d5..776f51f91d5 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 eee324bb607..8f8c04afe54 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 507d58e59b0..507d58e59b0 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 4914b7d4f33..4914b7d4f33 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 eee324bb607..8f8c04afe54 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 5ca07fe1bce..5ca07fe1bce 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 b1a4c8817ab..b1a4c8817ab 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 eee324bb607..8f8c04afe54 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 bdf90955259..bdf90955259 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 ee458414a08..ee458414a08 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 eee324bb607..8f8c04afe54 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 a703571757c..a703571757c 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 00fbb651b8d..00fbb651b8d 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 eee324bb607..8f8c04afe54 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 1d62defbb4b..1d62defbb4b 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 870556286d1..870556286d1 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 eee324bb607..8f8c04afe54 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 bf742c3572b..bf742c3572b 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 1c1b924cc4c..1c1b924cc4c 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 eee324bb607..8f8c04afe54 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 b69d2408d20..b69d2408d20 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 17250eafeca..17250eafeca 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 eee324bb607..8f8c04afe54 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 85fbc1b9a9b..85fbc1b9a9b 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 b8137e772b5..b8137e772b5 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 eee324bb607..8f8c04afe54 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 85ed4a4c6db..85ed4a4c6db 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 f9c59ee4c38..f9c59ee4c38 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 eee324bb607..8f8c04afe54 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 d45ba449fd6..d45ba449fd6 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 b0d24912359..b0d24912359 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 eee324bb607..8f8c04afe54 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 ef39d6fd6e4..ef39d6fd6e4 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 d8d6dc0ce5c..d8d6dc0ce5c 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 eee324bb607..8f8c04afe54 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 7ab180f92f1..7ab180f92f1 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 bb006dd12d1..bb006dd12d1 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 eee324bb607..8f8c04afe54 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 b8bb770b445..b8bb770b445 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 c9c201999bb..c9c201999bb 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 eee324bb607..8f8c04afe54 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 970c719b71c..970c719b71c 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 696aaa00565..696aaa00565 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 eee324bb607..8f8c04afe54 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 d525ab738b5..d525ab738b5 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 1be6e4f2c7c..1be6e4f2c7c 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 eee324bb607..8f8c04afe54 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 fa5ab87a58f..fa5ab87a58f 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 446f28a8ed4..446f28a8ed4 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 eee324bb607..8f8c04afe54 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 f51760c82e4..f51760c82e4 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 ff3e8d2dd3b..ff3e8d2dd3b 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 eee324bb607..8f8c04afe54 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 aa5e1ba2a75..aa5e1ba2a75 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 805840b5cdc..805840b5cdc 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 eee324bb607..8f8c04afe54 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 e6d5bc3ea13..e6d5bc3ea13 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 3224ad6131a..3224ad6131a 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 eee324bb607..8f8c04afe54 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 d217f5c0b34..d217f5c0b34 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 3051404f466..3051404f466 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 eee324bb607..8f8c04afe54 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 5f646dba67e..5f646dba67e 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 22abfadba3d..22abfadba3d 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 eee324bb607..8f8c04afe54 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 2be6098116b..2be6098116b 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 f8269b28594..f8269b28594 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 eee324bb607..8f8c04afe54 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 7041694f052..7041694f052 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 9824fa00174..9824fa00174 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 eee324bb607..8f8c04afe54 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 431de24a137..431de24a137 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 0638e0d2191..0638e0d2191 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 eee324bb607..8f8c04afe54 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 8b1e0a65b50..8b1e0a65b50 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 781a72b8115..781a72b8115 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 eee324bb607..8f8c04afe54 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 403b3bc5c6e..403b3bc5c6e 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 03b67f2fd7d..03b67f2fd7d 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 eee324bb607..8f8c04afe54 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 4dd5878c21b..4dd5878c21b 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 cf62029e714..cf62029e714 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 eee324bb607..8f8c04afe54 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 4d7e2f17c07..4d7e2f17c07 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 7eab9ec5126..7eab9ec5126 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 eee324bb607..8f8c04afe54 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 813912d18d9..813912d18d9 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 56c49ac4c63..56c49ac4c63 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 eee324bb607..8f8c04afe54 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 5e02faf42f5..5e02faf42f5 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 803edf0122e..803edf0122e 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 eee324bb607..8f8c04afe54 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 940e5e3a990..940e5e3a990 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 af2c6d84045..af2c6d84045 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 eee324bb607..8f8c04afe54 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 4cce10e7b9d..4cce10e7b9d 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 b6a3dcc4bcb..b6a3dcc4bcb 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 eee324bb607..8f8c04afe54 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 eb8dce44f8b..eb8dce44f8b 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 a6f2faf4789..a6f2faf4789 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 eee324bb607..8f8c04afe54 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 0c93126cd11..0c93126cd11 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 ed757c6e177..ed757c6e177 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 eee324bb607..8f8c04afe54 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 5e20f5ea3de..5e20f5ea3de 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 732c5e5474b..732c5e5474b 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 eee324bb607..8f8c04afe54 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 0de0e50d71c..0de0e50d71c 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 ddcaf918dc5..ddcaf918dc5 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 eee324bb607..8f8c04afe54 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 cf6ef995113..cf6ef995113 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 7f2893caa34..7f2893caa34 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 eee324bb607..8f8c04afe54 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 a34e19b4a06..a34e19b4a06 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 4e7404a3daf..4e7404a3daf 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 eee324bb607..8f8c04afe54 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 daf0950e7c4..daf0950e7c4 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 53fb70fafae..53fb70fafae 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 eee324bb607..8f8c04afe54 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 ff72551b971..ff72551b971 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 4fc12f623da..4fc12f623da 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 eee324bb607..8f8c04afe54 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 7a19810cbad..7a19810cbad 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 200be30d208..9e182254dbc 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 da6056a44b7..da6056a44b7 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 321e8eac3f0..321e8eac3f0 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 eee324bb607..8f8c04afe54 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 2afaa79b4e1..2afaa79b4e1 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 0bc17080e12..0bc17080e12 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 eee324bb607..8f8c04afe54 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 e5b20eefab6..e5b20eefab6 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 4daaa9883ad..4daaa9883ad 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 eee324bb607..8f8c04afe54 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 f88c0aa5f39..f88c0aa5f39 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 1945bc36fe5..1945bc36fe5 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 eee324bb607..8f8c04afe54 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 b20e4ae1f5c..b20e4ae1f5c 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 2934739ddc4..2934739ddc4 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 eee324bb607..8f8c04afe54 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()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
index a85dbb45d3f..a85dbb45d3f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
index a51d5c88800..a51d5c88800 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/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/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
index 76a58108176..76a58108176 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
index 22f298cf7d9..22f298cf7d9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/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/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
index 3efe12ff583..3efe12ff583 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
index 55ca1c759ba..55ca1c759ba 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/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/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
index 65d79f1a81c..65d79f1a81c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
index adde78aabeb..adde78aabeb 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/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/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
index a1f6d47793b..a1f6d47793b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
index e7af2024c13..e7af2024c13 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/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/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
index 0650809a3b2..0650809a3b2 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
index f55013927e8..f55013927e8 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/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/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
index 8bb73fa5320..8bb73fa5320 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
index a632a01f094..a632a01f094 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/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/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
index 1fa7e9da7fd..1fa7e9da7fd 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
index bb6a283f3bb..bb6a283f3bb 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/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/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
index f98e8828e79..f98e8828e79 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
index 451fce6d4ab..451fce6d4ab 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/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/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
index ec53f57bc15..ec53f57bc15 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
index a1ceaf2b75e..a1ceaf2b75e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/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/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
index 068982719c7..068982719c7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
index 737ba55d854..737ba55d854 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/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/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
index 564e9bb142e..564e9bb142e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
index 51892581b3a..51892581b3a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/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/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
index 18d72c66855..18d72c66855 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
index 43faced540f..43faced540f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/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/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
index 7901d8cf245..7901d8cf245 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
index f2e0472a5d4..f2e0472a5d4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/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/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
index e46d70dd3ed..e46d70dd3ed 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
index 3837b423962..3837b423962 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/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/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
index dc048c9436f..dc048c9436f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
index cdf38f454c5..cdf38f454c5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/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/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
index a5ff3f433a7..a5ff3f433a7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
index 653bb04f7ab..653bb04f7ab 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/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/restricted/abseil-cpp/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
index 74ef613f089..74ef613f089 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
index 07f9f59ee4f..07f9f59ee4f 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.txt b/contrib/restricted/abseil-cpp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.txt
+++ b/contrib/restricted/abseil-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/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
index 535abc7c56e..535abc7c56e 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
index e29a80e43d4..e29a80e43d4 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/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/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
index 1c3e1d4debd..1c3e1d4debd 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
index 89d5fdbf42e..89d5fdbf42e 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/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/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
index 3be1fa16926..3be1fa16926 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
index bf4cf39aa90..bf4cf39aa90 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/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/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
index 3c60c7b056c..3c60c7b056c 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
index 89a07a760b4..89a07a760b4 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/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/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
index 51a0971139a..51a0971139a 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
index a61094881a3..a61094881a3 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/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/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
index e73fa82ef76..e73fa82ef76 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
index fb49dbcfee9..fb49dbcfee9 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/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/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
index bb7bb34def6..bb7bb34def6 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
index 54f9fbec1cb..54f9fbec1cb 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/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/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
index c2793a97eaa..c2793a97eaa 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
index a7743e41a05..a7743e41a05 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/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/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
index 3235ac4ba50..3235ac4ba50 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
index e87b112e2fb..e87b112e2fb 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/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/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
index cba7d556115..cba7d556115 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
index 1bb7f8ea3ed..1bb7f8ea3ed 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/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/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
index 82fe8b2770c..82fe8b2770c 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
index a6593d4b95d..a6593d4b95d 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/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/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
index 15c4b76f676..15c4b76f676 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
index 876a1ced58a..876a1ced58a 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/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/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
index 324203b94a1..324203b94a1 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
index b630e36b397..b630e36b397 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/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/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
index 82c6e43c911..82c6e43c911 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
index ef805d8dde2..ef805d8dde2 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/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/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
index e3aa400b959..e3aa400b959 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
index 2da01ab774e..2da01ab774e 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/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/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
index 16ea7b2596b..16ea7b2596b 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
index 358da661fc6..358da661fc6 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/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/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
index af147aa1715..af147aa1715 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
index e934d9a1f32..e934d9a1f32 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/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/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
index 9c24497045c..9c24497045c 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
index cbc8bf8b2e2..cbc8bf8b2e2 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/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/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
index a2f021177aa..a2f021177aa 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
index 9f8f6c068d6..9f8f6c068d6 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/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/restricted/aws/aws-c-cal/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
index c28381a676a..c28381a676a 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
index d729ec396a2..d729ec396a2 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-cal/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/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
index c6d3f58fef0..c6d3f58fef0 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
index 2e36a7692bc..2e36a7692bc 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-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/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
index d7f9cd17a6f..d7f9cd17a6f 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
index e754eefb5a2..e754eefb5a2 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/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/restricted/aws/aws-c-io/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
index 64d2a9dee33..64d2a9dee33 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
index 859d5769a17..859d5769a17 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-io/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/restricted/aws/aws-checksums/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
index c7805ff1e28..c7805ff1e28 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
index 70c75162acf..70c75162acf 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-checksums/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/restricted/aws/s2n/CMakeLists.darwin.txt b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
index 976996467f9..976996467f9 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.linux.txt b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
index e4b895391ca..e4b895391ca 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.txt
+++ b/contrib/restricted/aws/s2n/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/restricted/boost/CMakeLists.darwin.txt b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
index 2ce12f636b3..2ce12f636b3 100644
--- a/contrib/restricted/boost/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.linux.txt b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
index 2ce12f636b3..2ce12f636b3 100644
--- a/contrib/restricted/boost/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/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/restricted/boost/algorithm/CMakeLists.darwin.txt b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
index 7601e49d0f9..7601e49d0f9 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
index ded7dbfbd84..ded7dbfbd84 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.txt b/contrib/restricted/boost/algorithm/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.txt
+++ b/contrib/restricted/boost/algorithm/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/restricted/boost/align/CMakeLists.darwin.txt b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
index b4f255a0c6e..b4f255a0c6e 100644
--- a/contrib/restricted/boost/align/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.linux.txt b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
index e032aaa404e..e032aaa404e 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.txt b/contrib/restricted/boost/align/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/align/CMakeLists.txt
+++ b/contrib/restricted/boost/align/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/restricted/boost/any/CMakeLists.darwin.txt b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
index 946a109665e..946a109665e 100644
--- a/contrib/restricted/boost/any/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.linux.txt b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
index b1d48450502..b1d48450502 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.txt b/contrib/restricted/boost/any/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/any/CMakeLists.txt
+++ b/contrib/restricted/boost/any/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/restricted/boost/array/CMakeLists.darwin.txt b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
index f640cbf516c..f640cbf516c 100644
--- a/contrib/restricted/boost/array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.linux.txt b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
index 157f171696e..157f171696e 100644
--- a/contrib/restricted/boost/array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.txt b/contrib/restricted/boost/array/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/array/CMakeLists.txt
+++ b/contrib/restricted/boost/array/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/restricted/boost/asio/CMakeLists.darwin.txt b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
index 74b17e3e1bd..74b17e3e1bd 100644
--- a/contrib/restricted/boost/asio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.linux.txt b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
index 0108378f15f..0108378f15f 100644
--- a/contrib/restricted/boost/asio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.txt b/contrib/restricted/boost/asio/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/asio/CMakeLists.txt
+++ b/contrib/restricted/boost/asio/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/restricted/boost/assert/CMakeLists.darwin.txt b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
index 0ba173db4f8..0ba173db4f8 100644
--- a/contrib/restricted/boost/assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.linux.txt b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
index bd55d5ef619..bd55d5ef619 100644
--- a/contrib/restricted/boost/assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.txt b/contrib/restricted/boost/assert/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/assert/CMakeLists.txt
+++ b/contrib/restricted/boost/assert/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/restricted/boost/atomic/CMakeLists.darwin.txt b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
index c7c24c5a0f0..c7c24c5a0f0 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.linux.txt b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
index 5f830a8cfa8..5f830a8cfa8 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.txt b/contrib/restricted/boost/atomic/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.txt
+++ b/contrib/restricted/boost/atomic/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/restricted/boost/bimap/CMakeLists.darwin.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
index c44e09b7d6f..c44e09b7d6f 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux.txt b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
index ec170e9cbc8..ec170e9cbc8 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.txt b/contrib/restricted/boost/bimap/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.txt
+++ b/contrib/restricted/boost/bimap/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/restricted/boost/bind/CMakeLists.darwin.txt b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
index 88c5f9bf7b9..88c5f9bf7b9 100644
--- a/contrib/restricted/boost/bind/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.linux.txt b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
index d77d1b474b9..d77d1b474b9 100644
--- a/contrib/restricted/boost/bind/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.txt b/contrib/restricted/boost/bind/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/bind/CMakeLists.txt
+++ b/contrib/restricted/boost/bind/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/restricted/boost/chrono/CMakeLists.darwin.txt b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
index af74091cab5..af74091cab5 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.linux.txt b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
index 849cd7c2154..849cd7c2154 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.txt b/contrib/restricted/boost/chrono/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.txt
+++ b/contrib/restricted/boost/chrono/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/restricted/boost/concept_check/CMakeLists.darwin.txt b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
index 4bea4830c41..4bea4830c41 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
index e2b6d7b8684..e2b6d7b8684 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.txt b/contrib/restricted/boost/concept_check/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.txt
+++ b/contrib/restricted/boost/concept_check/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/restricted/boost/config/CMakeLists.darwin.txt b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
index b3623a130d7..b3623a130d7 100644
--- a/contrib/restricted/boost/config/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.linux.txt b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
index 5bebf20e986..5bebf20e986 100644
--- a/contrib/restricted/boost/config/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.txt b/contrib/restricted/boost/config/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/config/CMakeLists.txt
+++ b/contrib/restricted/boost/config/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/restricted/boost/container/CMakeLists.darwin.txt b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
index 74ef11ce7c5..74ef11ce7c5 100644
--- a/contrib/restricted/boost/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.linux.txt b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
index 8478a2b4757..8478a2b4757 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.txt b/contrib/restricted/boost/container/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/container/CMakeLists.txt
+++ b/contrib/restricted/boost/container/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/restricted/boost/container_hash/CMakeLists.darwin.txt b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
index f6ba33a6e96..f6ba33a6e96 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
index 0e9a7fc3901..0e9a7fc3901 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.txt b/contrib/restricted/boost/container_hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.txt
+++ b/contrib/restricted/boost/container_hash/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/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
index d5301afd155..d5301afd155 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
index 21ce313ed96..21ce313ed96 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/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/restricted/boost/context/impl_common/CMakeLists.darwin.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
index 100cd01a5d6..100cd01a5d6 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
index 06f9049883d..06f9049883d 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.txt
+++ b/contrib/restricted/boost/context/impl_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/restricted/boost/conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
index f1a53fd123f..f1a53fd123f 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.linux.txt b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
index ccc6337d05c..ccc6337d05c 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.txt b/contrib/restricted/boost/conversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/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/restricted/boost/core/CMakeLists.darwin.txt b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
index 8b4b0f15dad..8b4b0f15dad 100644
--- a/contrib/restricted/boost/core/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.linux.txt b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
index 9a1bc627069..9a1bc627069 100644
--- a/contrib/restricted/boost/core/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.txt b/contrib/restricted/boost/core/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/core/CMakeLists.txt
+++ b/contrib/restricted/boost/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/restricted/boost/coroutine/CMakeLists.darwin.txt b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
index 078b319b347..078b319b347 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
index d91726a632b..d91726a632b 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.txt b/contrib/restricted/boost/coroutine/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.txt
+++ b/contrib/restricted/boost/coroutine/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/restricted/boost/crc/CMakeLists.darwin.txt b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
index 2730ce7c010..2730ce7c010 100644
--- a/contrib/restricted/boost/crc/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.linux.txt b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
index 6473832eb12..6473832eb12 100644
--- a/contrib/restricted/boost/crc/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.txt b/contrib/restricted/boost/crc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/crc/CMakeLists.txt
+++ b/contrib/restricted/boost/crc/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/restricted/boost/date_time/CMakeLists.darwin.txt b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
index da90148a57a..da90148a57a 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux.txt b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
index 94835f076ab..94835f076ab 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.txt b/contrib/restricted/boost/date_time/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.txt
+++ b/contrib/restricted/boost/date_time/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/restricted/boost/describe/CMakeLists.darwin.txt b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
index baad9670e4b..baad9670e4b 100644
--- a/contrib/restricted/boost/describe/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.linux.txt b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
index 4cffd37833f..4cffd37833f 100644
--- a/contrib/restricted/boost/describe/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.txt b/contrib/restricted/boost/describe/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/describe/CMakeLists.txt
+++ b/contrib/restricted/boost/describe/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/restricted/boost/detail/CMakeLists.darwin.txt b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
index 4100f97935c..4100f97935c 100644
--- a/contrib/restricted/boost/detail/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux.txt b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
index a57ff442744..a57ff442744 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.txt b/contrib/restricted/boost/detail/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/detail/CMakeLists.txt
+++ b/contrib/restricted/boost/detail/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/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
index 8854d288e8e..8854d288e8e 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
index 1a02ca21502..1a02ca21502 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
+++ b/contrib/restricted/boost/dynamic_bitset/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/restricted/boost/endian/CMakeLists.darwin.txt b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
index ddf28f75fe4..ddf28f75fe4 100644
--- a/contrib/restricted/boost/endian/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux.txt b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
index 8a7f037fd78..8a7f037fd78 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.txt b/contrib/restricted/boost/endian/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/endian/CMakeLists.txt
+++ b/contrib/restricted/boost/endian/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/restricted/boost/exception/CMakeLists.darwin.txt b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
index bd4347f03d4..bd4347f03d4 100644
--- a/contrib/restricted/boost/exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.linux.txt b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
index b818e6d085c..b818e6d085c 100644
--- a/contrib/restricted/boost/exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.txt b/contrib/restricted/boost/exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/exception/CMakeLists.txt
+++ b/contrib/restricted/boost/exception/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/restricted/boost/foreach/CMakeLists.darwin.txt b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
index d2e31c32fc8..d2e31c32fc8 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.linux.txt b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
index f1173b51a9d..f1173b51a9d 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.txt b/contrib/restricted/boost/foreach/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.txt
+++ b/contrib/restricted/boost/foreach/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/restricted/boost/format/CMakeLists.darwin.txt b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
index 270e92cb48f..270e92cb48f 100644
--- a/contrib/restricted/boost/format/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.linux.txt b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
index d19c8b9a869..d19c8b9a869 100644
--- a/contrib/restricted/boost/format/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.txt b/contrib/restricted/boost/format/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/format/CMakeLists.txt
+++ b/contrib/restricted/boost/format/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/restricted/boost/function/CMakeLists.darwin.txt b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
index 5eed0832c43..5eed0832c43 100644
--- a/contrib/restricted/boost/function/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.linux.txt b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
index a963bc1c023..a963bc1c023 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.txt b/contrib/restricted/boost/function/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/function/CMakeLists.txt
+++ b/contrib/restricted/boost/function/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/restricted/boost/function_types/CMakeLists.darwin.txt b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
index 2c618a189f3..2c618a189f3 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.linux.txt b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
index e128b6adffc..e128b6adffc 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.txt b/contrib/restricted/boost/function_types/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.txt
+++ b/contrib/restricted/boost/function_types/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/restricted/boost/functional/CMakeLists.darwin.txt b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
index 239823acab2..239823acab2 100644
--- a/contrib/restricted/boost/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.linux.txt b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
index baa561be6c3..baa561be6c3 100644
--- a/contrib/restricted/boost/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.txt b/contrib/restricted/boost/functional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/functional/CMakeLists.txt
+++ b/contrib/restricted/boost/functional/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/restricted/boost/fusion/CMakeLists.darwin.txt b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
index a26f5b12a3e..a26f5b12a3e 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.linux.txt b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
index 6540394cad6..6540394cad6 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.txt b/contrib/restricted/boost/fusion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.txt
+++ b/contrib/restricted/boost/fusion/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/restricted/boost/graph/CMakeLists.darwin.txt b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
index 9118ce39b67..9118ce39b67 100644
--- a/contrib/restricted/boost/graph/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.linux.txt b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
index fd2c3cf33bc..fd2c3cf33bc 100644
--- a/contrib/restricted/boost/graph/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.txt b/contrib/restricted/boost/graph/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/graph/CMakeLists.txt
+++ b/contrib/restricted/boost/graph/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/restricted/boost/icl/CMakeLists.darwin.txt b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
index b6b11aeab90..b6b11aeab90 100644
--- a/contrib/restricted/boost/icl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.linux.txt b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
index 9f4aa50c8fb..9f4aa50c8fb 100644
--- a/contrib/restricted/boost/icl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.txt b/contrib/restricted/boost/icl/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/icl/CMakeLists.txt
+++ b/contrib/restricted/boost/icl/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/restricted/boost/integer/CMakeLists.darwin.txt b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
index b8189c5a7a9..b8189c5a7a9 100644
--- a/contrib/restricted/boost/integer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.linux.txt b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
index 6fad3b6c9ed..6fad3b6c9ed 100644
--- a/contrib/restricted/boost/integer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.txt b/contrib/restricted/boost/integer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/integer/CMakeLists.txt
+++ b/contrib/restricted/boost/integer/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/restricted/boost/interprocess/CMakeLists.darwin.txt b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
index f95f9fc6c9f..f95f9fc6c9f 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
index 75abc5bc492..75abc5bc492 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.txt b/contrib/restricted/boost/interprocess/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.txt
+++ b/contrib/restricted/boost/interprocess/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/restricted/boost/intrusive/CMakeLists.darwin.txt b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
index 261b65dc857..261b65dc857 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
index 0f15706c633..0f15706c633 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.txt b/contrib/restricted/boost/intrusive/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.txt
+++ b/contrib/restricted/boost/intrusive/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/restricted/boost/io/CMakeLists.darwin.txt b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
index 4aeba3ef014..4aeba3ef014 100644
--- a/contrib/restricted/boost/io/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.linux.txt b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
index c7e646dfef9..c7e646dfef9 100644
--- a/contrib/restricted/boost/io/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.txt b/contrib/restricted/boost/io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/io/CMakeLists.txt
+++ b/contrib/restricted/boost/io/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/restricted/boost/iostreams/CMakeLists.darwin.txt b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
index ecd5b2a38d1..ecd5b2a38d1 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
index 1d1e246daee..1d1e246daee 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.txt b/contrib/restricted/boost/iostreams/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/iostreams/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/restricted/boost/iterator/CMakeLists.darwin.txt b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
index df59b473b28..df59b473b28 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.linux.txt b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
index a1ebd81a38f..a1ebd81a38f 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.txt b/contrib/restricted/boost/iterator/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.txt
+++ b/contrib/restricted/boost/iterator/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/restricted/boost/lambda/CMakeLists.darwin.txt b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
index f3556a1958e..f3556a1958e 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.linux.txt b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
index ba6f725eadb..ba6f725eadb 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.txt b/contrib/restricted/boost/lambda/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.txt
+++ b/contrib/restricted/boost/lambda/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/restricted/boost/lexical_cast/CMakeLists.darwin.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
index c4aff4db0d5..c4aff4db0d5 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
index d746f22befe..d746f22befe 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.txt
+++ b/contrib/restricted/boost/lexical_cast/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/restricted/boost/locale/CMakeLists.darwin.txt b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
index 8e8b149e509..8e8b149e509 100644
--- a/contrib/restricted/boost/locale/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.linux.txt b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
index 831330fafc3..831330fafc3 100644
--- a/contrib/restricted/boost/locale/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.txt b/contrib/restricted/boost/locale/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/locale/CMakeLists.txt
+++ b/contrib/restricted/boost/locale/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/restricted/boost/math/CMakeLists.darwin.txt b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
index 71d5facb39e..71d5facb39e 100644
--- a/contrib/restricted/boost/math/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.linux.txt b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
index b8ed0bead8b..b8ed0bead8b 100644
--- a/contrib/restricted/boost/math/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.txt b/contrib/restricted/boost/math/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/math/CMakeLists.txt
+++ b/contrib/restricted/boost/math/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/restricted/boost/move/CMakeLists.darwin.txt b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
index 37a8b34d946..37a8b34d946 100644
--- a/contrib/restricted/boost/move/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.linux.txt b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
index d2a4daa0759..d2a4daa0759 100644
--- a/contrib/restricted/boost/move/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.txt b/contrib/restricted/boost/move/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/move/CMakeLists.txt
+++ b/contrib/restricted/boost/move/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/restricted/boost/mp11/CMakeLists.darwin.txt b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
index 7100a8f570d..7100a8f570d 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux.txt b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
index 88c153c72c1..88c153c72c1 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.txt b/contrib/restricted/boost/mp11/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.txt
+++ b/contrib/restricted/boost/mp11/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/restricted/boost/mpl/CMakeLists.darwin.txt b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
index 8b161d3adfd..8b161d3adfd 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.linux.txt b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
index 2a2813d50c8..2a2813d50c8 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.txt b/contrib/restricted/boost/mpl/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.txt
+++ b/contrib/restricted/boost/mpl/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/restricted/boost/multi_array/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
index 0f36dd5b204..0f36dd5b204 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
index a9bf7bfcb38..a9bf7bfcb38 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.txt b/contrib/restricted/boost/multi_array/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_array/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/restricted/boost/multi_index/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
index e8f6c61e6e3..e8f6c61e6e3 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
index fb769ceb012..fb769ceb012 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.txt b/contrib/restricted/boost/multi_index/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_index/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/restricted/boost/numeric_conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
index c4797132e9e..c4797132e9e 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
index 46d33c5f9d4..46d33c5f9d4 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/numeric_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/restricted/boost/optional/CMakeLists.darwin.txt b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
index b94f64d5c46..b94f64d5c46 100644
--- a/contrib/restricted/boost/optional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux.txt b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
index 0bf5a6292df..0bf5a6292df 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.txt b/contrib/restricted/boost/optional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/optional/CMakeLists.txt
+++ b/contrib/restricted/boost/optional/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/restricted/boost/parameter/CMakeLists.darwin.txt b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
index 7aad7283416..7aad7283416 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux.txt b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
index d5bb0e8b6e2..d5bb0e8b6e2 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.txt b/contrib/restricted/boost/parameter/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.txt
+++ b/contrib/restricted/boost/parameter/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/restricted/boost/phoenix/CMakeLists.darwin.txt b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
index 7bf8181aa5e..7bf8181aa5e 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
index 80062339a36..80062339a36 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.txt b/contrib/restricted/boost/phoenix/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.txt
+++ b/contrib/restricted/boost/phoenix/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/restricted/boost/pool/CMakeLists.darwin.txt b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
index a0e50e5cde2..a0e50e5cde2 100644
--- a/contrib/restricted/boost/pool/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.linux.txt b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
index a5d127cffbf..a5d127cffbf 100644
--- a/contrib/restricted/boost/pool/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.txt b/contrib/restricted/boost/pool/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/pool/CMakeLists.txt
+++ b/contrib/restricted/boost/pool/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/restricted/boost/predef/CMakeLists.darwin.txt b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
index c55eab9d0f6..c55eab9d0f6 100644
--- a/contrib/restricted/boost/predef/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.linux.txt b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
index a0087e3f0db..a0087e3f0db 100644
--- a/contrib/restricted/boost/predef/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/predef/CMakeLists.txt
+++ b/contrib/restricted/boost/predef/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/restricted/boost/preprocessor/CMakeLists.darwin.txt b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
index 7df51769d9a..7df51769d9a 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
index e6e835b5adf..e6e835b5adf 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.txt b/contrib/restricted/boost/preprocessor/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.txt
+++ b/contrib/restricted/boost/preprocessor/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/restricted/boost/program_options/CMakeLists.darwin.txt b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
index c91dfc15c59..c91dfc15c59 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.linux.txt b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
index 1bd268a977a..1bd268a977a 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.txt b/contrib/restricted/boost/program_options/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.txt
+++ b/contrib/restricted/boost/program_options/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/restricted/boost/property_map/CMakeLists.darwin.txt b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
index d49456c891b..d49456c891b 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.linux.txt b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
index cfb3bee9458..cfb3bee9458 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.txt b/contrib/restricted/boost/property_map/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.txt
+++ b/contrib/restricted/boost/property_map/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/restricted/boost/property_tree/CMakeLists.darwin.txt b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
index 57f107d22d6..57f107d22d6 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
index b64b977a645..b64b977a645 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.txt b/contrib/restricted/boost/property_tree/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.txt
+++ b/contrib/restricted/boost/property_tree/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/restricted/boost/proto/CMakeLists.darwin.txt b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
index 370165e4fff..370165e4fff 100644
--- a/contrib/restricted/boost/proto/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.linux.txt b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
index 8fa3b296b20..8fa3b296b20 100644
--- a/contrib/restricted/boost/proto/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.txt b/contrib/restricted/boost/proto/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/proto/CMakeLists.txt
+++ b/contrib/restricted/boost/proto/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/restricted/boost/random/CMakeLists.darwin.txt b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
index 647aa946684..647aa946684 100644
--- a/contrib/restricted/boost/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.linux.txt b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
index 23ae6c61529..23ae6c61529 100644
--- a/contrib/restricted/boost/random/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.txt b/contrib/restricted/boost/random/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/random/CMakeLists.txt
+++ b/contrib/restricted/boost/random/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/restricted/boost/range/CMakeLists.darwin.txt b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
index eadd2f290c7..eadd2f290c7 100644
--- a/contrib/restricted/boost/range/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.linux.txt b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
index a97889d7f60..a97889d7f60 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.txt b/contrib/restricted/boost/range/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/range/CMakeLists.txt
+++ b/contrib/restricted/boost/range/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/restricted/boost/ratio/CMakeLists.darwin.txt b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
index 7171c49b081..7171c49b081 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.linux.txt b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
index 90cac9ef7a9..90cac9ef7a9 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.txt b/contrib/restricted/boost/ratio/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.txt
+++ b/contrib/restricted/boost/ratio/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/restricted/boost/rational/CMakeLists.darwin.txt b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
index c4d92a21a6e..c4d92a21a6e 100644
--- a/contrib/restricted/boost/rational/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.linux.txt b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
index 61fd5149ab3..61fd5149ab3 100644
--- a/contrib/restricted/boost/rational/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.txt b/contrib/restricted/boost/rational/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/rational/CMakeLists.txt
+++ b/contrib/restricted/boost/rational/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/restricted/boost/regex/CMakeLists.darwin.txt b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
index b0c67b4c889..b0c67b4c889 100644
--- a/contrib/restricted/boost/regex/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.linux.txt b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
index 554805be78e..554805be78e 100644
--- a/contrib/restricted/boost/regex/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.txt b/contrib/restricted/boost/regex/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/regex/CMakeLists.txt
+++ b/contrib/restricted/boost/regex/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/restricted/boost/serialization/CMakeLists.darwin.txt b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
index 52603eb79dc..52603eb79dc 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.linux.txt b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
index 43d01c0ab03..43d01c0ab03 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.txt b/contrib/restricted/boost/serialization/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.txt
+++ b/contrib/restricted/boost/serialization/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/restricted/boost/smart_ptr/CMakeLists.darwin.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
index e13c2385804..e13c2385804 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
index 1c30f857e3c..1c30f857e3c 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.txt
+++ b/contrib/restricted/boost/smart_ptr/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/restricted/boost/spirit/CMakeLists.darwin.txt b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
index 6a804f549db..6a804f549db 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.linux.txt b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
index 01948379bbf..01948379bbf 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.txt b/contrib/restricted/boost/spirit/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.txt
+++ b/contrib/restricted/boost/spirit/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/restricted/boost/static_assert/CMakeLists.darwin.txt b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
index 6506f1babd0..6506f1babd0 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
index efc171911e7..efc171911e7 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.txt b/contrib/restricted/boost/static_assert/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.txt
+++ b/contrib/restricted/boost/static_assert/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/restricted/boost/system/CMakeLists.darwin.txt b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
index 49847620cb9..49847620cb9 100644
--- a/contrib/restricted/boost/system/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.linux.txt b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
index bb535c43334..bb535c43334 100644
--- a/contrib/restricted/boost/system/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.txt b/contrib/restricted/boost/system/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/system/CMakeLists.txt
+++ b/contrib/restricted/boost/system/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/restricted/boost/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
index 683da254264..683da254264 100644
--- a/contrib/restricted/boost/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux.txt b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
index ee0e2e1fcc5..ee0e2e1fcc5 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.txt b/contrib/restricted/boost/thread/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/thread/CMakeLists.txt
+++ b/contrib/restricted/boost/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/restricted/boost/throw_exception/CMakeLists.darwin.txt b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
index eefa32cee28..eefa32cee28 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
index 105ee3325e7..105ee3325e7 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.txt b/contrib/restricted/boost/throw_exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.txt
+++ b/contrib/restricted/boost/throw_exception/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/restricted/boost/tokenizer/CMakeLists.darwin.txt b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
index 484614506f2..484614506f2 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
index f150b16ca27..f150b16ca27 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.txt b/contrib/restricted/boost/tokenizer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.txt
+++ b/contrib/restricted/boost/tokenizer/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/restricted/boost/tti/CMakeLists.darwin.txt b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
index 21cde2d8ba6..21cde2d8ba6 100644
--- a/contrib/restricted/boost/tti/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.linux.txt b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
index 9c8dd5bc54b..9c8dd5bc54b 100644
--- a/contrib/restricted/boost/tti/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.txt b/contrib/restricted/boost/tti/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/tti/CMakeLists.txt
+++ b/contrib/restricted/boost/tti/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/restricted/boost/tuple/CMakeLists.darwin.txt b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
index 35051c1252b..35051c1252b 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.linux.txt b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
index de83f3637ab..de83f3637ab 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.txt b/contrib/restricted/boost/tuple/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.txt
+++ b/contrib/restricted/boost/tuple/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/restricted/boost/type_index/CMakeLists.darwin.txt b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
index e6366d2523e..e6366d2523e 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux.txt b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
index 333b4a45fd8..333b4a45fd8 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.txt b/contrib/restricted/boost/type_index/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.txt
+++ b/contrib/restricted/boost/type_index/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/restricted/boost/type_traits/CMakeLists.darwin.txt b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
index a32d4a750ef..a32d4a750ef 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
index 9771ff8a740..9771ff8a740 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.txt b/contrib/restricted/boost/type_traits/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.txt
+++ b/contrib/restricted/boost/type_traits/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/restricted/boost/typeof/CMakeLists.darwin.txt b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
index 04fff27108b..04fff27108b 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux.txt b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
index ff3ee3a2660..ff3ee3a2660 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.txt b/contrib/restricted/boost/typeof/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.txt
+++ b/contrib/restricted/boost/typeof/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/restricted/boost/unordered/CMakeLists.darwin.txt b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
index 0a1dbba096f..0a1dbba096f 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.linux.txt b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
index 2c662b87034..2c662b87034 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.txt b/contrib/restricted/boost/unordered/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.txt
+++ b/contrib/restricted/boost/unordered/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/restricted/boost/utility/CMakeLists.darwin.txt b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
index 75fd8785291..75fd8785291 100644
--- a/contrib/restricted/boost/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.linux.txt b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
index a04da10363c..a04da10363c 100644
--- a/contrib/restricted/boost/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.txt b/contrib/restricted/boost/utility/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/utility/CMakeLists.txt
+++ b/contrib/restricted/boost/utility/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/restricted/boost/variant/CMakeLists.darwin.txt b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
index 609c9606b81..609c9606b81 100644
--- a/contrib/restricted/boost/variant/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.linux.txt b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
index 051a57fd901..051a57fd901 100644
--- a/contrib/restricted/boost/variant/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.txt b/contrib/restricted/boost/variant/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/variant/CMakeLists.txt
+++ b/contrib/restricted/boost/variant/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/restricted/boost/variant2/CMakeLists.darwin.txt b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
index faec5d90979..faec5d90979 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
index b3cdd31e101..b3cdd31e101 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.txt b/contrib/restricted/boost/variant2/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.txt
+++ b/contrib/restricted/boost/variant2/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/restricted/boost/winapi/CMakeLists.darwin.txt b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
index 13fd04341f2..13fd04341f2 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.linux.txt b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
index 08c08093611..08c08093611 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.txt b/contrib/restricted/boost/winapi/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.txt
+++ b/contrib/restricted/boost/winapi/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/restricted/boost/xpressive/CMakeLists.darwin.txt b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
index d8974003403..d8974003403 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
index ad594157635..ad594157635 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.txt
+++ b/contrib/restricted/boost/xpressive/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/restricted/cityhash-1.0.2/CMakeLists.darwin.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
index d7518da2f45..d7518da2f45 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
index 1abb1abf0a6..1abb1abf0a6 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
+++ b/contrib/restricted/cityhash-1.0.2/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/restricted/dragonbox/CMakeLists.darwin.txt b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
index 4e0fcd5b990..4e0fcd5b990 100644
--- a/contrib/restricted/dragonbox/CMakeLists.darwin.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.linux.txt b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
index 83a5cfb37c5..83a5cfb37c5 100644
--- a/contrib/restricted/dragonbox/CMakeLists.linux.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.txt b/contrib/restricted/dragonbox/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/dragonbox/CMakeLists.txt
+++ b/contrib/restricted/dragonbox/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/restricted/fast_float/CMakeLists.darwin.txt b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
index 277929ec2e3..277929ec2e3 100644
--- a/contrib/restricted/fast_float/CMakeLists.darwin.txt
+++ b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.linux.txt b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
index 4541d2ed55b..4541d2ed55b 100644
--- a/contrib/restricted/fast_float/CMakeLists.linux.txt
+++ b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.txt b/contrib/restricted/fast_float/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/fast_float/CMakeLists.txt
+++ b/contrib/restricted/fast_float/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/restricted/googletest/googlemock/CMakeLists.darwin.txt b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
index 01df6b6ce7a..01df6b6ce7a 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
index d500700c458..d500700c458 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.txt b/contrib/restricted/googletest/googlemock/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.txt
+++ b/contrib/restricted/googletest/googlemock/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/restricted/googletest/googletest/CMakeLists.darwin.txt b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
index b28f00772fd..b28f00772fd 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
index b04078314ec..b04078314ec 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.txt b/contrib/restricted/googletest/googletest/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.txt
+++ b/contrib/restricted/googletest/googletest/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/restricted/nlohmann_json/CMakeLists.darwin.txt b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
index 0c96110bcc4..0c96110bcc4 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.darwin.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
index 2641b31de22..2641b31de22 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.txt b/contrib/restricted/nlohmann_json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.txt
+++ b/contrib/restricted/nlohmann_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/restricted/thrift/CMakeLists.darwin.txt b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
index fcff6a7639b..fcff6a7639b 100644
--- a/contrib/restricted/thrift/CMakeLists.darwin.txt
+++ b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.linux.txt b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
index daee3f2fa47..daee3f2fa47 100644
--- a/contrib/restricted/thrift/CMakeLists.linux.txt
+++ b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.txt b/contrib/restricted/thrift/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/thrift/CMakeLists.txt
+++ b/contrib/restricted/thrift/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/restricted/uriparser/CMakeLists.darwin.txt b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
index 2163bfff7cb..2163bfff7cb 100644
--- a/contrib/restricted/uriparser/CMakeLists.darwin.txt
+++ b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.linux.txt b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
index ef48e97a88d..ef48e97a88d 100644
--- a/contrib/restricted/uriparser/CMakeLists.linux.txt
+++ b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.txt b/contrib/restricted/uriparser/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/uriparser/CMakeLists.txt
+++ b/contrib/restricted/uriparser/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/tools/protoc/bin/CMakeLists.darwin.txt b/contrib/tools/protoc/bin/CMakeLists.darwin-x86_64.txt
index c1676eedb9d..c1676eedb9d 100644
--- a/contrib/tools/protoc/bin/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/bin/CMakeLists.linux.txt b/contrib/tools/protoc/bin/CMakeLists.linux-x86_64.txt
index 1a479939c52..1a479939c52 100644
--- a/contrib/tools/protoc/bin/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/tools/protoc/bin/CMakeLists.txt
+++ b/contrib/tools/protoc/bin/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/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin-x86_64.txt
index 6839a38ee97..6839a38ee97 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux-x86_64.txt
index 132a3329781..132a3329781 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/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/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin-x86_64.txt
index 146ef843d10..146ef843d10 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux-x86_64.txt
index 642f45d4fd0..642f45d4fd0 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/grpc_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()