Only link aes_${arch}.c to asm builds

Don't mix C source with ASM source. Add the ASM support C code
to CRYPTO_SRC or libcrypto_la_SOURCES as normal, but depending 
on the HOST_ASM* bits

Change-Id: I6a6a69648fc7c2102c96813b70be0d255a345cd3

7 files changed, 24 insertions, 8 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index f6fb7d3..277642f 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -16,6 +16,9 @@
 add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
 
 if(HOST_ASM_ELF_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} bn/arch/amd64/bn_arch.c)
+
         set(
                 ASM_X86_64_ELF_SRC
                 aes/aes-elf-x86_64.S
@@ -37,7 +40,6 @@ if(HOST_ASM_ELF_X86_64)
                 bn/arch/amd64/bignum_sqr_8_16_alt.S
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
-                bn/arch/amd64/bn_arch.c
         )
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
@@ -51,6 +53,9 @@ if(HOST_ASM_ELF_X86_64)
 endif()
 
 if(HOST_ASM_MACOSX_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} bn/arch/amd64/bn_arch.c)
+
         set(
                 ASM_X86_64_MACOSX_SRC
                 aes/aes-macosx-x86_64.S
@@ -72,7 +77,6 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/arch/amd64/bignum_sqr_8_16_alt.S
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
-                bn/arch/amd64/bn_arch.c
         )
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
@@ -87,6 +91,8 @@ if(HOST_ASM_MACOSX_X86_64)
 endif()
 
 if(HOST_ASM_MASM_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+
         set(
                 ASM_X86_64_MASM_SRC
                 aes/aes-masm-x86_64.S
@@ -111,6 +117,8 @@ if(HOST_ASM_MASM_X86_64)
 endif()
 
 if(HOST_ASM_MINGW64_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+
         set(
                 ASM_X86_64_MINGW64_SRC
                 aes/aes-mingw64-x86_64.S
@@ -147,10 +155,8 @@ if(HOST_AARCH64)
         endif()
 elseif(HOST_X86_64)
         set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c)
-        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
 elseif(HOST_I386)
         set(CRYPTO_SRC ${CRYPTO_SRC} arch/i386/crypto_cpu_caps.c)
-        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_i386.c)
 endif()
 
 set(
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 395d528..0e5a916 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -239,11 +239,9 @@ endif
 
 if HOST_X86_64
 libcrypto_la_SOURCES += arch/amd64/crypto_cpu_caps.c
-libcrypto_la_SOURCES += aes/aes_amd64.c
 endif
 if HOST_I386
 libcrypto_la_SOURCES += arch/i386/crypto_cpu_caps.c
-libcrypto_la_SOURCES += aes/aes_i386.c
 endif
 
 libcrypto_la_SOURCES += crypto_err.c
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index c85ede8..9e4775e 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -18,11 +18,13 @@ ASM_X86_64_ELF += bn/arch/amd64/bignum_sqr_4_8_alt.S
 ASM_X86_64_ELF += bn/arch/amd64/bignum_sqr_8_16_alt.S
 ASM_X86_64_ELF += bn/arch/amd64/bignum_sub.S
 ASM_X86_64_ELF += bn/arch/amd64/word_clz.S
-ASM_X86_64_ELF += bn/arch/amd64/bn_arch.c
 
 EXTRA_DIST += $(ASM_X86_64_ELF)
 
 if HOST_ASM_ELF_X86_64
+libcrypto_la_SOURCES += aes/aes_amd64.c
+libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c
+
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index b8bc893..7a5ad58 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -18,11 +18,13 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bignum_sqr_4_8_alt.S
 ASM_X86_64_MACOSX += bn/arch/amd64/bignum_sqr_8_16_alt.S
 ASM_X86_64_MACOSX += bn/arch/amd64/bignum_sub.S
 ASM_X86_64_MACOSX += bn/arch/amd64/word_clz.S
-ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c
 
 EXTRA_DIST += $(ASM_X86_64_MACOSX)
 
 if HOST_ASM_MACOSX_X86_64
+libcrypto_la_SOURCES += aes/aes_amd64.c
+libcrypto_la_SOURCES += bn/arch/amd64/bn_arch.c
+
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index a9225be..ee46bc4 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -10,6 +10,8 @@ ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
 EXTRA_DIST += $(ASM_X86_64_MASM)
 
 if HOST_ASM_MASM_X86_64
+libcrypto_la_SOURCES += aes/aes_amd64.c
+
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 72b767f..3dafa86 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -10,6 +10,8 @@ ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
 EXTRA_DIST += $(ASM_X86_64_MINGW64)
 
 if HOST_ASM_MINGW64_X86_64
+libcrypto_la_SOURCES += aes/aes_amd64.c
+
 libcrypto_la_CPPFLAGS += -Dendbr32=endbr64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
diff --git a/update.sh b/update.sh
index 98b5ce3..2aab899 100755
--- a/update.sh
+++ b/update.sh
@@ -179,6 +179,10 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
         fi
 done
 
+for arch in amd64 i386; do
+        $CP $libcrypto_src/aes/aes_${arch}.c crypto/aes/
+done
+
 for i in $libcrypto_src/arch/*; do
         arch=`basename $i`
         mkdir -p include/arch/$arch