Flatten assembly files.
Change-Id: I37438652b7e73ce16e50b5b1b8ba011b5076ded8
Reviewed-on: https://boringssl-review.googlesource.com/31585
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 5aab4af..929aec2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -162,6 +162,49 @@
)
endif()
+if(${ARCH} STREQUAL "arm")
+ set(
+ CRYPTO_ARCH_SOURCES
+
+ chacha/chacha-armv4.${ASM_EXT}
+ curve25519/asm/x25519-asm-arm.S
+ poly1305/poly1305_arm_asm.S
+ )
+endif()
+
+if(${ARCH} STREQUAL "aarch64")
+ set(
+ CRYPTO_ARCH_SOURCES
+
+ chacha/chacha-armv8.${ASM_EXT}
+ )
+endif()
+
+if(${ARCH} STREQUAL "x86")
+ set(
+ CRYPTO_ARCH_SOURCES
+
+ chacha/chacha-x86.${ASM_EXT}
+ )
+endif()
+
+if(${ARCH} STREQUAL "x86_64")
+ set(
+ CRYPTO_ARCH_SOURCES
+
+ chacha/chacha-x86_64.${ASM_EXT}
+ cipher_extra/aes128gcmsiv-x86_64.${ASM_EXT}
+ cipher_extra/chacha20_poly1305_x86_64.${ASM_EXT}
+ )
+endif()
+
+perlasm(chacha/chacha-armv4.${ASM_EXT} chacha/asm/chacha-armv4.pl)
+perlasm(chacha/chacha-armv8.${ASM_EXT} chacha/asm/chacha-armv8.pl)
+perlasm(chacha/chacha-x86.${ASM_EXT} chacha/asm/chacha-x86.pl)
+perlasm(chacha/chacha-x86_64.${ASM_EXT} chacha/asm/chacha-x86_64.pl)
+perlasm(cipher_extra/aes128gcmsiv-x86_64.${ASM_EXT} cipher_extra/asm/aes128gcmsiv-x86_64.pl)
+perlasm(cipher_extra/chacha20_poly1305_x86_64.${ASM_EXT} cipher_extra/asm/chacha20_poly1305_x86_64.pl)
+
add_library(
crypto
@@ -203,6 +246,7 @@
$<TARGET_OBJECTS:pkcs7>
$<TARGET_OBJECTS:pkcs8_lib>
+ ${CRYPTO_ARCH_SOURCES}
${CRYPTO_FIPS_OBJECTS}
)
diff --git a/crypto/chacha/CMakeLists.txt b/crypto/chacha/CMakeLists.txt
index bf4920c..2e764bd 100644
--- a/crypto/chacha/CMakeLists.txt
+++ b/crypto/chacha/CMakeLists.txt
@@ -1,48 +1,9 @@
include_directories(../../include)
-if(${ARCH} STREQUAL "arm")
- set(
- CHACHA_ARCH_SOURCES
-
- chacha-armv4.${ASM_EXT}
- )
-endif()
-
-if(${ARCH} STREQUAL "aarch64")
- set(
- CHACHA_ARCH_SOURCES
-
- chacha-armv8.${ASM_EXT}
- )
-endif()
-
-if(${ARCH} STREQUAL "x86")
- set(
- CHACHA_ARCH_SOURCES
-
- chacha-x86.${ASM_EXT}
- )
-endif()
-
-if(${ARCH} STREQUAL "x86_64")
- set(
- CHACHA_ARCH_SOURCES
-
- chacha-x86_64.${ASM_EXT}
- )
-endif()
-
add_library(
chacha
OBJECT
chacha.c
-
- ${CHACHA_ARCH_SOURCES}
)
-
-perlasm(chacha-armv4.${ASM_EXT} asm/chacha-armv4.pl)
-perlasm(chacha-armv8.${ASM_EXT} asm/chacha-armv8.pl)
-perlasm(chacha-x86.${ASM_EXT} asm/chacha-x86.pl)
-perlasm(chacha-x86_64.${ASM_EXT} asm/chacha-x86_64.pl)
diff --git a/crypto/cipher_extra/CMakeLists.txt b/crypto/cipher_extra/CMakeLists.txt
index 2c55bd6..4ffc334 100644
--- a/crypto/cipher_extra/CMakeLists.txt
+++ b/crypto/cipher_extra/CMakeLists.txt
@@ -1,14 +1,5 @@
include_directories(../../include)
-if(${ARCH} STREQUAL "x86_64")
- set(
- CIPHER_ARCH_SOURCES
-
- aes128gcmsiv-x86_64.${ASM_EXT}
- chacha20_poly1305_x86_64.${ASM_EXT}
- )
-endif()
-
add_library(
cipher_extra
@@ -27,9 +18,4 @@
tls_cbc.c
e_tls.c
-
- ${CIPHER_ARCH_SOURCES}
)
-
-perlasm(aes128gcmsiv-x86_64.${ASM_EXT} asm/aes128gcmsiv-x86_64.pl)
-perlasm(chacha20_poly1305_x86_64.${ASM_EXT} asm/chacha20_poly1305_x86_64.pl)
diff --git a/crypto/curve25519/CMakeLists.txt b/crypto/curve25519/CMakeLists.txt
index 0f28218..8442aec 100644
--- a/crypto/curve25519/CMakeLists.txt
+++ b/crypto/curve25519/CMakeLists.txt
@@ -1,19 +1,9 @@
include_directories(../../include)
-if(${ARCH} STREQUAL "arm")
- set(
- CURVE25519_ARCH_SOURCES
-
- asm/x25519-asm-arm.S
- )
-endif()
-
add_library(
curve25519
OBJECT
spake25519.c
-
- ${CURVE25519_ARCH_SOURCES}
)
diff --git a/crypto/poly1305/CMakeLists.txt b/crypto/poly1305/CMakeLists.txt
index 5dc1b19..b22281b 100644
--- a/crypto/poly1305/CMakeLists.txt
+++ b/crypto/poly1305/CMakeLists.txt
@@ -1,13 +1,5 @@
include_directories(../../include)
-if(${ARCH} STREQUAL "arm")
- set(
- POLY1305_ARCH_SOURCES
-
- poly1305_arm_asm.S
- )
-endif()
-
add_library(
poly1305
@@ -16,6 +8,4 @@
poly1305.c
poly1305_arm.c
poly1305_vec.c
-
- ${POLY1305_ARCH_SOURCES}
)
