2 files changed, 72 insertions, 0 deletions

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index e2eeab5..76f4570 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -104,6 +104,28 @@ target_include_directories(
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+if(HOST_AARCH64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/aarch64/)
+elseif(HOST_ARM)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/arm/)
+elseif(HOST_I386)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/i386/)
+elseif(HOST_MIPS64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/mips64)
+elseif(HOST_MIPS)
+        # XXX - can this go away? the directory doesn't exist...
+elseif(HOST_POWERPC)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/powerpc)
+elseif(HOST_POWERPC64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/powerpc64)
+elseif(HOST_RISCV64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/riscv64)
+elseif(HOST_SPARC64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/sparc64)
+elseif(HOST_X86_64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/amd64)
+endif()
+
 install(
         TARGETS ssl
         EXPORT SSL-target
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index a7a7d72..f9a66a3 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -114,3 +114,53 @@ noinst_HEADERS += tls12_internal.h
 noinst_HEADERS += tls13_internal.h
 noinst_HEADERS += tls13_handshake.h
 noinst_HEADERS += tls13_record.h
+
+# arch
+if HOST_AARCH64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/aarch64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/aarch64/crypto_arch.h
+
+if HOST_ARM
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/arm/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/arm/crypto_arch.h
+
+if HOST_I386
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/i386/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/i386/crypto_arch.h
+
+# XXX - do we still need this?
+if HOST_MIPS
+endif
+
+if HOST_MIPS64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/mips64/crypto_arch.h
+
+if HOST_POWERPC
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/powerpc/crypto_arch.h
+
+if HOST_POWERPC64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/powerpc64/crypto_arch.h
+
+if HOST_RISCV64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/riscv64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/riscv64/crypto_arch.h
+
+if HOST_SPARC64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/sparc64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/sparc64/crypto_arch.h
+
+if HOST_X86_64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/amd64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/amd64/crypto_arch.h