Merge branch 'main' into default-signature-algorithm

apple · Jan 27, 2025 · fe3198f · fe3198f
2 parents 8f8ee07 + 2c25efa
commit fe3198f
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 1 deletion.
diff --git a/...mark.Parse_WebPKI_Roots_from_DER.p90.json → ...mark.Parse_WebPKI_Roots_from_DER.p90.json b/...mark.Parse_WebPKI_Roots_from_DER.p90.json → ...mark.Parse_WebPKI_Roots_from_DER.p90.json
diff --git a/...arse_WebPKI_Roots_from_PEM_files.p90.json → ...arse_WebPKI_Roots_from_PEM_files.p90.json b/...arse_WebPKI_Roots_from_PEM_files.p90.json → ...arse_WebPKI_Roots_from_PEM_files.p90.json
diff --git a/...WebPKI_Roots_from_multi_PEM_file.p90.json → ...WebPKI_Roots_from_multi_PEM_file.p90.json b/...WebPKI_Roots_from_multi_PEM_file.p90.json → ...WebPKI_Roots_from_multi_PEM_file.p90.json
diff --git a/...icatesBenchmark.TinyArray.append.p90.json → ...icatesBenchmark.TinyArray.append.p90.json b/...icatesBenchmark.TinyArray.append.p90.json → ...icatesBenchmark.TinyArray.append.p90.json
diff --git a/...nyArray_non-allocating_functions.p90.json → ...nyArray_non-allocating_functions.p90.json b/...nyArray_non-allocating_functions.p90.json → ...nyArray_non-allocating_functions.p90.json
diff --git a/...0/CertificatesBenchmark.Verifier.p90.json → ...1/CertificatesBenchmark.Verifier.p90.json b/...0/CertificatesBenchmark.Verifier.p90.json → ...1/CertificatesBenchmark.Verifier.p90.json
diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake
@@ -40,7 +40,7 @@ function(get_swift_host_arch result_var_name)
     set("${result_var_name}" "armv7" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a")
     set("${result_var_name}" "armv7" PARENT_SCOPE)
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64|amd64")
     set("${result_var_name}" "x86_64" PARENT_SCOPE)
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
     set("${result_var_name}" "itanium" PARENT_SCOPE)