Enable all assembly

Author: zhihaoy

CMakeLists.txt

@@ -10,7 +10,7 @@ elseif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS)
 endif()
 
 project(j)
-enable_language(C CXX)
+enable_language(C CXX ASM)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -68,6 +68,7 @@ add_subdirectory(jsrc)
 add_subdirectory(sleef)
 add_subdirectory(base64)
 add_subdirectory(dllsrc)
+add_subdirectory(jsrc/openssl/sha)
 
 set_target_properties(j-blis j-openssl-sha j-sleef j-base64 PROPERTIES
     POSITION_INDEPENDENT_CODE ON)

jsrc/CMakeLists.txt

@@ -205,27 +205,3 @@ target_sources(j-blis PRIVATE
     blis/gemm_int-sse2.c
     blis/gemm_vec-ref.c
 )
-
-add_library(j-openssl-sha OBJECT)
-target_compile_definitions(j-openssl-sha PRIVATE NO_SHA_ASM)
-target_sources(j-openssl-sha PRIVATE
-    openssl/sha/md32_common.h
-    openssl/sha/md4.h
-    openssl/sha/md4_locl.h
-    openssl/sha/md5.h
-    openssl/sha/md5_locl.h
-    openssl/sha/openssl.h
-    openssl/sha/sha.h
-    openssl/sha/sha3.h
-    openssl/sha/sha_locl.h
-    openssl/sha/keccak1600.c
-    openssl/sha/md4_dgst.c
-    openssl/sha/md4_one.c
-    openssl/sha/md5_dgst.c
-    openssl/sha/md5_one.c
-    openssl/sha/openssl-util.c
-    openssl/sha/sha1_one.c
-    openssl/sha/sha256.c
-    openssl/sha/sha3.c
-    openssl/sha/sha512.c
-)

jsrc/openssl/sha/CMakeLists.txt

@@ -0,0 +1,68 @@
+add_library(j-openssl-sha OBJECT)
+target_sources(j-openssl-sha PRIVATE
+    md32_common.h
+    md4.h
+    md4_locl.h
+    md5.h
+    md5_locl.h
+    openssl.h
+    sha.h
+    sha3.h
+    sha_locl.h
+    keccak1600.c
+    md4_dgst.c
+    md4_one.c
+    md5_dgst.c
+    md5_one.c
+    openssl-util.c
+    sha1_one.c
+    sha256.c
+    sha3.c
+    sha512.c
+)
+
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(aarch64|arm)")
+    target_sources(j-openssl-sha PRIVATE
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-armv8-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-armv8-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-armv8-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-armv8-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-armv4-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-armv4-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-armv4-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-armv4-elf.S>
+    )
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    target_sources(j PRIVATE
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/keccak1600-x86_64-nasm.o>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha1-x86_64-nasm.o>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha256-x86_64-nasm.o>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha512-x86_64-nasm.o>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/keccak1600-mmx-nasm.o>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha1-586-nasm.o>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha256-586-nasm.o>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:../openssl-asm/sha512-586-nasm.o>
+    )
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    target_sources(j-openssl-sha PRIVATE
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-x86_64-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-x86_64-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-x86_64-elf.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-x86_64-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-mmx-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-586-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-586-elf.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-586-elf.S>
+    )
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    target_sources(j-openssl-sha PRIVATE
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-x86_64-macho.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-x86_64-macho.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-x86_64-macho.S>
+        $<$<EQUAL:8,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-x86_64-macho.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/keccak1600-mmx-macho.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha1-586-macho.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha256-586-macho.S>
+        $<$<EQUAL:4,${CMAKE_SIZEOF_VOID_P}>:asm/sha512-586-macho.S>
+    )
+endif()