summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-05-13 14:53:15 -0700
committerKenny Root <kroot@google.com>2015-05-13 22:08:19 +0000
commit22b306fd55863901f9d4de6c4193a365e31cbf5b (patch)
tree1bae784d24807314c5ee7fde703bd311a1b10343 /src
parent57e5591b80a3e66c027417d052ac2523f2182c20 (diff)
downloadexternal_boringssl-22b306fd55863901f9d4de6c4193a365e31cbf5b.zip
external_boringssl-22b306fd55863901f9d4de6c4193a365e31cbf5b.tar.gz
external_boringssl-22b306fd55863901f9d4de6c4193a365e31cbf5b.tar.bz2
external/boringssl: update #define guards for x86_64-gcc.c.
OS X builds with NO_ASM and was getting both generic.c and x86_64-gcc.c. This change updates the latter so that it's excluded in NO_ASM builds. This is a reland of 53b609c9, which got lost in the last BoringSSL sync because I forgot to send it upstream. (cherry pick of commit 9eb412c41ab99313c5909fba90801c3bff404a10) Bug: 21085331 Change-Id: I825c8903e7b6217bfddc0c3b94f1b2bc00561c73
Diffstat (limited to 'src')
-rw-r--r--src/crypto/bn/asm/x86_64-gcc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/bn/asm/x86_64-gcc.c b/src/crypto/bn/asm/x86_64-gcc.c
index ac63934..0496b95 100644
--- a/src/crypto/bn/asm/x86_64-gcc.c
+++ b/src/crypto/bn/asm/x86_64-gcc.c
@@ -1,6 +1,6 @@
#include <openssl/bn.h>
-#if defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS)
+#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS)
#include "../internal.h"
@@ -596,4 +596,4 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) {
r[7] = c2;
}
-#endif /* defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) */
+#endif /* !NO_ASM && X86_64 && !WINDOWS */