commit 9eb412c41ab99313c5909fba90801c3bff404a10
author Adam Langley <agl@google.com> Wed May 13 14:46:08 2015 -0700
committer Kenny Root <kroot@google.com> Wed May 13 21:52:05 2015 +0000
tree 1bae784d24807314c5ee7fde703bd311a1b10343
parent 9385cb180789855cbce47d20173d90999724e428

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.

Change-Id: I82462e5cd1d24fa96176c89d77cafc1f7ed0a0fd

src/crypto/bn/asm/x86_64-gcc.c

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 @@
   r[7] = c2;
 }
 
-#endif  /* defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) */
+#endif  /* !NO_ASM && X86_64 && !WINDOWS */