From 53b609c9db503488fc065728d214c9db67ad5740 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Sat, 18 Apr 2015 15:52:46 -0700 Subject: 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. Change-Id: Idf801013db636bd4d8f6c4588102c241fdb9fbf6 --- src/crypto/bn/asm/x86_64-gcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/crypto/bn/asm/x86_64-gcc.c b/src/crypto/bn/asm/x86_64-gcc.c index b3d1965..c05e433 100644 --- a/src/crypto/bn/asm/x86_64-gcc.c +++ b/src/crypto/bn/asm/x86_64-gcc.c @@ -1,6 +1,6 @@ #include -#if defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) +#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) #include "../internal.h" @@ -576,4 +576,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 */ -- cgit v1.1