diff options
| author | Adam Langley <agl@google.com> | 2015-04-18 15:52:46 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-18 15:52:46 -0700 |
| commit | 53b609c9db503488fc065728d214c9db67ad5740 (patch) | |
| tree | adf69718a4f57adc59a203215c9574ba0d997474 /src/crypto | |
| parent | 49977fa7e3048d41518223b704c90f1b82588904 (diff) | |
| download | external_boringssl-53b609c9db503488fc065728d214c9db67ad5740.zip external_boringssl-53b609c9db503488fc065728d214c9db67ad5740.tar.gz external_boringssl-53b609c9db503488fc065728d214c9db67ad5740.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.
Change-Id: Idf801013db636bd4d8f6c4588102c241fdb9fbf6
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/bn/asm/x86_64-gcc.c | 4 |
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 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 <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" @@ -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 */ |