Add #ifdef guards to crypto/curve25519 assembly files.
Add guards for the architecture and OPENSSL_NO_ASM to
the assembly-language files in crypto/curve25519/asm.
The Dart compilation of BoringSSL includes all files,
because the architecture is not known when gyp is run.
Change-Id: I66f5ae525266b63b0fe3a929012b771d545779b5
Reviewed-on: https://boringssl-review.googlesource.com/7030
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/curve25519/asm/x25519-asm-arm.S b/crypto/curve25519/asm/x25519-asm-arm.S
index 60d08dd..3af1dba 100644
--- a/crypto/curve25519/asm/x25519-asm-arm.S
+++ b/crypto/curve25519/asm/x25519-asm-arm.S
@@ -17,6 +17,9 @@
* domain licensed but the standard ISC license is included above to keep
* licensing simple. */
+#if !defined(OPENSSL_NO_ASM)
+#if defined(__arm__)
+
.fpu neon
.text
.align 4
@@ -2116,3 +2119,6 @@
mov sp,r12
vpop {q4,q5,q6,q7}
bx lr
+
+#endif /* __arm__ */
+#endif /* !OPENSSL_NO_ASM */
diff --git a/crypto/curve25519/asm/x25519-asm-x86_64.S b/crypto/curve25519/asm/x25519-asm-x86_64.S
index 7e86a23..531ac16 100644
--- a/crypto/curve25519/asm/x25519-asm-x86_64.S
+++ b/crypto/curve25519/asm/x25519-asm-x86_64.S
@@ -17,6 +17,9 @@
* domain licensed but the standard ISC license is included above to keep
* licensing simple. */
+#if !defined(OPENSSL_NO_ASM)
+#if defined(__x86_64__)
+
.data
.p2align 4
@@ -1929,3 +1932,6 @@
mov %rdi,%rax
mov %rsi,%rdx
ret
+
+#endif /* __x86_64__ */
+#endif /* !OPENSSL_NO_ASM */