diff options
| author | David Benjamin <davidben@chromium.org> | 2014-10-30 00:13:38 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-10-30 02:13:20 +0300 |
| commit | 3e700bb3e812730f60bec529a14c0d35ea9665aa (patch) | |
| tree | 6bcab6fc57502e75c316d855c018d256d4c6def4 /crypto/bn/generic.c | |
| parent | 2a0f3420f72b47b31c259ffd9f1dde8e646cc0e6 (diff) | |
Get MASM output working on Win32.
We were building the NASM flavor with MASM which is why it didn't work. Get the
MASM output working: cpuid and cmove are not available in MASM unless the file
declares .686. Also work around MASM rejecting a very long line in SHA-256.
The follow-up change will get the NASM flavor working. We should probably use
that one as it's documented as supported upstream. But let's make this one
functional too.
Change-Id: Ica69cc042a7250c7bc9ba9325caab597cd4ce616
Reviewed-on: https://boringssl-review.googlesource.com/2091
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/bn/generic.c')
| -rw-r--r-- | crypto/bn/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/bn/generic.c b/crypto/bn/generic.c index b745750e..c60cfd97 100644 --- a/crypto/bn/generic.c +++ b/crypto/bn/generic.c @@ -61,7 +61,7 @@ #include "internal.h" -#if defined(OPENSSL_WINDOWS) || defined(OPENSSL_NO_ASM) || \ +#if defined(OPENSSL_NO_ASM) || \ (!defined(OPENSSL_X86_64) && !defined(OPENSSL_X86)) #if defined(OPENSSL_WINDOWS) |