generate and include arch-specific headers for CMake builds

1 files changed, 32 insertions, 5 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index a595022..65bdf49 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -47,6 +47,18 @@ if(HOST_ASM_ELF_X86_64)
                 sha/sha512-elf-x86_64.S
                 whrlpool/wp-elf-x86_64.S
                 cpuid-elf-x86_64.S
+
+                bn/arch/amd64/bignum_add.S
+                bn/arch/amd64/bignum_cmadd.S
+                bn/arch/amd64/bignum_cmul.S
+                bn/arch/amd64/bignum_mul.S
+                bn/arch/amd64/bignum_mul_4_8_alt.S
+                bn/arch/amd64/bignum_mul_8_16_alt.S
+                bn/arch/amd64/bignum_sqr.S
+                bn/arch/amd64/bignum_sqr_4_8_alt.S
+                bn/arch/amd64/bignum_sqr_8_16_alt.S
+                bn/arch/amd64/bignum_sub.S
+                bn/arch/amd64/bn_arch.c
         )
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
@@ -331,16 +343,13 @@ set(
         bio/bss_null.c
         bio/bss_sock.c
         bn/bn_add.c
-        bn/bn_asm.c
         bn/bn_blind.c
         bn/bn_bpsw.c
         bn/bn_const.c
         bn/bn_ctx.c
-        bn/bn_depr.c
         bn/bn_div.c
         bn/bn_err.c
         bn/bn_exp.c
-        bn/bn_exp2.c
         bn/bn_gcd.c
         bn/bn_gf2m.c
         bn/bn_isqrt.c
@@ -461,8 +470,6 @@ set(
         dsa/dsa_ossl.c
         dsa/dsa_pmeth.c
         dsa/dsa_prn.c
-        dsa/dsa_sign.c
-        dsa/dsa_vrf.c
         dso/dso_dlfcn.c
         dso/dso_err.c
         dso/dso_lib.c
@@ -1010,6 +1017,26 @@ target_include_directories(crypto_obj
         PUBLIC
                 ../include)
 
+if(HOST_AARCH64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/aarch64/)
+elseif(HOST_ARM)
+        target_include_directories(crypto_obj PRIVATE bn/arch/arm/)
+elseif(HOST_I386)
+        target_include_directories(crypto_obj PRIVATE bn/arch/i386/)
+elseif(HOST_MIPS64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/mips64)
+elseif(HOST_POWERPC)
+        target_include_directories(crypto_obj PRIVATE bn/arch/powerpc)
+elseif(HOST_POWERPC64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/powerpc64)
+elseif(HOST_RISCV64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/riscv64)
+elseif(HOST_SPARC64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/sparc64)
+elseif(HOST_X86_64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/amd64)
+endif()
+
 add_library(crypto $<TARGET_OBJECTS:crypto_obj> empty.c)
 
 export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)