[OpenSSL] Enabling Arm64 assembly on Windows by using clang (#34711)

* * Enable Arm64 assembly optimization on Windows by using clang * * find and add clang folder to the patch * * update version * * refactor based on the review * * update version * * fix arm64_uwp build * * update version * * fix arm64_uwp build * * update version * * refactoring * * update version * * use clang c_flags only for clang on Arm64 * * update version * * update version
microsoft · Nov 5, 2023 · 795111f · 795111f
1 parent a85d307
commit 795111f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openssl",
   "version": "3.1.4",
+  "port-version": 1,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",

diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
@@ -6,14 +6,23 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
 vcpkg_add_to_path("${PERL_EXE_PATH}")
 
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(OPENSSL_ARCH VC-WIN32)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(OPENSSL_ARCH VC-WIN64A)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(OPENSSL_ARCH VC-WIN32-ARM)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(OPENSSL_ARCH VC-WIN64-ARM)
+    if(VCPKG_TARGET_IS_UWP)
+        set(OPENSSL_ARCH VC-WIN64-ARM)
+    elseif(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(OPENSSL_ARCH VC-CLANG-WIN64-CLANGASM-ARM)
+    else()
+        set(OPENSSL_ARCH VC-WIN64-CLANGASM-ARM)
+    endif()
 else()
     message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
@@ -33,17 +42,30 @@ endif()
 
 cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native)
 
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-
 # Clang always uses /Z7;  Patching /Zi /Fd<Name> out of openssl requires more work.
 set(OPENSSL_BUILD_MAKES_PDBS ON)
 if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(OPENSSL_BUILD_MAKES_PDBS OFF)
 endif()
 
-cmake_path(NATIVE_PATH NASM NORMALIZE as)
-cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND NOT VCPKG_TARGET_IS_UWP)
+    vcpkg_find_acquire_program(CLANG)
+    set(clang "${CLANG}")
+    cmake_path(GET clang PARENT_PATH clang_path)
+    vcpkg_add_to_path("${clang_path}")
+
+    set(as clang-cl)
+
+    vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc")
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " --target=aarch64-win32-msvc")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " --target=aarch64-win32-msvc")
+    endif()
+else()
+    cmake_path(NATIVE_PATH NASM NORMALIZE as)
+    cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc)
+endif()
+
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_AR NORMALIZE ar)
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_LINKER NORMALIZE ld)
 

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6274,7 +6274,7 @@
     },
     "openssl": {
       "baseline": "3.1.4",
-      "port-version": 0
+      "port-version": 1
     },
     "openssl-unix": {
       "baseline": "deprecated",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ee74387a1dd212dc9754c614809ff86bd0638fa",
+      "version": "3.1.4",
+      "port-version": 1
+    },
     {
       "git-tree": "3dc34c6428cc5a086a56695e0e0e8c2363e029b5",
       "version": "3.1.4",